Changeset 7e3f2f7

Timestamp:

02/16/23 16:09:52 (21 months ago)

Author:

Filip Chorbeski <86695898+FilipChorbeski@…>

Branches:

main

Children:

d7eaf88

Parents:

6941fac

Message:

(temp) added listpets and Employee session request

(temp) added listpets and Employee session request to Post Controller

Location:

Prototype Application/Paw5/src/main

Files:

• java/finki/paw5/service/PetService.java (modified) (1 diff)
• java/finki/paw5/service/PostService.java (modified) (1 diff)
• java/finki/paw5/service/implementation/PetServiceImplementation.java (modified) (2 diffs)
• java/finki/paw5/web/controllers/PostController.java (modified) (4 diffs)
• resources/templates/create-post.html (modified) (1 diff)

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

@@ -3 +3 @@
 import finki.paw5.model.entities.Pet;
 
+import java.util.List;
+
 public interface PetService {
 
     void save (Pet pet);
+
+    List<Pet> listpets();
 }

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;
 
 public interface PostService {

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;
 
 @Service
@@ -19 +21 @@
         this.petRepository.save(pet);
     }
+
+    @Override
+    public List<Pet> listpets() {return this.petRepository.findAll();}
 }

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.enumerations.AgeGroup;
 import finki.paw5.model.enumerations.Gender;
@@ -9 +11 @@
 import finki.paw5.service.PetService;
 import finki.paw5.service.PostService;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -30 +33 @@
     @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";
     }
@@ -44 +45 @@
                            @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);
+        Employee employee = (Employee) request.getSession().getAttribute("employee");
+
+        Pet pet = new Pet(imageUrl, AgeGroup.valueOf(ageGroup), Size.valueOf(size), breed, name, Species.valueOf(species), Gender.valueOf(gender), canBeFostered, null, employee.getShelterId());
         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
+        Post post = new Post(LocalDate.now(), imageUrl, pet.getId() , null, employee.getId() );
         this.postService.save(post);
 

Prototype Application/Paw5/src/main/resources/templates/create-post.html

@@ -44 +44 @@
         <label for="pet">Selet pet:</label>
         <select id="pet">
+            <option
+            th:each="pet :${pets}"
+            th:text="${pet.getName()}">
+            </option>
         </select>
     </div>