Ignore:
Timestamp:
02/05/23 17:43:38 (21 months ago)
Author:
Filip Chorbeski <86695898+FilipChorbeski@…>
Branches:
main
Children:
4d78603
Parents:
8ae6217 (diff), d546868 (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 branch 'main' into adopting-a-pet

Location:
Prototype Application/Paw5/src/main/java/finki/paw5/model
Files:
5 added
1 deleted
5 edited
16 moved

Legend:

Unmodified
Added
Removed

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import jakarta.persistence.*;

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import finki.paw5.model.enumerations.FreeTime;

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1613
    1714    @Id
     15    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1816    @Column(name = "id_adoption")
    19     private int id;
     17    private Integer id;
    2018
    2119    @Column(name = "start_date", nullable = false)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1310
    1411    @Id
     12    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1513    @Column(name = "id_category")
    16     private int id;
     14    private Integer id;
    1715
    1816    @Column(name = "name_category", nullable = false, length = 100)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import jakarta.persistence.*;

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import jakarta.persistence.*;

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import finki.paw5.model.enumerations.FoodType;
    4 import jakarta.persistence.Column;
    5 import jakarta.persistence.Entity;
    6 import jakarta.persistence.Id;
    7 import jakarta.persistence.Table;
     4import jakarta.persistence.*;
    85import lombok.Data;
    96
    … …  
    1411
    1512    @Id
     13    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1614    @Column(name = "id_food")
    17     private int id;
     15    private Integer id;
    1816
    1917    @Column(name = "manufacturer", nullable = false, length = 100)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1310
    1411    @Id
     12    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1513    @Column(name = "id_organisation")
    16     private int id;
     14    private Integer id;
    1715
    1816    @Column(name = "name_organisation", nullable = false, length = 100)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import finki.paw5.model.enumerations.*;
    … …  
    1515    @Id
    1616    @Column(name = "id_pet", nullable = false)
    17     private int id;
     17    private Integer id;
    1818
    1919    @Column(name = "friendly_to_kids", nullable = false)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import finki.paw5.model.enumerations.AgeGroup;
    … …  
    55import finki.paw5.model.enumerations.Size;
    66import finki.paw5.model.enumerations.Species;
    7 import jakarta.persistence.Column;
    8 import jakarta.persistence.Entity;
    9 import jakarta.persistence.Id;
    10 import jakarta.persistence.Table;
     7import jakarta.persistence.*;
    118import lombok.Data;
    129
    … …  
    1714
    1815    @Id
     16    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1917    @Column(name = "id_pet")
    20     private int id;
     18    private Integer id;
    2119
    2220    @Column(name = "url_pet_image", length = 200)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1613
    1714    @Id
     15    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1816    @Column(name = "id_post")
    19     private int id;
     17    private Integer id;
    2018
    2119    @Column(name="date_post", nullable = false)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1310
    1411    @Id
     12    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1513    @Column(name = "id_shelter")
    16     private int id;
     14    private Integer id;
    1715
    1816    @Column(name = "address_shelter", nullable = false, length = 100)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import jakarta.persistence.*;

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1613
    1714    @Id
     15    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1816    @Column(name = "id_therapy")
    19     private int id;
     17    private Integer id;
    2018
    2119    @Column(name = "health_problem", nullable = false, length = 100)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    33import jakarta.persistence.*;
    … …  
    1414
    1515    @Id
     16    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1617    @Column(name = "id_user")
    17     protected int id;
     18    protected Integer id;
    1819
    1920    @Column(name = "date_created_user", nullable = false)

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

    r8ae6217 re294983  
    1 package finki.paw5.model;
     1package finki.paw5.model.entities;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1310
    1411    @Id
     12    @GeneratedValue(strategy = GenerationType.IDENTITY)
    1513    @Column(name = "id_vet_clinic")
    16     private int id;
     14    private Integer id;
    1715
    1816    @Column(name = "telephone_vet_clinic", nullable = false, length = 20)

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

    r8ae6217 re294983  
    11package finki.paw5.model.relations;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    107@Entity
    118@Table(name = "donor_donates_to_organisation")
     9@IdClass(DonorDonatesToOrganisationId.class)
    1210public class DonorDonatesToOrganisation {
    1311
    1412    @Id
    1513    @Column(name="id_user", nullable = false)
    16     private int userId;
     14    private Integer userId;
    1715
    1816    @Id
    1917    @Column(name="id_organisation", nullable = false)
    20     private int organisationId;
     18    private Integer organisationId;
    2119
    2220    public DonorDonatesToOrganisation(int userId, int organisationId) {

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

    r8ae6217 re294983  
    11package finki.paw5.model.relations;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    107@Entity
    118@Table(name = "pet_belongs_to_category")
     9@IdClass(PetBelongsToCategoryId.class)
    1210public class PetBelongsToCategory {
    1311
    1412    @Id
    1513    @Column(name="id_pet", nullable = false)
    16     private int petId;
     14    private Integer petId;
    1715
    1816    @Id
    1917    @Column(name="id_category", nullable = false)
    20     private int categoryId;
     18    private Integer categoryId;
    2119
    2220    public PetBelongsToCategory(int petId, int categoryId) {

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

    r8ae6217 re294983  
    11package finki.paw5.model.relations;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    1310@Entity
    1411@Table(name = "pet_needs_intervention_in_vet_clinic")
     12@IdClass(PetNeedsInterventionInVetClinicId.class)
    1513public class PetNeedsInterventionInVetClinic {
    1614
    1715    @Id
    1816    @Column(name = "id_pet", nullable = false)
    19     private int petId;
     17    private Integer petId;
    2018
    2119    @Id
    2220    @Column(name = "id_vet_clinic", nullable = false)
    23     private int vetClinicId;
     21    private Integer vetClinicId;
    2422
    2523    @Column(name = "date_of_interventing", nullable = false)

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

    r8ae6217 re294983  
    11package finki.paw5.model.relations;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    107@Entity
    118@Table(name = "pet_needs_therapy")
     9@IdClass(PetNeedsTherapyId.class)
    1210public class PetNeedsTherapy {
    1311
    1412    @Id
    1513    @Column(name="id_pet", nullable = false)
    16     private int petId;
     14    private Integer petId;
    1715
    1816    @Id
    1917    @Column(name="id_therapy", nullable = false)
    20     private int therapyId;
     18    private Integer therapyId;
    2119
    2220    public PetNeedsTherapy(int petId, int therapyId) {

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

    r8ae6217 re294983  
    11package finki.paw5.model.relations;
    22
    3 import jakarta.persistence.Column;
    4 import jakarta.persistence.Entity;
    5 import jakarta.persistence.Id;
    6 import jakarta.persistence.Table;
     3import jakarta.persistence.*;
    74import lombok.Data;
    85
    … …  
    107@Entity
    118@Table(name = "pet_preferably_eats_food")
     9@IdClass(PetPreferablyEatsFoodId.class)
    1210public class PetPreferablyEatsFood {
    1311
    1412    @Id
    1513    @Column(name = "id_pet", nullable = false)
    16     private int petId;
     14    private Integer petId;
    1715
    1816    @Id
    1917    @Column(name = "id_food", nullable = false)
    20     private int foodId;
     18    private Integer foodId;
    2119
    2220    @Column(name = "quantity_a_day", nullable = false)
Note: See TracChangeset for help on using the changeset viewer.