Changeset f194b4e for Prototype Application/Paw5/src/main/java
- Timestamp:
- 03/04/23 19:33:53 (16 months ago)
- Branches:
- main
- Children:
- 8b7dd7f, eac569a
- Parents:
- eef07ff (diff), 4103eaa (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:
- SazdovaEkaterina <74919977+SazdovaEkaterina@…> (03/04/23 19:33:53)
- git-committer:
- GitHub <noreply@…> (03/04/23 19:33:53)
- Location:
- Prototype Application/Paw5/src/main/java/finki/paw5
- Files:
-
- 6 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java
reef07ff rf194b4e 43 43 44 44 @Column(name = "id_adoption") 45 private intadoptionId;45 private Integer adoptionId; 46 46 47 47 @Column(name = "id_shelter") 48 private intshelterId;48 private Integer shelterId; 49 49 50 public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, int adoptionId, intshelterId) {50 public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, Integer adoptionId, Integer shelterId) { 51 51 this.imageUrl = imageUrl; 52 52 this.ageGroup = ageGroup; -
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Post.java
reef07ff rf194b4e 5 5 6 6 import java.time.LocalDate; 7 import java.util.Date;8 7 9 8 @Data … … 24 23 25 24 @Column(name="id_pet", nullable = false) 26 private intpetId;25 private Integer petId; 27 26 28 27 @Column(name="id_surendee") 29 private intsurendeeId;28 private Integer surendeeId; 30 29 31 30 @Column(name="id_employee") 32 private intemployeeId;31 private Integer employeeId; 33 32 34 public Post(LocalDate dateCreated, String thumbnailUrl, int petId, int surendeeId, intemployeeId) {33 public Post(LocalDate dateCreated, String thumbnailUrl, Integer petId, Integer surendeeId, Integer employeeId) { 35 34 this.dateCreated = dateCreated; 36 35 this.thumbnailUrl = thumbnailUrl; -
Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/HomeController.java
reef07ff rf194b4e 1 1 package finki.paw5.web.controllers; 2 2 3 import jakarta.servlet.http.HttpServletRequest; 3 4 import org.springframework.stereotype.Controller; 4 5 import org.springframework.web.bind.annotation.GetMapping; … … 10 11 11 12 @GetMapping 12 public String getHomePage(){ 13 public String getHomePage(HttpServletRequest request) { 14 if(request.getSession().getAttribute("user")==null){ 15 return "redirect:/login"; 16 } 13 17 return "home"; 14 18 } 19 15 20 @GetMapping("/aboutUs") 16 public String getSuccessPage() {21 public String getSuccessPage() { 17 22 return "/aboutUs"; 18 23 }
Note:
See TracChangeset
for help on using the changeset viewer.