Merge branch 'main' into feat/#117

Author: Creamcheesepie

.github/workflows/ci.yml

@@ -38,6 +38,10 @@ jobs:
       KAKAO_CLIENT_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }}
       KAKAO_REDIRECT_URI: ${{ secrets.KAKAO_REDIRECT_URI }}
 
+      GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+      GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
+      GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

src/main/java/com/back/web7_9_codecrete_be/domain/artists/controller/ArtistsController.java

@@ -5,6 +5,7 @@
 import com.back.web7_9_codecrete_be.domain.artists.dto.request.UpdateRequest;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistListResponse;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistDetailResponse;
+import com.back.web7_9_codecrete_be.domain.artists.dto.response.ConcertListByArtistResponse;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.SearchResponse;
 import com.back.web7_9_codecrete_be.domain.artists.service.ArtistService;
 import com.back.web7_9_codecrete_be.domain.artists.service.ArtistEnrichService;
@@ -115,28 +116,41 @@ public RsData<Void> deleteArtistLikes(
         return RsData.success("아티스트 찜 해제 성공", null);
     }
 
-    @Operation(summary = "개인화된 공연 리스트 생성", description = "유저가 찜한 아티스트를 기반으로 공연 리스트를 생성합니다.")
-    @PostMapping("/list")
-    public void concertList() {}
+    @Operation(summary = "아티스트 공연 기록 저장", description = "아티스트 id 와 공연 id 를 받아 해당 아티스트의 공연 기록을 저장합니다.")
+    @PostMapping("/link/{artistId}/{concertId}")
+    public RsData<Void> saveConcertArtist(
+            @PathVariable Long artistId,
+            @PathVariable Long concertId
+    ) {
+        artistService.linkArtistConcert(artistId, concertId);
+        return RsData.success("아티스트 공연 기록 저장 성공", null);
+    }
+
+    @Operation(summary = "개인화된 공연 리스트 생성", description = "유저가 찜한 아티스트들의 공연 리스트를 조회합니다. 로그인한 유저만 가능합니다.")
+    @GetMapping("/list")
+    public RsData<List<ConcertListByArtistResponse>> concertList() {
+        User user = rq.getUser();
+        return RsData.success("찜한 아티스트 공연 리스트 조회 성공", artistService.getConcertList(user.getId()));
+    }
 
-    @Operation(summary = "아티스트 인기 순위", description = "Spotify 인기도를 바탕으로 아티스트 인기 순위 랭킹을 제공합니다.")
+    @Operation(summary = "아티스트 인기 순위(구현 전)", description = "Spotify 인기도를 바탕으로 아티스트 인기 순위 랭킹을 제공합니다.")
     @GetMapping("/ranking")
     public void artistRanking() {}
 
-    @Operation(summary = "장르 기반 아티스트 추천", description = "찜한 장르를 기반으로 아티스트 추천 리스트를 제공합니다.")
+    @Operation(summary = "장르 기반 아티스트 추천(구현 전)", description = "찜한 장르를 기반으로 아티스트 추천 리스트를 제공합니다.")
     @GetMapping("/recommendation/{genreId}")
     public void recommendArtist(
             @PathVariable Long genreId
     ) {}
 
-    @Operation(summary = "공연 셋리스트 생성", description = "사용자가 공연 셋리스트를 생성합니다.")
+    @Operation(summary = "공연 셋리스트 생성(구현 전)", description = "사용자가 공연 셋리스트를 생성합니다.")
     @PostMapping("/setlist/{concertId}/{artistId}")
     public void makeSetlist(
             @PathVariable Long concertId,
             @PathVariable Long artistId
     ) {}
 
