Merge pull request #58 from SWM-M3PRO/main

Main
SWM-M3PRO · Aug 5, 2024 · dff7d1c · dff7d1c
2 parents 92ad16b + ccc8748
commit dff7d1c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/cd_prod.yml b/.github/workflows/cd_prod.yml
@@ -26,7 +26,7 @@ jobs:
           echo "SPRING_PROFILES_ACTIVE=prod" >> .env
           echo "X-NCP-APIGW-API-KEY-ID=${{ secrets.NAVER_APIKEYID }}" >> .env
           echo "X-NCP-APIGW-API-KEY=${{ secrets.NAVER_APIKEY }}" >> .env
-          echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env
+          echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY_PROD }}" >> .env
           echo "KAKAO_APP_ID=${{ secrets.KAKAO_APP_ID }}" >> .env
           echo "REDIS_HOST=${{ secrets.REDIS_HOST_PROD }}" >> .env
           echo "AWS_ACCESS_KEY=${{ secrets.AWS_ACCESS_KEY_PROD }}" >> .env

diff --git a/src/main/java/com/m3pro/groundflip/domain/entity/global/BaseTimeEntity.java b/src/main/java/com/m3pro/groundflip/domain/entity/global/BaseTimeEntity.java
@@ -22,4 +22,7 @@ public class BaseTimeEntity {
 	@LastModifiedDate
 	private LocalDateTime modifiedAt;
 
+	public void updateModifiedAt() {
+		modifiedAt = LocalDateTime.now();
+	}
 }
diff --git a/src/main/java/com/m3pro/groundflip/service/PixelService.java b/src/main/java/com/m3pro/groundflip/service/PixelService.java
@@ -151,13 +151,21 @@ private void occupyPixel(PixelOccupyRequest pixelOccupyRequest) {
 		Pixel targetPixel = pixelRepository.findByXAndY(pixelOccupyRequest.getX(), pixelOccupyRequest.getY())
 			.orElseThrow(() -> new AppException(ErrorCode.PIXEL_NOT_FOUND));
 		updateRankingOnCache(targetPixel, occupyingUserId);
-		targetPixel.updateUserId(occupyingUserId);
-		pixelRepository.saveAndFlush(targetPixel);
+		updatePixelOwner(targetPixel, occupyingUserId);
 
 		updatePixelAddress(targetPixel);
 		eventPublisher.publishEvent(new PixelUserInsertEvent(targetPixel.getId(), occupyingUserId, communityId));
 	}
 
+	private void updatePixelOwner(Pixel targetPixel, Long occupyingUserId) {
+		if (Objects.equals(targetPixel.getUserId(), occupyingUserId)) {
+			targetPixel.updateModifiedAt();
+		} else {
+			targetPixel.updateUserId(occupyingUserId);
+		}
+		pixelRepository.saveAndFlush(targetPixel);
+	}
+
 	/**
 	 * 픽셀의 주소를 업데이트한다..
 	 * @param targetPixel 주소를 얻기 위한 픽셀

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -24,4 +24,10 @@
             <appender-ref ref="ROLLING_FILE"/>
         </root>
     </springProfile>
+
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="ROLLING_FILE"/>
+        </root>
+    </springProfile>
 </configuration>