Changeset 3f5e485

Timestamp:

02/13/23 14:34:36 (21 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

a762b3a

Parents:

a2060cb (diff), 04e4f54 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge create-post and login branches

resolved merge conflicts

Location:

Prototype Application/Paw5/src/main

Files:

• java/finki/paw5/model/entities/Pet.java (modified) (1 diff)
• java/finki/paw5/model/entities/Post.java (modified) (2 diffs)
• java/finki/paw5/model/exceptions/NonExistingArgumentsException.java (added)
• java/finki/paw5/repository/UserRepository.java (modified) (1 diff)
• java/finki/paw5/service/AuthService.java (added)
• java/finki/paw5/service/PetService.java (modified) (1 diff)
• java/finki/paw5/service/PostService.java (modified) (1 diff)
• java/finki/paw5/service/implementation/AuthServiceImpl.java (added)
• java/finki/paw5/service/implementation/PetServiceImplementation.java (modified) (2 diffs)
• java/finki/paw5/service/implementation/PostServiceImplementation.java (modified) (2 diffs)
• java/finki/paw5/web/controllers/HomeController.java (added)
• java/finki/paw5/web/controllers/LoginController.java (added)
• java/finki/paw5/web/controllers/PostController.java (modified) (2 diffs)
• resources/templates/aboutUs.html (added)
• resources/templates/create-post.html (added)
• resources/templates/home.html (added)
• resources/templates/login.html (added)
• resources/templates/register.html (added)

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java

@@ -43 +43 @@
 
     @Column(name = "id_adoption")
-    private int adoptionId;
+    private Integer adoptionId;
 
     @Column(name = "id_shelter")
-    private int shelterId;
+    private Integer shelterId;
 
-    public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, int adoptionId, int shelterId) {
+    public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, Integer adoptionId, Integer shelterId) {
         this.imageUrl = imageUrl;
         this.ageGroup = ageGroup;

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Post.java

@@ -5 +5 @@
 
 import java.time.LocalDate;
-import java.util.Date;
 
 @Data
@@ -24 +23 @@
 
     @Column(name="id_pet", nullable = false)
-    private int petId;
+    private Integer petId;
 
     @Column(name="id_surendee")
-    private int surendeeId;
+    private Integer surendeeId;
 
     @Column(name="id_employee")
-    private int employeeId;
+    private Integer employeeId;
 
-    public Post(LocalDate dateCreated, String thumbnailUrl, int petId, int surendeeId, int employeeId) {
+    public Post(LocalDate dateCreated, String thumbnailUrl, Integer petId, Integer surendeeId, Integer employeeId) {
         this.dateCreated = dateCreated;
         this.thumbnailUrl = thumbnailUrl;

Prototype Application/Paw5/src/main/java/finki/paw5/repository/UserRepository.java

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+
 @Repository
 public interface UserRepository extends JpaRepository<User, Integer> {
+        User findByEmailAndPassword(String email, String password);
+        User findByEmail(String email);
 }

Prototype Application/Paw5/src/main/java/finki/paw5/service/PetService.java

@@ -1 +1 @@
 package finki.paw5.service;
 
+import finki.paw5.model.entities.Pet;
+
 public interface PetService {
+
+    void save (Pet pet);
 }

Prototype Application/Paw5/src/main/java/finki/paw5/service/PostService.java

@@ -1 +1 @@
 package finki.paw5.service;
 
+import finki.paw5.model.entities.Post;
+import finki.paw5.model.enumerations.AgeGroup;
+import finki.paw5.model.enumerations.Gender;
+import finki.paw5.model.enumerations.Size;
+import finki.paw5.model.enumerations.Species;
+
 public interface PostService {
+
+    void save (Post post);
+
 }

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PetServiceImplementation.java

@@ -1 +1 @@
 package finki.paw5.service.implementation;
 
+import finki.paw5.model.entities.Pet;
 import finki.paw5.repository.PetRepository;
 import finki.paw5.service.PetService;
@@ -14 +15 @@
     }
 
+    @Override
+    public void save(Pet pet) {
+        this.petRepository.save(pet);
+    }
 }

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PostServiceImplementation.java

@@ -1 +1 @@
 package finki.paw5.service.implementation;
 
+import finki.paw5.model.entities.Post;
 import finki.paw5.repository.PostRepository;
 import finki.paw5.service.PostService;
@@ -14 +15 @@
     }
 
+    @Override
+    public void save(Post post) {
+        this.postRepository.save(post);
+    }
+
 }

Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/PostController.java

@@ -1 +1 @@
 package finki.paw5.web.controllers;
 
+import finki.paw5.model.entities.Pet;
+import finki.paw5.model.entities.Post;
+import finki.paw5.model.enumerations.AgeGroup;
+import finki.paw5.model.enumerations.Gender;
+import finki.paw5.model.enumerations.Size;
+import finki.paw5.model.enumerations.Species;
+import finki.paw5.service.PetService;
 import finki.paw5.service.PostService;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.time.LocalDate;
 
 @Controller
@@ -8 +21 @@
 
     private final PostService postService;
+    private final PetService petService;
 
-    public PostController(PostService postService) {
+    public PostController(PostService postService, PetService petService) {
         this.postService = postService;
+        this.petService = petService;
     }
 
+    @GetMapping("create-post")
+    public String get(Model model) {
+        //TODO: vakvo ama za lista so pets
+        //        List<Manufacturer> manufacturers = this.manufacturerService.findAll();
+        //        model.addAttribute("manufacturers", manufacturers);
+        return "create-post";
+    }
+
+    @PostMapping("submit-post")
+    public String savePost(@RequestParam(required = false) String name,
+                           @RequestParam String gender,
+                           @RequestParam String ageGroup,
+                           @RequestParam String size,
+                           @RequestParam String species,
+                           @RequestParam(required = false) String breed,
+                           @RequestParam(required = false) String imageUrl,
+                           @RequestParam(required = false) boolean canBeFostered) {
+
+        Pet pet = new Pet(imageUrl, AgeGroup.valueOf(ageGroup), Size.valueOf(size), breed, name, Species.valueOf(species), Gender.valueOf(gender), canBeFostered, null, 1);
+        this.petService.save(pet);
+
+        Post post = new Post(LocalDate.now(), imageUrl, pet.getId(), null, 10);//TODO: employee id da se zeme preku session user getid
+        this.postService.save(post);
+
+        return "redirect:/home";
+    }
 }