Changes in / [c3278ac:8b7dd7f]


Ignore:
Location:
Prototype Application/Paw5/src/main
Files:
26 edited

Legend:

Unmodified
Added
Removed

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    98@Data
    109@Entity
    11 @RequiredArgsConstructor
    1210@Table(name = "admin_table")
    1311@PrimaryKeyJoinColumn(name = "id_user")
    1412public class Admin extends User {
    1513
    16     public Admin(LocalDate dateCreated, String name, String email,
    17                  String password, String telephone) {
     14    public Admin(LocalDate dateCreated, String name, String email, String password, String telephone) {
    1815        super(dateCreated, name, email, password, telephone);
    1916    }
     17
     18    public Admin() {
     19    }
    2020}

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

    rc3278ac r8b7dd7f  
    77import jakarta.persistence.*;
    88import lombok.Data;
    9 import lombok.RequiredArgsConstructor;
    109
    1110import java.time.LocalDate;
    … …  
    1413@Entity
    1514@Table(name = "adopter")
    16 @RequiredArgsConstructor
    1715@PrimaryKeyJoinColumn(name = "id_user")
    1816public class Adopter extends User {
    … …  
    4240    private Boolean verified;
    4341
    44     @ManyToOne
    45     @JoinColumn(name = "verified_by_employee")
    46     Employee employeeVerificator;
     42    @Column(name = "verified_by_employee")
     43    private Integer verifiedByEmployeeId;
    4744
    4845    public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone,
    … …  
    6057    }
    6158
     59    public Adopter(FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing,
     60                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
     61        this.freeTime = freeTime;
     62        this.funds = funds;
     63        this.hasOtherPets = hasOtherPets;
     64        this.hasKids = hasKids;
     65        this.housing = housing;
     66        this.physicalActivity = physicalActivity;
     67        this.willFoster = willFoster;
     68        this.verified = verified;
     69        this.verifiedByEmployeeId = verifiedByEmployeeId;
     70    }
     71
     72    public Adopter() {
     73    }
    6274}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    98@Data
    109@Entity
    11 @RequiredArgsConstructor
    1210@Table(name = "adoption")
    1311public class Adoption {
    … …  
    2523
    2624    @Column(name = "approved", nullable = false)
    27     private Boolean approved;
     25    private boolean approved;
    2826
    29     @ManyToOne
    30     @JoinColumn(name = "id_adopter", nullable = false)
    31     private Adopter adopter;
     27    @Column(name = "id_adopter", nullable = false)
     28    private Integer adopterId;
    3229
    33     public Adoption(LocalDate startDate, LocalDate endDateFoster, Boolean approved,
    34                     Adopter adopter) {
     30    public Adoption(LocalDate startDate, LocalDate endDateFoster, boolean approved, Integer adopterId) {
    3531        this.startDate = startDate;
    3632        this.endDateFoster = endDateFoster;
    3733        this.approved = approved;
    38         this.adopter = adopter;
     34        this.adopterId = adopterId;
     35    }
     36
     37    public Adoption() {
    3938    }
    4039}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    6 
    7 import java.util.List;
    85
    96@Data
    107@Entity
    11 @RequiredArgsConstructor
    128@Table(name = "category")
    139public class Category {
    … …  
    2117    private String name;
    2218
    23     @ManyToMany
    24     @JoinTable(name = "pet_belongs_to_category",
    25             joinColumns = @JoinColumn(name = "id_category"),
    26             inverseJoinColumns = @JoinColumn(name = "id_pet"))
    27     List<Pet> pets;
    28 
    2919    public Category(String name) {
    3020        this.name = name;
    3121    }
    3222
     23    public Category() {
     24    }
    3325}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    8 import java.util.List;
    97
    108@Data
    119@Entity
    12 @RequiredArgsConstructor
    1310@Table(name = "donor")
    1411@PrimaryKeyJoinColumn(name = "id_user")
    … …  
    1613
    1714    @Column(name = "is_from_organisation", nullable = false)
    18     private Boolean fromOrganisation;
     15    private boolean fromOrganisation;
    1916
    2017    @Column(name = "name_organisation_donor", nullable = true, length = 100)
    2118    private String organisationName;
    2219
    23     @ManyToMany
    24     @JoinTable(name = "donor_donates_to_organisation",
    25             joinColumns = @JoinColumn(name = "id_user"),
    26             inverseJoinColumns = @JoinColumn(name = "id_organisation"))
    27     List<Organisation> donatedToOrganisations;
    28 
    29     public Donor(LocalDate dateCreated, String name, String email,
    30                  String password, String telephone, Boolean fromOrganisation,
    31                  String organisationName) {
     20    public Donor(LocalDate dateCreated, String name, String email, String password, String telephone, boolean fromOrganisation, String organisationName) {
    3221        super(dateCreated, name, email, password, telephone);
    3322        this.fromOrganisation = fromOrganisation;
    … …  
    3524    }
    3625
     26    public Donor(boolean fromOrganisation, String organisationName) {
     27        this.fromOrganisation = fromOrganisation;
     28        this.organisationName = organisationName;
     29    }
     30
     31    public Donor() {
     32    }
     33
    3734}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    98@Data
    109@Entity
    11 @RequiredArgsConstructor
    1210@Table(name = "employee")
    1311@PrimaryKeyJoinColumn(name = "id_user")
    … …  
    1715    private String position;
    1816
    19     @ManyToOne
    20     @JoinColumn(name = "id_shelter", nullable = false)
    21     private Shelter shelter;
     17    @Column(name = "id_shelter", nullable = false)
     18    private Integer shelterId;
    2219
    2320    @Column(name = "is_verified", nullable = false)
    24     private Boolean verified;
     21    private boolean verified;
    2522
    26     @ManyToOne
    27     @JoinColumn(name = "verified_by_admin")
    28     private Admin adminVerificator;
     23    @Column(name = "verified_by_admin")
     24    private Integer verifiedByAdminId;
    2925
    3026    public Employee(LocalDate dateCreated, String name, String email, String password, String telephone,
    31                     String position, Shelter shelter, Boolean verified) {
     27                    String position, int shelterId, boolean verified) {
    3228        super(dateCreated, name, email, password, telephone);
    3329        this.position = position;
    34         this.shelter = shelter;
     30        this.shelterId = shelterId;
    3531        this.verified = verified;
    3632    }
    3733
     34    public Employee(String position, int shelterId, boolean verified, int verifiedByAdminId) {
     35        this.position = position;
     36        this.shelterId = shelterId;
     37        this.verified = verified;
     38        this.verifiedByAdminId = verifiedByAdminId;
     39    }
     40
     41    public Employee() {
     42
     43    }
     44
    3845}

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

    rc3278ac r8b7dd7f  
    44import jakarta.persistence.*;
    55import lombok.Data;
    6 import lombok.RequiredArgsConstructor;
    7 
    8 import java.util.List;
    96
    107@Data
    118@Entity
    12 @RequiredArgsConstructor
    139@Table(name = "food")
    1410public class Food {
    … …  
    2824    private FoodType type;
    2925
    30     @ManyToMany
    31     @JoinTable(name = "pet_preferably_eats_food",
    32             joinColumns = @JoinColumn(name = "id_food"),
    33             inverseJoinColumns = @JoinColumn(name = "id_pet"))
    34     List<Pet> pets;
    35 
    3626    public Food(String manufacturer, String name, FoodType type) {
    3727        this.manufacturer = manufacturer;
    … …  
    3929        this.type = type;
    4030    }
     31
     32    public Food() {
     33    }
    4134}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    6 
    7 import java.util.List;
    85
    96@Data
    107@Entity
    11 @RequiredArgsConstructor
    128@Table(name = "organisation")
    139public class Organisation {
    … …  
    2723    private String billingInformation;
    2824
    29     @ManyToMany
    30     @JoinTable(name = "donor_donates_to_organisation",
    31             joinColumns = @JoinColumn(name = "id_organisation"),
    32             inverseJoinColumns = @JoinColumn(name = "id_user"))
    33     List<Donor> donors;
    34 
    3525    public Organisation(String name, String email, String billingInformation) {
    3626        this.name = name;
    … …  
    3828        this.billingInformation = billingInformation;
    3929    }
     30
     31    public Organisation() {
     32    }
    4033}

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

    rc3278ac r8b7dd7f  
    22
    33import finki.paw5.model.enumerations.*;
    4 import jakarta.persistence.*;
     4import jakarta.persistence.Column;
     5import jakarta.persistence.Entity;
     6import jakarta.persistence.Id;
     7import jakarta.persistence.Table;
    58import lombok.Data;
    6 import lombok.RequiredArgsConstructor;
    79
    810@Data
    911@Entity
    10 @RequiredArgsConstructor
    1112@Table(name = "personal_profile")
    1213public class PersonalProfile {
    … …  
    1516    @Column(name = "id_pet", nullable = false)
    1617    private Integer id;
    17 
    18     @OneToOne
    19     @JoinColumn(name = "id_pet", nullable = false)
    20     private Pet pet;
    2118
    2219    @Column(name = "friendly_to_kids", nullable = false)
    … …  
    3532    private GroomingNeed groomingNeed;
    3633
    37     public PersonalProfile(Integer id, Pet pet, FriendlyToKids friendlyToKids, FriendlyToPets friendlyToPets, AttentionNeed attentionNeed, PhysicalActivity physicalActivity, GroomingNeed groomingNeed) {
     34    public PersonalProfile(Integer id, FriendlyToKids friendlyToKids, FriendlyToPets friendlyToPets, AttentionNeed attentionNeed, PhysicalActivity physicalActivity, GroomingNeed groomingNeed) {
    3835        this.id = id;
    39         this.pet = pet;
    4036        this.friendlyToKids = friendlyToKids;
    4137        this.friendlyToPets = friendlyToPets;
    … …  
    4440        this.groomingNeed = groomingNeed;
    4541    }
     42
     43    public PersonalProfile() {
     44    }
    4645}

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

    rc3278ac r8b7dd7f  
    77import jakarta.persistence.*;
    88import lombok.Data;
    9 import lombok.RequiredArgsConstructor;
    10 
    11 import java.util.List;
    129
    1310@Data
    1411@Entity
    15 @RequiredArgsConstructor
    1612@Table(name = "pet")
    1713public class Pet {
    … …  
    2117    @Column(name = "id_pet")
    2218    private Integer id;
    23 
    24     @OneToOne
    25     @JoinColumn(name = "id_pet", nullable = false)
    26     private PersonalProfile personalProfile;
    2719
    2820    @Column(name = "url_pet_image", length = 200)
    … …  
    4840
    4941    @Column(name = "can_be_fostered", nullable = false)
    50     private Boolean canBeFostered;
     42    private boolean canBeFostered;
    5143
    52     @ManyToOne
    53     @JoinColumn(name = "id_adoption")
    54     private Adoption adoption;
     44    @Column(name = "id_adoption")
     45    private Integer adoptionId;
    5546
    56     @ManyToOne
    57     @JoinColumn(name = "id_shelter")
    58     private Shelter shelter;
     47    @Column(name = "id_shelter")
     48    private Integer shelterId;
    5949
    60     @ManyToMany
    61     @JoinTable(name = "pet_belongs_to_category",
    62             joinColumns = @JoinColumn(name = "id_pet"),
    63             inverseJoinColumns = @JoinColumn(name = "id_category"))
    64     List<Category> categories;
    65 
    66     @ManyToMany
    67     @JoinTable(name = "pet_needs_intervention_in_vet_clinic",
    68             joinColumns = @JoinColumn(name = "id_pet"),
    69             inverseJoinColumns = @JoinColumn(name = "id_vet_clinic"))
    70     List<VetClinic> vetClinicsTreatedIn;
    71 
    72     @ManyToMany
    73     @JoinTable(name = "pet_needs_therapy",
    74             joinColumns = @JoinColumn(name = "id_pet"),
    75             inverseJoinColumns = @JoinColumn(name = "id_therapy"))
    76     List<Therapy> therapies;
    77 
    78     @ManyToMany
    79     @JoinTable(name = "pet_preferably_eats_food",
    80             joinColumns = @JoinColumn(name = "id_pet"),
    81             inverseJoinColumns = @JoinColumn(name = "id_food"))
    82     List<Food> preferredFoods;
    83 
    84     public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed,
    85                String name, Species species, Gender gender, Boolean canBeFostered,
    86                Adoption adoption, Shelter shelter) {
     50    public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, Integer adoptionId, Integer shelterId) {
    8751        this.imageUrl = imageUrl;
    8852        this.ageGroup = ageGroup;
    … …  
    9357        this.gender = gender;
    9458        this.canBeFostered = canBeFostered;
    95         this.adoption = adoption;
    96         this.shelter = shelter;
     59        this.adoptionId = adoptionId;
     60        this.shelterId = shelterId;
     61    }
     62
     63    public Pet() {
    9764    }
    9865}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    98@Data
    109@Entity
    11 @RequiredArgsConstructor
    1210@Table(name = "post")
    1311public class Post {
    … …  
    2422    private String thumbnailUrl;
    2523
    26     @OneToOne
    27     @JoinColumn(name="id_pet", nullable = false)
    28     private Pet pet;
     24    @Column(name="id_pet", nullable = false)
     25    private Integer petId;
    2926
    30     @ManyToOne
    31     @JoinColumn(name="id_surendee")
    32     private Surendee surendeePoster;
     27    @Column(name="id_surendee")
     28    private Integer surendeeId;
    3329
    34     @ManyToOne
    35     @JoinColumn(name="id_employee")
    36     private Employee employeePoster;
     30    @Column(name="id_employee")
     31    private Integer employeeId;
    3732
    38     public Post(LocalDate dateCreated, String thumbnailUrl,
    39                 Pet pet, Surendee surendeePoster, Employee employeePoster) {
     33    public Post(LocalDate dateCreated, String thumbnailUrl, Integer petId, Integer surendeeId, Integer employeeId) {
    4034        this.dateCreated = dateCreated;
    4135        this.thumbnailUrl = thumbnailUrl;
    42         this.pet = pet;
    43         this.surendeePoster = surendeePoster;
    44         this.employeePoster = employeePoster;
     36        this.petId = petId;
     37        this.surendeeId = surendeeId;
     38        this.employeeId = employeeId;
     39    }
     40
     41    public Post() {
    4542    }
    4643}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76@Data
    87@Entity
    9 @RequiredArgsConstructor
    108@Table(name = "shelter")
    119public class Shelter {
    … …  
    2220    private String telephone;
    2321
    24     @ManyToOne
    25     @JoinColumn(name = "id_organisation")
    26     private Organisation organisation;
     22    @Column(name = "id_organisation")
     23    private Integer organisationId;
    2724
    2825    @Column(name = "name_shelter", nullable = false, length = 100)
    … …  
    3229    private String email;
    3330
    34     public Shelter(String address, String telephone, Organisation organisation,
    35                    String name, String email) {
     31    public Shelter(String address, String telephone, Integer organisationId, String name, String email) {
    3632        this.address = address;
    3733        this.telephone = telephone;
    38         this.organisation = organisation;
     34        this.organisationId = organisationId;
    3935        this.name = name;
    4036        this.email = email;
    4137    }
     38
     39    public Shelter() {
     40    }
    4241}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    98@Data
    109@Entity
    11 @RequiredArgsConstructor
    1210@Table(name = "surendee")
    1311@PrimaryKeyJoinColumn(name = "id_user")
    … …  
    1816    }
    1917
     18    public Surendee() {
     19    }
     20
    2021}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    87import java.util.Date;
    9 import java.util.List;
    108
    119@Data
    1210@Entity
    13 @RequiredArgsConstructor
    1411@Table(name = "therapy")
    1512public class Therapy {
    … …  
    2926    private LocalDate endDate;
    3027
    31     @ManyToMany
    32     @JoinTable(name = "pet_needs_therapy",
    33             joinColumns = @JoinColumn(name = "id_therapy"),
    34             inverseJoinColumns = @JoinColumn(name = "id_pet"))
    35     List<Pet> pets;
    36 
    3728    public Therapy(String healthProblem, LocalDate startDate, LocalDate endDate) {
    3829        this.healthProblem = healthProblem;
    … …  
    4031        this.endDate = endDate;
    4132    }
     33
     34    public Therapy() {
     35    }
    4236}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    109@Data
    1110@Entity
    12 @RequiredArgsConstructor
    1311@Table(name = "user_table")
    1412@Inheritance(strategy = InheritanceType.JOINED)
    … …  
    4240        this.telephone = telephone;
    4341    }
     42
     43    public User() {
     44    }
    4445}

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

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    6 
    7 import java.util.List;
    85
    96@Data
    107@Entity
    11 @RequiredArgsConstructor
    128@Table(name = "vet_clinic")
    139public class VetClinic {
    … …  
    2723    private String name;
    2824
    29     @ManyToMany
    30     @JoinTable(name = "pet_needs_intervention_in_vet_clinic",
    31             joinColumns = @JoinColumn(name = "id_vet_clinic"),
    32             inverseJoinColumns = @JoinColumn(name = "id_pet"))
    33     List<Pet> pets;
    34 
    3525    public VetClinic(String telephone, String address, String name) {
    3626        this.telephone = telephone;
    … …  
    3828        this.name = name;
    3929    }
     30
     31    public VetClinic() {
     32    }
    4033}

  • Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisation.java

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76@Data
    87@Entity
    9 @RequiredArgsConstructor
    108@Table(name = "donor_donates_to_organisation")
    119@IdClass(DonorDonatesToOrganisationId.class)
    … …  
    2422        this.organisationId = organisationId;
    2523    }
     24
     25    public DonorDonatesToOrganisation() {
     26       
     27    }
    2628}

  • Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetBelongsToCategory.java

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76@Data
    87@Entity
    9 @RequiredArgsConstructor
    108@Table(name = "pet_belongs_to_category")
    119@IdClass(PetBelongsToCategoryId.class)
    … …  
    2422        this.categoryId = categoryId;
    2523    }
     24
     25    public PetBelongsToCategory() {
     26
     27    }
    2628}

  • Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinic.java

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76import java.time.LocalDate;
    … …  
    109@Data
    1110@Entity
    12 @RequiredArgsConstructor
    1311@Table(name = "pet_needs_intervention_in_vet_clinic")
    1412@IdClass(PetNeedsInterventionInVetClinicId.class)
    … …  
    3533        this.description = description;
    3634    }
     35
     36    public PetNeedsInterventionInVetClinic() {
     37
     38    }
    3739}

  • Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsTherapy.java

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76@Data
    87@Entity
    9 @RequiredArgsConstructor
    108@Table(name = "pet_needs_therapy")
    119@IdClass(PetNeedsTherapyId.class)
    … …  
    2422        this.therapyId = therapyId;
    2523    }
     24
     25    public PetNeedsTherapy() {
     26    }
    2627}

  • Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetPreferablyEatsFood.java

    rc3278ac r8b7dd7f  
    33import jakarta.persistence.*;
    44import lombok.Data;
    5 import lombok.RequiredArgsConstructor;
    65
    76@Data
    87@Entity
    9 @RequiredArgsConstructor
    108@Table(name = "pet_preferably_eats_food")
    119@IdClass(PetPreferablyEatsFoodId.class)
    … …  
    2826        this.quantityPerDay = quantityPerDay;
    2927    }
     28
     29    public PetPreferablyEatsFood() {
     30    }
    3031}

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

    rc3278ac r8b7dd7f  
    33import finki.paw5.model.entities.Adopter;
    44import finki.paw5.model.entities.Employee;
    5 import finki.paw5.model.entities.Shelter;
    65import finki.paw5.model.entities.User;
    76import finki.paw5.model.enumerations.FreeTime;
    … …  
    1110import finki.paw5.repository.AdopterRepository;
    1211import finki.paw5.repository.EmployeeRepository;
    13 import finki.paw5.repository.ShelterRepository;
    1412import finki.paw5.repository.UserRepository;
    1513import finki.paw5.service.AuthService;
    … …  
    2422    private final AdopterRepository adopterRepository;
    2523    private final EmployeeRepository employeeRepository;
    26     private final ShelterRepository shelterRepository;
    2724
    28     public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository, ShelterRepository shelterRepository) {
     25    public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
    2926        this.userRepository = userRepository;
    3027        this.adopterRepository = adopterRepository;
    3128        this.employeeRepository = employeeRepository;
    32         this.shelterRepository = shelterRepository;
    3329    }
    3430
    … …  
    5147    @Override
    5248    public Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId) {
    53         Shelter shelter = this.shelterRepository.findById(shelterId).get();
    54         Employee employee = new Employee(LocalDate.now(),name, email,password,telephone,position,shelter,false);
     49        Employee employee = new Employee(LocalDate.now(),name, email,password,telephone,position,shelterId,false);
    5550        return employeeRepository.save(employee);
    5651    }

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

    rc3278ac r8b7dd7f  
    11package finki.paw5.web.controllers;
    22
    3 import finki.paw5.model.entities.Adopter;
    43import finki.paw5.model.entities.Adoption;
    54import finki.paw5.model.entities.Pet;
     5import finki.paw5.model.entities.User;
     6import finki.paw5.model.exceptions.InvalidPetIdException;
    67import finki.paw5.service.AdoptionService;
    78import finki.paw5.service.PetService;
    … …  
    2425    }
    2526
    26     @PostMapping("/submit-adoption-{id}")
     27    @PostMapping("/submit-adopton-{id}")
    2728    public String saveAdoption(@PathVariable Integer id, HttpServletRequest request) {
    2829
    2930        Pet pet = this.petService.findById(id);
    3031       
    31         Adopter adopter = (Adopter) request.getSession().getAttribute("user");
     32        User user = (User) request.getSession().getAttribute("user");
    3233
    33         Adoption adoption = new Adoption(LocalDate.now(), null, false, adopter);
     34        Adoption adoption = new Adoption(LocalDate.now(), null, false, user.getId());
    3435        this.adoptionService.save(adoption);
    3536
    36         pet.setAdoption(adoption);
     37        pet.setAdoptionId(adoption.getId());
    3738        this.petService.save(pet);
    3839

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

    rc3278ac r8b7dd7f  
    5858        if(newPetCheckbox == true){
    5959
    60             Pet newPet = new Pet(imageUrl, AgeGroup.valueOf(ageGroup), Size.valueOf(size), breed, name, Species.valueOf(species), Gender.valueOf(gender), canBeFostered, null, employee.getShelter());
     60            Pet newPet = new Pet(imageUrl, AgeGroup.valueOf(ageGroup), Size.valueOf(size), breed, name, Species.valueOf(species), Gender.valueOf(gender), canBeFostered, null, employee.getShelterId());
    6161            this.petService.save(newPet);
    6262
    63             Post post = new Post(LocalDate.now(), imageUrl, newPet, null, employee);
     63            Post post = new Post(LocalDate.now(), imageUrl, newPet.getId(), null, employee.getId());
    6464            this.postService.save(post);
    6565
    … …  
    6868            Pet selectedPet = this.petService.findById(petId);
    6969
    70             Post post = new Post(LocalDate.now(), imageUrl, selectedPet, null, employee);
     70            Post post = new Post(LocalDate.now(), imageUrl, selectedPet.getId(), null, employee.getId());
    7171            this.postService.save(post);
    7272
    … …  
    9292
    9393        Post post = this.postService.findById(id).get();
    94         Pet pet = post.getPet();
     94        Pet pet = this.petService.findById(post.getPetId());
    9595
    9696        model.addAttribute("pet", pet);

  • Prototype Application/Paw5/src/main/resources/templates/list-posts-adoption.html

    rc3278ac r8b7dd7f  
    4747    <tr th:each = "post : ${posts}">
    4848        <td th:text = "${post.getId()}"></td>
    49         <td th:text = "${post.getPet().getName()}"></td>
    50         <td th:text = "${post.getPet().getSpecies()}"></td>
     49        <td th:each = "pet : ${pets}" th:if="${post.getPetId()==pet.getId()}" th:text = "${pet.getName()}"></td>
     50        <td th:each = "pet : ${pets}" th:if="${post.getPetId()==pet.getId()}" th:text = "${pet.getSpecies()}"></td>
    5151        <td>
    5252            <form th:action="@{'/pet-details-{id}' (id=${post.getId()})}"

  • Prototype Application/Paw5/src/main/resources/templates/pet-details.html

    rc3278ac r8b7dd7f  
    6868</table>
    6969<form method="POST"
    70       th:action="@{'/submit-adoption-{id}' (id=${pet.getId()})}"
    71       th:if="${pet.getAdoption()==null}">
     70      th:action="@{'/submit-adopton-{id}' (id=${pet.getId()})}"
     71      th:if="${pet.getAdoptionId()==null}">
    7272    <button id="submit"
    7373            type="submit"
Note: See TracChangeset for help on using the changeset viewer.