refactor: redis를 활용한 조회 성능 최적화

main/src/main/java/org/sopt/makers/crew/main/entity/user/User.java

@@ -9,97 +9,129 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
+
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+
 import org.hibernate.annotations.Type;
 import org.sopt.makers.crew.main.entity.common.BaseTimeEntity;
 import org.sopt.makers.crew.main.global.exception.ServerException;
 import org.sopt.makers.crew.main.entity.user.vo.UserActivityVO;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "user")
 public class User extends BaseTimeEntity {
 
-    /**
-     * Primary Key
-     */
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
-
-    /**
-     * 사용자 이름
-     */
-    @Column(name = "name", nullable = false)
-    private String name;
-
-    /**
-     * sopt org unique id
-     */
-    @Column(name = "orgId", nullable = false)
-    private Integer orgId;
-
-    /**
-     * 활동 목록
-     */
-    @Column(name = "activities", columnDefinition = "jsonb")
-    @Type(JsonBinaryType.class)
-    private List<UserActivityVO> activities;
-
-    /**
-     * 프로필 이미지
-     */
-    @Column(name = "profileImage")
-    private String profileImage;
-
-    /**
-     * 핸드폰 번호
-     */
-    @Column(name = "phone")
-    private String phone;
-
-    @Builder
-    public User(Integer id, String name, Integer orgId, List<UserActivityVO> activities, String profileImage,
-                String phone) {
-        this.id = id;
-        this.name = name;
-        this.orgId = orgId;
-        this.activities = activities;
-        this.profileImage = profileImage;
-        this.phone = phone;
-    }
-
-    public void setUserIdForTest(Integer userId) {
-        this.id = userId;
-    }
-
-    public UserActivityVO getRecentActivityVO(){
-        return activities.stream()
-                .filter(userActivityVO -> userActivityVO.getPart() != null)
-                .max(Comparator.comparingInt(UserActivityVO::getGeneration))
-                .orElseThrow(() -> new ServerException(INTERNAL_SERVER_ERROR.getErrorCode()));
-    }
-
-    public void updateUser(String name, Integer orgId, List<UserActivityVO> activities, String profileImage,
-        String phone){
-
-        this.name = name;
-        this.orgId = orgId;
-        this.activities = activities;
-        this.profileImage = profileImage;
-        this.phone = phone;
-    }
-
-    public List<UserActivityVO> getActivities() {
-        return activities;
-    }
+	/**
+	 * Primary Key
+	 */
+	@Id
+	@Column(name = "id")
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	/**
+	 * 사용자 이름
+	 */
+	@Column(name = "name", nullable = false)
+	private String name;
+
+	/**
+	 * sopt org unique id
+	 */
+	@Column(name = "orgId", nullable = false)
+	private Integer orgId;
+
+	/**
+	 * 활동 목록
+	 */
+	@Column(name = "activities", columnDefinition = "jsonb")
+	@Type(JsonBinaryType.class)
+	private List<UserActivityVO> activities;
+
+	/**
+	 * 프로필 이미지
+	 */
+	@Column(name = "profileImage")
+	private String profileImage;
+
+	/**
+	 * 핸드폰 번호
+	 */
+	@Column(name = "phone")
+	private String phone;
+
+	@Builder
+	public User(String name, Integer orgId, List<UserActivityVO> activities, String profileImage,
+		String phone) {
+		this.name = name;
+		this.orgId = orgId;
+		this.activities = activities;
+		this.profileImage = profileImage;
+		this.phone = phone;
+	}
+
+	public void setUserIdForTest(Integer userId) {
+		this.id = userId;
+	}
+
+	/**
+	 * @implSpec : redis 에서 조회한 데이터를 엔티티로 변환할 때 사용하는 메서드
+	 *
+	 * **/
+	public User withUserIdForRedis(Integer id) {
+		this.id = id;
+		return this;
+	}
+
+	public UserActivityVO getRecentActivityVO() {
+		return activities.stream()
+			.filter(userActivityVO -> userActivityVO.getPart() != null)
+			.max(Comparator.comparingInt(UserActivityVO::getGeneration))
+			.orElseThrow(() -> new ServerException(INTERNAL_SERVER_ERROR.getErrorCode()));
+	}
+
+	public boolean updateIfChanged(User playgroundUser) {
+		boolean isUpdated = false;
+
+		if (!Objects.equals(this.name, playgroundUser.getName())) {
+			this.name = playgroundUser.getName();
+			isUpdated = true;
+		}
+
+		if (!Objects.equals(this.orgId, playgroundUser.getId())) {
+			this.orgId = playgroundUser.getId();
+			isUpdated = true;
+		}
+
+		if (!Objects.equals(this.activities, playgroundUser.getActivities())) {
+			this.activities = playgroundUser.getActivities();
+			isUpdated = true;
+		}
+
+		if (!Objects.equals(this.profileImage, playgroundUser.getProfileImage())) {
+			this.profileImage = playgroundUser.getProfileImage();
+			isUpdated = true;
+		}
+
+		if (!Objects.equals(this.phone, playgroundUser.getPhone())) {
+			this.phone = playgroundUser.getPhone();
+			isUpdated = true;
+		}
+
+		return isUpdated;
+	}
+
+	public List<UserActivityVO> getActivities() {
+		return activities;
+	}
 }