Merge pull request #75 from TeamMemeSphere/develop

Develop 에서 main으로 머지

Author: kjiyun

.github/workflows/deploy.yml

@@ -45,6 +45,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: Deploy to EC2
         env:
           EC2_SSH_KEY: ${{ secrets.EC2_SSH_KEY }}
@@ -55,13 +58,21 @@ jobs:
         run: |
           echo "$EC2_SSH_KEY" > private_key.pem
           chmod 600 private_key.pem
-
+          
+          mkdir -p ~/.ssh
+          ssh-keyscan -H $EC2_HOST >> ~/.ssh/known_hosts
+          chmod 600 ~/.ssh/known_hosts
+          
+          # EC2로 docker-compose.yml 복사
+          scp -i private_key.pem docker-compose.yml $EC2_USERNAME@$EC2_HOST:/home/$EC2_USERNAME/docker-compose.yml
+          
           ssh -i private_key.pem -o StrictHostKeyChecking=no $EC2_USERNAME@$EC2_HOST "
             docker pull $DOCKER_USERNAME/$MY_APP:latest
-            docker stop $MY_APP || true
-            docker rm $MY_APP || true
-            docker run -d -p 8080:8080 --name $MY_APP \
-              $DOCKER_USERNAME/$MY_APP:latest
+            
+            docker-compose down || true
+        
+            docker-compose up -d --remove-orphans
+            docker image prune -f
           "
 
           rm -f private_key.pem

build.gradle

