[머지 금지!] 리뷰용입니다

backend/src/main/java/com/digginroom/digginroom/controller/RoomController.java

@@ -1,9 +1,9 @@
 package com.digginroom.digginroom.controller;
 
+import com.digginroom.digginroom.service.RoomService;
 import com.digginroom.digginroom.service.dto.RoomRequest;
 import com.digginroom.digginroom.service.dto.RoomResponse;
 import com.digginroom.digginroom.service.dto.RoomsResponse;
-import com.digginroom.digginroom.service.RoomService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

backend/src/main/java/com/digginroom/digginroom/domain/UUIDBaseEntity.java

@@ -0,0 +1,29 @@
+package com.digginroom.digginroom.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class UUIDBaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private UUID id;
+    @CreatedDate
+    @Column(updatable = false)
+    private LocalDateTime createdAt;
+    @LastModifiedDate
+    private LocalDateTime updatedAt;
+}

backend/src/main/java/com/digginroom/digginroom/domain/member/Member.java

@@ -1,16 +1,14 @@
 package com.digginroom.digginroom.domain.member;
 
 import com.digginroom.digginroom.domain.BaseEntity;
-import com.digginroom.digginroom.domain.Genre;
+import com.digginroom.digginroom.domain.member.vo.Nickname;
+import com.digginroom.digginroom.domain.member.vo.Password;
+import com.digginroom.digginroom.domain.member.vo.Provider;
 import com.digginroom.digginroom.domain.room.Room;
-import com.digginroom.digginroom.exception.MemberException.DuplicatedFavoriteException;
-import com.digginroom.digginroom.exception.MemberException.EmptyFavoriteException;
-import com.digginroom.digginroom.exception.MemberException.FavoriteExistsException;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
 import lombok.AccessLevel;
