Ignore:
Timestamp:
02/16/23 14:42:39 (17 months ago)
Author:
GitHub <noreply@…>
Branches:
main
Children:
245f0ec, 50f2c2a, 9ee306b, f194b4e
Parents:
65f9c71 (diff), aced08c (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@…> (02/16/23 14:42:39)
git-committer:
GitHub <noreply@…> (02/16/23 14:42:39)
Message:

Merge pull request #6 from SazdovaEkaterina/login-and-register

Login and register

File:
1 edited

Legend:

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

    r65f9c71 reef07ff  
    2323
    2424    @Column(name = "has_other_pets")
    25     private boolean hasOtherPets;
     25    private Boolean hasOtherPets;
    2626
    2727    @Column(name = "has_kids")
    28     private boolean hasKids;
     28    private Boolean hasKids;
    2929
    3030    @Column(name = "housing")
     
    3535
    3636    @Column(name = "will_foster")
    37     private boolean willFoster;
     37    private Boolean willFoster;
    3838
    3939    @Column(name = "is_verified", nullable = false)
    40     private boolean verified;
     40    private Boolean verified;
    4141
    4242    @Column(name = "verified_by_employee")
    43     private int verifiedByEmployeeId;
     43    private Integer verifiedByEmployeeId;
    4444
    4545    public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone,
    4646                   FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing,
    47                    PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
     47                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified) {
    4848        super(dateCreated, name, email, password, telephone);
    4949        this.freeTime = freeTime;
     
    5555        this.willFoster = willFoster;
    5656        this.verified = verified;
    57         this.verifiedByEmployeeId = verifiedByEmployeeId;
    5857    }
    5958
Note: See TracChangeset for help on using the changeset viewer.