@@ -55,6 +55,12 @@ dependencies {
 	implementation 'org.webjars:sockjs-client:1.0.2'
 	implementation 'org.webjars:stomp-websocket:2.3.3'
 	implementation 'org.webjars:jquery:3.1.1-1'
+
+	// s3 관련
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+	// redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -0,0 +1,15 @@
+services:
+  redis:
+    image: redis
+    container_name: redis
+    ports:
+      - "6379:6379"
+
+  spring:
+    image: nimuy99/memesphere
+    container_name: memesphere
+    restart: always
+    ports:
+      - "8080:8080"
+    depends_on:
+      - redis

src/main/java/com/memesphere/domain/chartdata/repository/ChartDataRepository.java

@@ -5,15 +5,27 @@
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.awt.print.Pageable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface ChartDataRepository extends JpaRepository<ChartData, Long> {
-    @Query("SELECT SUM(c.volume) FROM ChartData c")
-    Long findTotalVolume();
+    @Query("SELECT SUM(c.volume) FROM ChartData c " +
+            "WHERE c.recordedTime = " +
+            "(SELECT MAX(c2.recordedTime) FROM ChartData c2 WHERE c2.memeCoin = c.memeCoin)")
+    BigDecimal findTotalVolume();
 
-    @EntityGraph(attributePaths = {"memeCoin"})
-    List<ChartData> findTop5ByOrderByVolumeDesc();
+    @Query("SELECT c FROM ChartData c " +
+            "WHERE c.recordedTime = " +
+            "(SELECT MAX(c2.recordedTime) FROM ChartData c2 WHERE c2.memeCoin = c.memeCoin) " +
+            "ORDER BY c.volume DESC LIMIT 5")
+    List<ChartData> findTop5OrderByVolumeDesc();
+
+    @Query("SELECT MAX(c.recordedTime) FROM ChartData c WHERE c.memeCoin.id = 1")
+    LocalDateTime findRecordedTimeByCoinId1();
 
     List<ChartData> findByMemeCoinOrderByRecordedTimeDesc(MemeCoin memeCoin);
 }

src/main/java/com/memesphere/domain/chartdata/scheduler/ChartDataScheduler.java

@@ -24,7 +24,7 @@ public class ChartDataScheduler {
     private final BinanceQueryService binanceQueryService;
     private final MemeCoinQueryService memeCoinQueryService;
 
-    @Scheduled(fixedRate = 600000) // 10분 간격 실행
+    @Scheduled(cron = "0 0/10 * * * ?") // 0, 10, 20, 30, 40, 50분에 실행
     @Transactional
     public void updateChartData() {
         List<MemeCoin> memeCoins = memeCoinRepository.findAll();

src/main/java/com/memesphere/domain/chat/controller/ChatController.java

@@ -22,7 +22,6 @@ public class ChatController {
 
     private final ChatService chatService;
 
-    // TODO: @AuthenticationPrincipal로 사용자 이름 받아오기
     @MessageMapping("/chat/{coin_id}")
     @SendTo("/sub/{coin_id}")
     public ChatResponse chat(@DestinationVariable("coin_id") Long coin_id,

src/main/java/com/memesphere/domain/collection/controller/CollectionRestController.java

@@ -1,35 +1,70 @@
 package com.memesphere.domain.collection.controller;
 
+import com.memesphere.domain.collection.service.CollectionCommandService;
 import com.memesphere.global.apipayload.ApiResponse;
 import com.memesphere.domain.collection.entity.Collection;
 import com.memesphere.domain.collection.dto.response.CollectionPageResponse;
 import com.memesphere.domain.collection.service.CollectionQueryService;
+import com.memesphere.global.apipayload.code.status.ErrorStatus;
+import com.memesphere.global.apipayload.exception.GeneralException;
+import com.memesphere.global.jwt.CustomUserDetails;
+import com.memesphere.global.jwt.TokenProvider;
 import com.memesphere.global.validation.annotation.CheckPage;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RestController;
 import com.memesphere.domain.collection.converter.CollectionConverter;
 
+@Tag(name="콜렉션", description = "콜렉션 관련  API")
 @RestController
 @RequiredArgsConstructor
-//@RequestMapping("/collection")
 public class CollectionRestController {
     private final CollectionQueryService collectionQueryService;
+    private final CollectionCommandService collectionCommandService;
+    private final TokenProvider tokenProvider;
 
     @GetMapping("/collection")
     @Operation(summary = "사용자의 밈코인 콜렉션 모음 조회 API")
     public ApiResponse<CollectionPageResponse> getCollectionList (
-//            @AuthenticationPrincipal User user, // 현재 로그인한 사용자 (아직 구현 x)
+            @AuthenticationPrincipal CustomUserDetails userDetails, // 현재 로그인한 사용자
             @CheckPage @RequestParam(name = "page") Integer page // 페이지 번호
     ) {
         Integer pageNumber = page - 1;
-//        Long userId = user.getId();
-        Long userId = 1L;
+        Long userId = (userDetails == null) ? null : userDetails.getUser().getId();
+
+        // 유저를 찾지 못하면(로그인을 안 했으면) 콜렉션 접근 못하도록 에러 처리
+        if (userId == null) throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
 
         Page<Collection> collectionPage = collectionQueryService.getCollectionPage(userId, pageNumber);
         return ApiResponse.onSuccess(CollectionConverter.toCollectionPageDTO(collectionPage));
     }
 
+    @PostMapping("/collection/{coinId}")
+    @Operation(summary = "밈코인 콜렉션 등록 API",
+                description = "코인 Id를 입력하면 사용자의 콜렉션에 등록")
+    public ApiResponse<String> postCollectCoin (@Parameter(hidden = true) @AuthenticationPrincipal CustomUserDetails customUserDetails,
+                                                @PathVariable Long coinId) {
+
+        Long userId = customUserDetails.getUser().getId();
+
+        return ApiResponse.onSuccess(collectionCommandService.addCollectCoin(userId, coinId));
+    }
+
+    @DeleteMapping("/collection/{coinId}")
+    @Operation(summary = "밈코인 콜렉션 삭제 API",
+            description = "코인 Id를 입력하면 사용자의 콜렉션에서 삭제")
+    public ApiResponse<String> deleteCollectCoin (@Parameter(hidden = true) @AuthenticationPrincipal CustomUserDetails customUserDetails,
+                                                  @PathVariable Long coinId) {
+
+        Long userId = customUserDetails.getUser().getId();
+
+        return ApiResponse.onSuccess(collectionCommandService.removeCollectCoin(userId, coinId));
+    }
+
 }

src/main/java/com/memesphere/domain/collection/converter/CollectionConverter.java

@@ -5,12 +5,19 @@
 import com.memesphere.domain.memecoin.entity.MemeCoin;
 import com.memesphere.domain.collection.dto.response.CollectionPageResponse;
 import com.memesphere.domain.collection.dto.response.CollectionPreviewResponse;
+import com.memesphere.domain.user.entity.User;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class CollectionConverter {
+
+    public static Collection toCollection(User user, MemeCoin coin) {
+        return Collection.builder()
+                .user(user).memeCoin(coin).build();
+    }
+
     public static CollectionPageResponse toCollectionPageDTO(Page<Collection> collectionPage) {
         List<CollectionPreviewResponse> collectionItems = collectionPage.getContent().stream()
                 .map(collection -> toCollectionPreviewDTO(collection))

src/main/java/com/memesphere/domain/collection/entity/Collection.java

@@ -10,6 +10,7 @@
 
 @Entity
 @Getter
+@Builder
 @DynamicUpdate
 @DynamicInsert
 @AllArgsConstructor

src/main/java/com/memesphere/domain/collection/repository/CollectionRepository.java

@@ -1,13 +1,17 @@
 package com.memesphere.domain.collection.repository;
 
 import com.memesphere.domain.collection.entity.Collection;
+import com.memesphere.domain.memecoin.entity.MemeCoin;
+import com.memesphere.domain.user.entity.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface CollectionRepository extends JpaRepository<Collection, Long> {
     Page<Collection> findAllByUserId(Long userId, Pageable pageable);
     List<Collection> findAllByUserId(Long userId);
+    Optional<Collection> findByUserAndMemeCoin(User user, MemeCoin memeCoin);
 }