-    @Operation(summary = "공연 셋리스트 조회", description = "다른 사용자들이 생성한 셋리스트를 조회합니다.")
+    @Operation(summary = "공연 셋리스트 조회(구현 전)", description = "다른 사용자들이 생성한 셋리스트를 조회합니다.")
     @GetMapping("/setlist/{concertId}/{artistId}")
     public void getSetlist(
             @PathVariable Long concertId,

src/main/java/com/back/web7_9_codecrete_be/domain/artists/dto/response/ConcertListByArtistResponse.java

@@ -0,0 +1,19 @@
+package com.back.web7_9_codecrete_be.domain.artists.dto.response;
+
+import com.back.web7_9_codecrete_be.domain.concerts.entity.Concert;
+
+import java.time.LocalDate;
+
+public record ConcertListByArtistResponse(
+        String concertName,
+        LocalDate startDate,
+        String concertPlace
+) {
+    public static ConcertListByArtistResponse from(Concert concert) {
+        return new ConcertListByArtistResponse(
+                concert.getName(),
+                concert.getStartDate(),
+                concert.getConcertPlace().getPlaceName()
+        );
+    }
+}

src/main/java/com/back/web7_9_codecrete_be/domain/artists/entity/ArtistLike.java

@@ -2,6 +2,7 @@
 
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import jakarta.persistence.*;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
@@ -12,7 +13,7 @@
 
 @Entity
 @Getter
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @EntityListeners(AuditingEntityListener.class)
 @Table(name = "artist_like")
 public class ArtistLike {

src/main/java/com/back/web7_9_codecrete_be/domain/artists/entity/ConcertArtist.java

@@ -1,10 +1,14 @@
 package com.back.web7_9_codecrete_be.domain.artists.entity;
 
+import com.back.web7_9_codecrete_be.domain.concerts.entity.Concert;
 import jakarta.persistence.*;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "concert_artist")
 public class ConcertArtist {
     @Id
@@ -13,11 +17,15 @@ public class ConcertArtist {
     private long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "artist_id", nullable = false)
     private Artist artist;
 
-    // TODO : 추후 concert entity 보고 확인 예정 우선 주석 처리
-    /*
     @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "concert_id", nullable = false)
     private Concert concert;
-     */
+
+    public ConcertArtist(Artist artist, Concert concert) {
+        this.artist = artist;
+        this.concert = concert;
+    }
 }

src/main/java/com/back/web7_9_codecrete_be/domain/artists/repository/ArtistLikeRepository.java

@@ -4,13 +4,22 @@
 import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistLike;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface ArtistLikeRepository extends JpaRepository<ArtistLike, Long> {
     long countByArtistId(Long artistId);
     boolean existsByArtistAndUser(Artist artist, User user);
     Optional<ArtistLike> findByArtistAndUser(Artist artist, User user);
+    @Query("""
+        select al.artist.id
+        from ArtistLike al
+        where al.user.id = :userId
+    """)
+    List<Long> findArtistIdsByUserId(@Param("userId") Long userId);
 }

src/main/java/com/back/web7_9_codecrete_be/domain/artists/service/ArtistService.java

@@ -4,16 +4,17 @@
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistListResponse;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.ArtistDetailResponse;
 import com.back.web7_9_codecrete_be.domain.artists.dto.response.SearchResponse;
-import com.back.web7_9_codecrete_be.domain.artists.entity.Artist;
-import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistLike;
-import com.back.web7_9_codecrete_be.domain.artists.entity.ArtistType;
-import com.back.web7_9_codecrete_be.domain.artists.entity.Genre;
+import com.back.web7_9_codecrete_be.domain.artists.entity.*;
 import com.back.web7_9_codecrete_be.domain.artists.repository.ArtistRepository;
 import com.back.web7_9_codecrete_be.domain.artists.repository.ArtistLikeRepository;
+import com.back.web7_9_codecrete_be.domain.artists.repository.ConcertArtistRepository;
+import com.back.web7_9_codecrete_be.domain.artists.dto.response.ConcertListByArtistResponse;
+import com.back.web7_9_codecrete_be.domain.concerts.entity.Concert;
+import com.back.web7_9_codecrete_be.domain.concerts.repository.ConcertRepository;
+import com.back.web7_9_codecrete_be.domain.concerts.service.ConcertService;
 import com.back.web7_9_codecrete_be.domain.users.entity.User;
 import com.back.web7_9_codecrete_be.global.error.code.ArtistErrorCode;
 import com.back.web7_9_codecrete_be.global.error.exception.BusinessException;
-import com.back.web7_9_codecrete_be.global.rq.Rq;
 import lombok.AccessLevel;
 import org.springframework.transaction.annotation.Transactional;
 import lombok.RequiredArgsConstructor;
@@ -29,6 +30,9 @@ public class ArtistService {
     private final ArtistRepository artistRepository;
     private final GenreService genreService;
     private final ArtistLikeRepository artistLikeRepository;
+    private final ConcertArtistRepository concertArtistRepository;
+    private final ConcertRepository concertRepository;
+    private final ConcertService concertService;
 
     @Transactional(readOnly = true)
     public Artist findArtist(Long artistId) {
@@ -153,4 +157,29 @@ public void deleteLikeArtist(Long artistId, User user) {
         artist.decreaseLikeCount();
     }
 
+    @Transactional
+    public void linkArtistConcert(Long artistId, Long concertId) {
+        Artist artist = findArtist(artistId);
+        // TODO: 멘토링 질문 남겨놓은 기능이라, 멘토링 후 구현 방향 확정되면 함수 선언 후 Service 사용 예정. 현재는 임시로 Repository 사용
+        Concert concert = concertRepository.findById(concertId)
+                .orElseThrow();
+        concertArtistRepository.save(new ConcertArtist(artist, concert));
+    }
+
+    @Transactional(readOnly = true)
+    public List<ConcertListByArtistResponse> getConcertList(Long userId) {
+        List<Long> artistIds =
+                artistLikeRepository.findArtistIdsByUserId(userId);
+
+        // 찜한 아티스트가 없는 경우 빈 배열 반환 -> 예외 처리(Error 던지기) 안 함
+        if (artistIds.isEmpty()) {
+            return List.of();
+        }
+        List<Concert> concerts = concertService.findConcertsByArtistIds(artistIds);
+        return concerts.stream()
+                .map(ConcertListByArtistResponse::from)
+                .toList();
+    }
+
+
 }

src/main/java/com/back/web7_9_codecrete_be/domain/auth/dto/google/GoogleTokenResponse.java

@@ -0,0 +1,20 @@
+package com.back.web7_9_codecrete_be.domain.auth.dto.google;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+
+@Getter
+public class GoogleTokenResponse {
+
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    @JsonProperty("expires_in")
+    private int expiresIn;
+
+    @JsonProperty("token_type")
+    private String tokenType;
+
+    @JsonProperty("scope")
+    private String scope;
+}

src/main/java/com/back/web7_9_codecrete_be/domain/auth/dto/google/GoogleUserInfo.java

@@ -0,0 +1,13 @@
+package com.back.web7_9_codecrete_be.domain.auth.dto.google;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class GoogleUserInfo {
+    private String socialId;
+    private String email;
+    private String nickname;
+    private String profileImageUrl;
+}

src/main/java/com/back/web7_9_codecrete_be/domain/auth/dto/google/GoogleUserResponse.java

@@ -0,0 +1,24 @@
+package com.back.web7_9_codecrete_be.domain.auth.dto.google;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+
+@Getter
+public class GoogleUserResponse {
+
+    private String id;
+    private String email;
+    private String name;
+
+    @JsonProperty("picture")
+    private String profileImageUrl;
+
+    public GoogleUserInfo toUserInfo() {
+        return new GoogleUserInfo(
+                id,
+                email,
+                name,
+                profileImageUrl
+        );
+    }
+}