@@ -29,16 +27,10 @@ public class Member extends BaseEntity {
     private Password password;
     @Enumerated(value = EnumType.STRING)
     private Provider provider;
-    @Getter(AccessLevel.NONE)
-    private boolean hasFavorite = false;
     @Embedded
     private Nickname nickname;
     @Embedded
     private final ScrapRooms scrapRooms = new ScrapRooms();
-    @Embedded
-    private final DislikeRooms dislikeRooms = new DislikeRooms();
-    @Embedded
-    private final MemberGenres memberGenres = new MemberGenres(this);
 
     private Member(final String username, final Password password, final Provider provider, final Nickname nickname) {
         this.username = username;
@@ -66,70 +58,20 @@ public static Member guest() {
 
     public void scrap(final Room room) {
         scrapRooms.scrap(room);
-        adjustMemberGenreWeight(room, WeightFactor.SCRAP);
     }
 
     public void unscrap(final Room room) {
         scrapRooms.unscrap(room);
-        adjustMemberGenreWeight(room, WeightFactor.UNSCRAP);
-    }
-
-    public void dislike(final Room room) {
-        dislikeRooms.dislike(room);
-        adjustMemberGenreWeight(room, WeightFactor.DISLIKE);
-    }
-
-    public void undislike(final Room room) {
-        dislikeRooms.undislike(room);
-        adjustMemberGenreWeight(room, WeightFactor.UNDISLIKE);
-    }
-
-    public void markFavorite(final List<Genre> genres) {
-        if (hasFavorite) {
-            throw new FavoriteExistsException();
-        }
-        if (hasDuplicate(genres)) {
-            throw new DuplicatedFavoriteException();
-        }
-        if (genres.isEmpty()) {
-            throw new EmptyFavoriteException();
-        }
-
-        for (Genre genre : genres) {
-            memberGenres.adjustWeightBy(genre, WeightFactor.FAVORITE);
-        }
-        hasFavorite = true;
-    }
-
-    private boolean hasDuplicate(final List<Genre> genres) {
-        return new HashSet<>(genres).size() != genres.size();
-    }
-
-    private void adjustMemberGenreWeight(final Room room, final WeightFactor weightFactor) {
-        Genre superGenre = room.getTrack().getSuperGenre();
-        memberGenres.adjustWeightBy(superGenre, weightFactor);
-    }
-
-    public boolean hasFavorite() {
-        return hasFavorite;
     }
 
     public boolean hasScrapped(final Room pickedRoom) {
         return scrapRooms.hasScrapped(pickedRoom);
     }
 
-    public List<MemberGenre> getMemberGenres() {
-        return memberGenres.getAll();
-    }
-
     public List<Room> getScrapRooms() {
         return scrapRooms.getScrapRooms();
     }
 
-    public List<Room> getDislikeRooms() {
-        return dislikeRooms.getDislikeRooms();
-    }
-
     public String getNickname() {
         return nickname.getNickname();
     }

backend/src/main/java/com/digginroom/digginroom/domain/member/Nickname.java → backend/src/main/java/com/digginroom/digginroom/domain/member/vo/Nickname.java

@@ -1,4 +1,4 @@
-package com.digginroom.digginroom.domain.member;
+package com.digginroom.digginroom.domain.member.vo;
 
 import jakarta.persistence.Embeddable;
 import java.util.UUID;

backend/src/main/java/com/digginroom/digginroom/domain/member/Password.java → backend/src/main/java/com/digginroom/digginroom/domain/member/vo/Password.java

@@ -1,4 +1,4 @@
-package com.digginroom.digginroom.domain.member;
+package com.digginroom.digginroom.domain.member.vo;
 
 import com.digginroom.digginroom.util.PasswordEncoder;
 import jakarta.persistence.Embeddable;

backend/src/main/java/com/digginroom/digginroom/domain/member/Provider.java → backend/src/main/java/com/digginroom/digginroom/domain/member/vo/Provider.java

@@ -1,4 +1,4 @@
-package com.digginroom.digginroom.domain.member;
+package com.digginroom.digginroom.domain.member.vo;
 
 import java.util.Arrays;
 import java.util.Optional;

backend/src/main/java/com/digginroom/digginroom/domain/recommend/RoomRecommender.java

@@ -1,11 +1,10 @@
 package com.digginroom.digginroom.domain.recommend;
 
 import com.digginroom.digginroom.domain.Genre;
-import com.digginroom.digginroom.domain.member.Member;
-import com.digginroom.digginroom.domain.member.MemberGenre;
 import com.digginroom.digginroom.domain.room.Room;
 import com.digginroom.digginroom.exception.RecommendException.NoRecommendableRoomException;
 import com.digginroom.digginroom.exception.RecommendException.UnderBoundWeightException;
+import com.digginroom.digginroom.membergenre.domain.MemberGenre;
 import com.digginroom.digginroom.repository.RoomRepository;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
@@ -18,8 +17,7 @@ public class RoomRecommender {
 
     private final RoomRepository roomRepository;
 
-    public Room recommend(final Member member) {
-        List<MemberGenre> memberGenres = member.getMemberGenres();
+    public Room recommend(final List<MemberGenre> memberGenres) {
         Genre recommenedGenre = recommendGenre(memberGenres);
         return recommendRoom(recommenedGenre);
     }

backend/src/main/java/com/digginroom/digginroom/controller/MemberOperationController.java → backend/src/main/java/com/digginroom/digginroom/membergenre/controller/MemberGenreController.java

@@ -1,8 +1,9 @@
-package com.digginroom.digginroom.controller;
+package com.digginroom.digginroom.membergenre.controller;
 
+import com.digginroom.digginroom.controller.Auth;
+import com.digginroom.digginroom.membergenre.service.MemberGenreService;
+import com.digginroom.digginroom.membergenre.service.dto.MemberGenresResponse;
 import com.digginroom.digginroom.service.dto.FavoriteGenresRequest;
-import com.digginroom.digginroom.service.dto.MemberDetailsResponse;
-import com.digginroom.digginroom.service.MemberService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,21 +15,22 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/member")
-public class MemberOperationController {
+public class MemberGenreController {
 
-    private final MemberService memberService;
+    private final MemberGenreService memberGenreService;
 
     @PostMapping("/favorite-genres")
     public ResponseEntity<Void> markFavorite(
             @Auth final Long memberId,
             @RequestBody final FavoriteGenresRequest favoriteGenresRequest
     ) {
-        memberService.markFavorite(memberId, favoriteGenresRequest);
+        memberGenreService.markFavorite(memberId, favoriteGenresRequest);
         return ResponseEntity.ok().build();
     }
 
-    @GetMapping("/me")
-    public ResponseEntity<MemberDetailsResponse> showMemberDetails(@Auth final Long memberId) {
-        return ResponseEntity.ok().body(memberService.getMemberDetails(memberId));
+    @GetMapping("/genres")
+    public ResponseEntity<MemberGenresResponse> showMemberDetails(@Auth final Long memberId) {
+        boolean hasFavorite = memberGenreService.hasFavorite(memberId);
+        return ResponseEntity.ok().body(new MemberGenresResponse(hasFavorite));
     }
 }

backend/src/main/java/com/digginroom/digginroom/domain/member/MemberGenre.java → backend/src/main/java/com/digginroom/digginroom/membergenre/domain/MemberGenre.java

@@ -1,30 +1,30 @@
-package com.digginroom.digginroom.domain.member;
+package com.digginroom.digginroom.membergenre.domain;
 
-import com.digginroom.digginroom.domain.BaseEntity;
 import com.digginroom.digginroom.domain.Genre;
+import com.digginroom.digginroom.domain.UUIDBaseEntity;
+import com.digginroom.digginroom.membergenre.domain.vo.WeightFactor;
+import com.digginroom.digginroom.membergenre.domain.vo.WeightStatus;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @Entity
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class MemberGenre extends BaseEntity {
+public class MemberGenre extends UUIDBaseEntity {
 
     @Enumerated(value = EnumType.STRING)
     private Genre genre;
+    private Long memberId;
     private int weight;
-    @ManyToOne
-    private Member member;
 
-    public MemberGenre(final Genre genre, final Member member) {
+    public MemberGenre(final Genre genre, final Long memberId) {
         this.genre = genre;
         this.weight = WeightStatus.DEFAULT.getValue();
-        this.member = member;
+        this.memberId = memberId;
     }
 
     public boolean isSameGenre(final Genre genre) {

backend/src/main/java/com/digginroom/digginroom/membergenre/domain/MemberGenreEvent.java

@@ -0,0 +1,13 @@
+package com.digginroom.digginroom.membergenre.domain;
+
+import com.digginroom.digginroom.domain.Genre;
+import com.digginroom.digginroom.membergenre.domain.vo.WeightFactor;
+
+public interface MemberGenreEvent {
+
+    Genre getGenre();
+
+    Long getMemberId();
+
+    WeightFactor getWeightFactor();
+}

backend/src/main/java/com/digginroom/digginroom/membergenre/domain/MemberGenreRepository.java

@@ -0,0 +1,11 @@
+package com.digginroom.digginroom.membergenre.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MemberGenreRepository extends JpaRepository<MemberGenre, Long> {
+
+    List<MemberGenre> findByMemberId(final Long memberId);
+
+    boolean existsByMemberId(Long memberId);
+}