Changeset 8b7dd7f

Timestamp:

03/05/23 18:01:28 (21 months ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

c3278ac, fdd7961

Parents:

f194b4e (diff), 5f53114 (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.

git-author:

Filip Chorbeski <86695898+FilipChorbeski@…> (03/05/23 18:01:28)

git-committer:

GitHub <noreply@…> (03/05/23 18:01:28)

Message:

Merge pull request #8 from SazdovaEkaterina/adopting-a-pet

Adopting a Pet

Location:

Prototype Application/Paw5/src/main

Files:

• java/finki/paw5/model/entities/Adoption.java (modified) (2 diffs)
• java/finki/paw5/model/entities/PersonalProfile.java (modified) (1 diff)
• java/finki/paw5/model/exceptions/InvalidPetIdException.java (added)
• java/finki/paw5/service/AdoptionService.java (added)
• java/finki/paw5/service/PersonalProfileService.java (added)
• java/finki/paw5/service/PostService.java (modified) (2 diffs)
• java/finki/paw5/service/ShelterService.java (modified) (1 diff)
• java/finki/paw5/service/implementation/AdoptionServiceImplementation.java (added)
• java/finki/paw5/service/implementation/PersonalProfileServiceImplementation.java (added)
• java/finki/paw5/service/implementation/PetServiceImplementation.java (modified) (1 diff)
• java/finki/paw5/service/implementation/PostServiceImplementation.java (modified) (2 diffs)
• java/finki/paw5/service/implementation/ShelterServiceImplementation.java (modified) (3 diffs)
• java/finki/paw5/web/controllers/PetController.java (modified) (2 diffs)
• java/finki/paw5/web/controllers/PostController.java (modified) (3 diffs)
• resources/templates/aboutUs.html (modified) (1 diff)
• resources/templates/home.html (modified) (1 diff)
• resources/templates/list-posts-adoption.html (added)
• resources/templates/pet-details.html (added)

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

@@ -5 +5 @@
 
 import java.time.LocalDate;
-import java.util.Date;
 
 @Data
@@ -27 +26 @@
 
     @Column(name = "id_adopter", nullable = false)
-    private int adopterId;
+    private Integer adopterId;
 
-    public Adoption(LocalDate startDate, LocalDate endDateFoster, boolean approved, int adopterId) {
+    public Adoption(LocalDate startDate, LocalDate endDateFoster, boolean approved, Integer adopterId) {
         this.startDate = startDate;
         this.endDateFoster = endDateFoster;

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/PostService.java

@@ -2 +2 @@
 
 import finki.paw5.model.entities.Post;
+import java.util.List;
+import java.util.Optional;
 
 public interface PostService {
@@ -7 +9 @@
     void save (Post post);
 
+    List<Post> findAll();
+
+    Optional<Post> findById(Integer id);
 }

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

@@ -4 +4 @@
 
 import java.util.List;
+import java.util.Optional;
 
 public interface ShelterService {
+    Optional<Shelter> findById(Integer id);
     List<Shelter> listShelters();
 }

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

@@ -22 +22 @@
     }
 
-    @Override
     public List<Pet> listpets() {return this.petRepository.findAll();}
 

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/service/implementation/ShelterServiceImplementation.java

@@ -7 +7 @@
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class ShelterServiceImplementation implements ShelterService {
+
     private final ShelterRepository shelterRepository;
 
@@ -16 +18 @@
     }
 
+    @Override
+    public Optional<Shelter> findById(Integer id) {
+        return this.shelterRepository.findById(id);
+    }
 
     @Override
@@ -21 +27 @@
         return shelterRepository.findAll();
     }
+
+
 }

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

@@ -1 +1 @@
 package finki.paw5.web.controllers;
 
+import finki.paw5.model.entities.Adoption;
+import finki.paw5.model.entities.Pet;
+import finki.paw5.model.entities.User;
+import finki.paw5.model.exceptions.InvalidPetIdException;
+import finki.paw5.service.AdoptionService;
 import finki.paw5.service.PetService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.time.LocalDate;
 
 @Controller
@@ -8 +18 @@
 
     private final PetService petService;
+    private final AdoptionService adoptionService;
 
-    public PetController(PetService petService) {
+    public PetController(PetService petService, AdoptionService adoptionService) {
         this.petService = petService;
+        this.adoptionService = adoptionService;
     }
 
+    @PostMapping("/submit-adopton-{id}")
+    public String saveAdoption(@PathVariable Integer id, HttpServletRequest request) {
+
+        Pet pet = this.petService.findById(id);
+        
+        User user = (User) request.getSession().getAttribute("user");
+
+        Adoption adoption = new Adoption(LocalDate.now(), null, false, user.getId());
+        this.adoptionService.save(adoption);
+
+        pet.setAdoptionId(adoption.getId());
+        this.petService.save(pet);
+
+        return "redirect:/home";
+    }
 }

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

@@ -1 +1 @@
 package finki.paw5.web.controllers;
-
-import finki.paw5.model.entities.Employee;
 import finki.paw5.model.entities.Pet;
 import finki.paw5.model.entities.Post;
-import finki.paw5.model.entities.User;
+import finki.paw5.model.entities.Employee;
 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
@@ -25 +27 @@
     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;
     }
 
@@ -71 +75 @@
         return "redirect:/home";
     }
+
+    @GetMapping("/adoption-posts")
+    public String getAdoptionPosts(Model model){
+
+        List<Post> posts = this.postService.findAll();
+        List<Pet> pets = this.petService.listpets();
+        model.addAttribute("posts", posts);
+        model.addAttribute("pets",pets);
+
+        return "list-posts-adoption";
+    }
+
+    @GetMapping("/pet-details-{id}")
+    public String getPostDetails(@PathVariable Integer id,
+                                 Model model){
+
+        Post post = this.postService.findById(id).get();
+        Pet pet = this.petService.findById(post.getPetId());
+
+        model.addAttribute("pet", pet);
+        model.addAttribute("post", post);
+
+        return "pet-details";
+    }
 }

Prototype Application/Paw5/src/main/resources/templates/aboutUs.html

@@ -40 +40 @@
     <h5 class="text-center text-danger">
         You successfully logged in
-        <th:block  th:text="${session.user.getId()}"></th:block>
+        <th:block  th:text="${session.user?.getId()}"></th:block>
     </h5>
 </div>

Prototype Application/Paw5/src/main/resources/templates/home.html

@@ -36 +36 @@
 </header>
 <div>
+  <h1>Welcome to Paw 5</h1>
+  <h3>Let's get started
+    <th:block  th:text="${session.user?.getName()}"></th:block>
+  </h3>
+</div>
+<div>
   <form method="get" th:action="@{'/create-post'}">
-    <button id="submit" type="submit">Create an Adoption Post</button>
+    <button id="createPost"
+            type="submit"
+            class="btn">Create an Adoption Post</button>
   </form>
 </div>
 <div>
-  <h1>Welcome to Paw 5</h1>
-  <h3>Let's get started
-    <th:block  th:text="${session.user.getName()}"></th:block>
-  </h3>
+  <form method="get" th:action="@{'/adoption-posts'}">
+    <button id="submit"
+            type="submit"
+            class="btn">View Pet Posts</button>
+  </form>
 </div>
-
 </body>
 </html>