[BE] HOTFIX : 공유 코드 횟수제한 초과 시 에러 수정

.github/ISSUE_TEMPLATE/ui_improvement.yml

@@ -0,0 +1,46 @@
+name: "UI 개선 건의"
+description: UI 개선 건의 작성 기본 양식입니다.
+labels: ["ui"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        작성 예시 : "[FE] 지도-E/V 버튼 눌렀을때 나타나는 로고 색 다크모드 적용"
+  - type: textarea
+    id: ui-description
+    attributes:
+      label: UI 문제점 설명
+      description: 문제가 언제/어떻게 발생했는지 명확하게 적어주세요.
+      placeholder: 설명을 적어주세요.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: 재현 방법
+      description: 문제가 재현되는 상황을 설명해주세요.
+      placeholder: 설명을 적어주세요.
+    validations:
+      required: true
+  - type: textarea
+    id: improvement
+    attributes:
+      label: 기대하는 UI
+      description: 기대하는 UI에 대해서 설명해주세요.
+      placeholder: 설명을 적어주세요.
+    validations:
+      required: true
+  - type: textarea
+    id: system-info
+    attributes:
+      label: 시스템 환경 (선택 사항)
+      description: 현재 버그가 발생한 시스템 환경을 적어주세요.
+      render: shell
+      placeholder: OS, 브라우저 등을 적어주세요.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: 추가 건의사항
+      description: Cabi에 바라시는 점이나, 하시고 싶은 말씀을 적어주세요.

README.md

@@ -75,8 +75,8 @@
 <br/>
 
 ## 🕸️ 인프라 구조도
-![Untitled](https://github.com/innovationacademy-kr/Cabi/assets/83565255/165c1529-6164-4988-9495-6bc2ba3ef0ab)
 
+![Untitled](https://github.com/innovationacademy-kr/Cabi/assets/83565255/165c1529-6164-4988-9495-6bc2ba3ef0ab)
 
 ## 🛠 기술 스택
 
@@ -175,6 +175,9 @@
 | [ 🐶 surlee](https://github.com/Elineely) | [ 🐣 hyowchoi](https://github.com/chyo1/) | [ 👽 sohyupar](https://github.com/saewoo1) | [🦝 jimchoi](https://github.com/jimchoi9) | [ 🛼 jeekim](https://github.com/jnkeniaem) | [🍾 miyu](https://github.com/Minkyu01) | [🧸 gykoh](https://github.com/gykoh42) |
 | ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- |
 
+| [ 🐰 jihykim2](https://github.com/jihyunk03) | [⛄️ seonmiki](https://github.com/seonmiki) | [ 🎱 junsbae ](https://github.com/wet6123) |
+| -------------------------------------------- | ------------------------------------------- | ------------------------------------------ |
+
 | <a href="https://github.com/innovationacademy-kr"><img src="https://img.shields.io/badge/42Seoul-000000?style=flat-square&logo=42&logoColor=white" /></a> |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
 

backend/src/main/java/org/ftclub/cabinet/item/service/ItemFacadeService.java

@@ -192,7 +192,7 @@ public CoinCollectionRewardResponseDto collectCoinAndIssueReward(Long userId) {
 		// DB에 코인 저장
 		Item coinCollect = itemQueryService.getBySku(Sku.COIN_COLLECT);
 		int reward = (int) (coinCollect.getPrice().longValue());
-		itemHistoryCommandService.createCoinCollectItemHistory(userId, coinCollect.getId());
+		itemHistoryCommandService.createCoinItemHistory(userId, coinCollect.getId());
 
 		// 출석 일자에 따른 랜덤 리워드 지급
 		Long coinCollectionCountInMonth =
@@ -203,7 +203,7 @@ public CoinCollectionRewardResponseDto collectCoinAndIssueReward(Long userId) {
 			Sku coinSku = itemPolicyService.getRewardSku(randomPercentage);
 			Item coinReward = itemQueryService.getBySku(coinSku);
 
-			itemHistoryCommandService.createCoinCollectItemHistory(userId, coinReward.getId());
+			itemHistoryCommandService.createCoinItemHistory(userId, coinReward.getId());
 			reward += coinReward.getPrice();
 		}
 

backend/src/main/java/org/ftclub/cabinet/item/service/ItemHistoryCommandService.java

@@ -29,7 +29,7 @@ public void createItemHistories(List<Long> userIds, Long itemId, LocalDateTime u
 		itemHistoryRepository.saveAll(itemHistories);
 	}
 
-	public void createCoinCollectItemHistory(Long userId, Long itemId) {
+	public void createCoinItemHistory(Long userId, Long itemId) {
 		ItemHistory coinCollectItemHistory = ItemHistory.of(userId, itemId, LocalDateTime.now());
 		itemHistoryRepository.save(coinCollectItemHistory);
 	}

backend/src/main/java/org/ftclub/cabinet/lent/service/LentPolicyService.java

@@ -59,10 +59,7 @@ private void handlePolicyStatus(LentPolicyStatus status, LocalDateTime policyDat
 				throw new CustomExceptionStatus(ExceptionStatus.ALL_BANNED_USER,
 						unbannedAtString).asCustomServiceException();
 			case SHARE_BANNED_USER:
-				unbannedAtString = policyDate.format(
-						DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-				throw new CustomExceptionStatus(ExceptionStatus.SHARE_CODE_TRIAL_EXCEEDED,
-						unbannedAtString).asCustomServiceException();
+				throw ExceptionStatus.SHARE_CODE_TRIAL_EXCEEDED.asServiceException();
 			case BLACKHOLED_USER:
 				throw ExceptionStatus.BLACKHOLED_USER.asServiceException();
 			case PENDING_CABINET:

backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java

@@ -160,6 +160,8 @@ public void deleteUserInCabinet(Long cabinetId, Long userId) {
 		lentRedis.deleteUserInCabinet(cabinetIdString, userIdString);
 		if (lentRedis.countUserInCabinet(cabinetIdString) == 0) {
 			lentRedis.deleteShadowKey(cabinetIdString);
+			clearCabinetSession(cabinetId);
+
 		}
 	}
 

backend/src/main/java/org/ftclub/cabinet/user/domain/User.java

@@ -62,7 +62,7 @@ public class User {
 	private boolean pushAlarm;
 
 	@NotNull
-	@Column(name = "COIN", columnDefinition = "bigint default 0")
+	@Column(name = "COIN")
 	private Long coin;
 
 	protected User(String name, String email, LocalDateTime blackholedAt) {

backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionManager.java

@@ -46,7 +46,7 @@ public void issueLentExtension() {
 		users.forEach(user -> {
 			Long userId = user.getId();
 			user.addCoin(coinRewardItem.getPrice());
-			itemHistoryCommandService.createItemHistory(userId, coinRewardItem.getId());
+			itemHistoryCommandService.createCoinItemHistory(userId, coinRewardItem.getId());
 		});
 	}