Changeset a762b3a

Timestamp:

02/14/23 20:45:37 (21 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

59a8941

Parents:

3f5e485

Message:

adoption posts list + pet details page

Location:

Prototype Application/Paw5/src/main

Files:

• java/finki/paw5/model/entities/PersonalProfile.java (modified) (1 diff)
• java/finki/paw5/service/PersonalProfileService.java (added)
• java/finki/paw5/service/PetService.java (modified) (1 diff)
• java/finki/paw5/service/PostService.java (modified) (2 diffs)
• java/finki/paw5/service/ShelterService.java (added)
• java/finki/paw5/service/implementation/PersonalProfileServiceImplementation.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/service/implementation/ShelterServiceImplementation.java (added)
• java/finki/paw5/web/controllers/PostController.java (modified) (3 diffs)
• resources/templates/list-posts-adoption.html (added)
• resources/templates/listpostsadoption.html (deleted)
• resources/templates/listpostsfoster.html (deleted)
• resources/templates/pet-details.html (added)
• resources/templates/petdetails.html (deleted)

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

@@ -32 +32 @@
     private GroomingNeed groomingNeed;
 
-    public PersonalProfile(int id, FriendlyToKids friendlyToKids, FriendlyToPets friendlyToPets, AttentionNeed attentionNeed, PhysicalActivity physicalActivity, GroomingNeed groomingNeed) {
+    public PersonalProfile(Integer id, FriendlyToKids friendlyToKids, FriendlyToPets friendlyToPets, AttentionNeed attentionNeed, PhysicalActivity physicalActivity, GroomingNeed groomingNeed) {
         this.id = id;
         this.friendlyToKids = friendlyToKids;

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

@@ -2 +2 @@
 
 import finki.paw5.model.entities.Pet;
+import finki.paw5.web.controllers.PostController;
+
+import java.util.List;
+import java.util.Optional;
 
 public interface PetService {
 
     void save (Pet pet);
+
+    List<Pet> findAll();
+
+    Optional<Pet> findById(Integer petId);
 }

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

@@ -2 +2 @@
 
 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 java.util.List;
+import java.util.Optional;
 
 public interface PostService {
@@ -11 +10 @@
     void save (Post post);
 
+    List<Post> findAll();
+
+    Optional<Post> findById(Integer id);
 }

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

@@ -5 +5 @@
 import finki.paw5.service.PetService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -19 +22 @@
         this.petRepository.save(pet);
     }
+
+    @Override
+    public List<Pet> findAll() {
+        return this.petRepository.findAll();
+    }
+
+    @Override
+    public Optional<Pet> findById(Integer petId) {
+        return this.petRepository.findById(petId);
+    }
 }

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

@@ -5 +5 @@
 import finki.paw5.service.PostService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -20 +23 @@
     }
 
+    @Override
+    public List<Post> findAll() {
+        return this.postRepository.findAll();
+    }
+
+    @Override
+    public Optional<Post> findById(Integer id) {
+        return this.postRepository.findById(id);
+    }
 }

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

@@ -1 +1 @@
 package finki.paw5.web.controllers;
 
+import finki.paw5.model.entities.PersonalProfile;
 import finki.paw5.model.entities.Pet;
 import finki.paw5.model.entities.Post;
+import finki.paw5.model.entities.Shelter;
 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.PersonalProfileService;
 import finki.paw5.service.PetService;
 import finki.paw5.service.PostService;
+import finki.paw5.service.ShelterService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Controller
@@ -22 +29 @@
     private final PostService postService;
     private final PetService petService;
+    private final PersonalProfileService personalProfileService;
 
-    public PostController(PostService postService, PetService petService) {
+    public PostController(PostService postService, PetService petService, PersonalProfileService personalProfileService, ShelterService shelterService) {
         this.postService = postService;
         this.petService = petService;
+        this.personalProfileService = personalProfileService;
     }
 
@@ -54 +63 @@
         return "redirect:/home";
     }
+
+    @GetMapping("/adoption-posts")
+    public String getAdoptionPosts(Model model, HttpServletRequest request){
+
+        List<Post> posts = this.postService.findAll();
+        List<Pet> pets = this.petService.findAll();
+        //model.addAttribute("posts", posts);
+        //model.addAttribute("pets",pets);
+        request.getSession().setAttribute("posts",posts);//temp
+        request.getSession().setAttribute("pets",pets);//temp
+
+        return "list-posts-adoption";
+    }
+
+    @GetMapping("/pet-details-{id}")
+    public String getPostDetails(@PathVariable Integer id, Model model, HttpServletRequest request){
+
+        Post post = this.postService.findById(id).get();
+        Pet pet = this.petService.findById(post.getPetId()).get();
+
+        //model.addAttribute("pet", pet);
+        //model.addAttribute("post", post);
+        request.getSession().setAttribute("post", post);//temp
+        request.getSession().setAttribute("pet", pet);//temp
+
+        return "pet-details";
+    }
 }