Changeset 8952345


Ignore:
Timestamp:
01/19/26 11:53:51 (6 months ago)
Author:
Filip Gavrilovski <filipgavrilovski28@…>
Branches:
main
Children:
ab9c16a
Parents:
838441d
Message:

add models

Location:
finkwave/src/main/java/com/ukim/finki/develop/finkwave
Files:
26 added
3 edited

Legend:

Unmodified
Added
Removed

  • finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/Admin.java

    r838441d r8952345  
    11package com.ukim.finki.develop.finkwave.model;
    22
    3 import jakarta.persistence.*;
     3import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
     4
     5import jakarta.persistence.Column;
     6import jakarta.persistence.Entity;
     7import jakarta.persistence.Id;
     8import jakarta.persistence.JoinColumn;
     9import jakarta.persistence.MapsId;
     10import jakarta.persistence.OneToOne;
     11import jakarta.persistence.Table;
    412import lombok.Getter;
    5 import lombok.Setter;
    613
    714@Entity
    815@Table(name = "admins", schema = "project")
     16@Getter
     17@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
    918public class Admin {
    1019    @Id
    … …  
    1322
    1423    @MapsId
    15     @OneToOne(fetch = FetchType.LAZY)
     24    @OneToOne
    1625    @JoinColumn(name = "user_id")
    17     private User users;
     26    private User user;
    1827
    1928}

  • finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/NonAdminUser.java

    r838441d r8952345  
    1515
    1616    @MapsId
    17     @OneToOne(fetch = FetchType.LAZY)
     17    @OneToOne
    1818    @JoinColumn(name = "user_id")
    19     private User users;
     19    private User user;
    2020
    2121}

  • finkwave/src/main/java/com/ukim/finki/develop/finkwave/model/User.java

    r838441d r8952345  
    22
    33import com.fasterxml.jackson.annotation.JsonIgnore;
    4 import jakarta.persistence.*;
     4import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
     5
     6import jakarta.persistence.Column;
     7import jakarta.persistence.Entity;
     8import jakarta.persistence.Id;
     9import jakarta.persistence.OneToOne;
     10import jakarta.persistence.Table;
    511import lombok.Getter;
    612import lombok.NoArgsConstructor;
    … …  
    1218@NoArgsConstructor
    1319@Table(name = "users")
     20@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
    1421public class User {
    1522    @Id
    … …  
    2027    private String fullName;
    2128
    22     @Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
     29    @Column(nullable = false, length = Integer.MAX_VALUE)
    2330    private String email;
    2431
    25     @Column(name = "password", nullable = false, length = Integer.MAX_VALUE)
     32    @Column(nullable = false, length = Integer.MAX_VALUE)
    2633    @JsonIgnore
    2734    private String password;
    2835
    29     @Column(name = "username", nullable = false, length = Integer.MAX_VALUE)
     36    @Column(nullable = false, length = Integer.MAX_VALUE)
    3037    private String username;
    3138
    … …  
    3340    private String profilePhoto;
    3441
    35     @OneToOne(mappedBy = "users")
     42    @OneToOne(mappedBy = "user")
    3643    @JsonIgnore
    3744    private Admin admin;
    3845
    39     @OneToOne(mappedBy = "users")
     46    @OneToOne(mappedBy = "user")
    4047    @JsonIgnore
    4148    private NonAdminUser nonAdminUser;
Note: See TracChangeset for help on using the changeset viewer.