Changeset eac569a for Prototype Application/Paw5/src/main/java

Timestamp:

03/04/23 19:55:18 (16 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

33b9f30

Parents:

3c7bf5b (diff), f194b4e (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 main into adopting-a-pet

Location:

Prototype Application/Paw5/src/main/java/finki/paw5

Files:

• service/PetService.java (modified) (2 diffs)
• service/PostService.java (modified) (1 diff)
• service/implementation/PetServiceImplementation.java (modified) (2 diffs)
• web/controllers/HomeController.java (modified) (2 diffs)
• web/controllers/PetController.java (modified) (1 diff)
• web/controllers/PostController.java (modified) (4 diffs)

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 {
@@ -11 +9 @@
     void save (Pet pet);
 
-    List<Pet> findAll();
+    List<Pet> listpets();
 
-    Optional<Pet> findById(Integer petId);
+    Pet findById(Integer id);
 }

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;

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

@@ -7 +7 @@
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
@@ -23 +22 @@
     }
 
-    @Override
-    public List<Pet> findAll() {
-        return this.petRepository.findAll();
-    }
+    public List<Pet> listpets() {return this.petRepository.findAll();}
 
     @Override
-    public Optional<Pet> findById(Integer petId) {
-        return this.petRepository.findById(petId);
+    public Pet findById(Integer id) {
+        return this.petRepository.findById(id).get();
     }
 }

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

@@ -1 +1 @@
 package finki.paw5.web.controllers;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -10 +11 @@
 
     @GetMapping
-    public String getHomePage(){
+    public String getHomePage(HttpServletRequest request) {
+        if(request.getSession().getAttribute("user")==null){
+            return "redirect:/login";
+        }
         return "home";
     }
+
     @GetMapping("/aboutUs")
-    public String getSuccessPage(){
+    public String getSuccessPage() {
         return "/aboutUs";
     }

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

@@ -28 +28 @@
     public String saveAdoption(@PathVariable Integer id, HttpServletRequest request) {
 
-        Pet pet = this.petService.findById(id).orElseThrow(InvalidPetIdException::new);
+        Pet pet = this.petService.findById(id);
         
         User user = (User) request.getSession().getAttribute("user");

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.entities.Employee;
 import finki.paw5.model.enumerations.AgeGroup;
 import finki.paw5.model.enumerations.Gender;
@@ -37 +35 @@
     }
 
-    @GetMapping("create-post")
+    @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);
+        model.addAttribute("pets", this.petService.listpets());
         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,
+    @PostMapping("/submit-post")
+    public String savePost(@RequestParam(required = false) Integer petId,
+                           @RequestParam(required = false) boolean newPetCheckbox,
+                           @RequestParam(required = false) String name,
+                           @RequestParam(required = false) String gender,
+                           @RequestParam(required = false) String ageGroup,
+                           @RequestParam(required = false) String size,
+                           @RequestParam(required = false) String species,
                            @RequestParam(required = false) String breed,
                            @RequestParam(required = false) String imageUrl,
-                           @RequestParam(required = false) boolean canBeFostered) {
+                           @RequestParam(required = false) boolean canBeFostered,
+                           HttpServletRequest request) {
 
-        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);
+        Employee employee = (Employee) request.getSession().getAttribute("user");
 
-        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);
+        if(newPetCheckbox == true){
+
+            Pet newPet = new Pet(imageUrl, AgeGroup.valueOf(ageGroup), Size.valueOf(size), breed, name, Species.valueOf(species), Gender.valueOf(gender), canBeFostered, null, employee.getShelterId());
+            this.petService.save(newPet);
+
+            Post post = new Post(LocalDate.now(), imageUrl, newPet.getId(), null, employee.getId());
+            this.postService.save(post);
+
+        } else{
+
+            Pet selectedPet = this.petService.findById(petId);
+
+            Post post = new Post(LocalDate.now(), imageUrl, selectedPet.getId(), null, employee.getId());
+            this.postService.save(post);
+
+        }
 
         return "redirect:/home";
@@ -68 +80 @@
 
         List<Post> posts = this.postService.findAll();
-        List<Pet> pets = this.petService.findAll();
+        List<Pet> pets = this.petService.listpets();
         //model.addAttribute("posts", posts);
         //model.addAttribute("pets",pets);
@@ -81 +93 @@
 
         Post post = this.postService.findById(id).get();
-        Pet pet = this.petService.findById(post.getPetId()).get();
+        Pet pet = this.petService.findById(post.getPetId());
 
         //model.addAttribute("pet", pet);