From 604af48a00beff84e0ddda61dffc7688a79220d9 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Tue, 9 Jul 2024 17:00:05 +0800
Subject: [PATCH] update

---
 .../com/ffii/tsms/modules/data/entity/Staff.java    |  5 ++++-
 .../com/ffii/tsms/modules/data/entity/Team.java     | 13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/Staff.java b/src/main/java/com/ffii/tsms/modules/data/entity/Staff.java
index 4813d7c..0ad8e0c 100644
--- a/src/main/java/com/ffii/tsms/modules/data/entity/Staff.java
+++ b/src/main/java/com/ffii/tsms/modules/data/entity/Staff.java
@@ -15,6 +15,9 @@ import java.util.Set;
 
 @Entity
 @Table(name = "staff")
+@JsonIdentityInfo(
+        generator = ObjectIdGenerators.PropertyGenerator.class,
+        property = "id")
 public class Staff extends BaseEntity<Long> {
     @NotNull
     @OneToOne
@@ -51,7 +54,7 @@ public class Staff extends BaseEntity<Long> {
     private Grade grade;
 
     @ManyToOne
-    @JsonManagedReference
+//    @JsonManagedReference
     @JoinColumn(name = "teamId")
     private Team team;
 
diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/Team.java b/src/main/java/com/ffii/tsms/modules/data/entity/Team.java
index c723931..5ae7074 100644
--- a/src/main/java/com/ffii/tsms/modules/data/entity/Team.java
+++ b/src/main/java/com/ffii/tsms/modules/data/entity/Team.java
@@ -1,6 +1,8 @@
 package com.ffii.tsms.modules.data.entity;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import com.ffii.core.entity.BaseEntity;
 import com.ffii.tsms.modules.user.entity.User;
 import jakarta.persistence.*;
@@ -8,6 +10,9 @@ import jakarta.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "team")
+@JsonIdentityInfo(
+        generator = ObjectIdGenerators.PropertyGenerator.class,
+        property = "id")
 public class Team extends BaseEntity<Long> {
     @Column(name = "description", length = 1500)
     private String description;
@@ -22,14 +27,10 @@ public class Team extends BaseEntity<Long> {
 
     @NotNull
     @OneToOne
-    @JsonBackReference
+//    @JsonBackReference
     @JoinColumn(name = "teamLead", unique = true)
     private Staff staff;
 
-//    @NotNull
-    @OneToOne(mappedBy = "team", cascade = CascadeType.ALL, orphanRemoval = true)
-    private Staff teamLead;
-
     public String getDescription() {
         return description;
     }
@@ -58,5 +59,5 @@ public class Team extends BaseEntity<Long> {
 
     public void setStaff(Staff staff) { this.staff = staff; }
 
-    public Staff getTeamLead() { return teamLead;}
+
 }
\ No newline at end of file