Merge branch 'dev' into common/dev/docs_onbrarding_saymyname/#1656

.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

@@ -175,8 +175,8 @@
 | [ 🐶 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) |
 | ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- |
 
-| [ 🎱 junsbae ](https://github.com/wet6123) |
-| ------------------------------------------ |
+| [ 🐰 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/lent/service/LentFacadeService.java

@@ -338,6 +338,7 @@ public void cancelShareCabinetLent(Long userId, Long cabinetId) {
 			Cabinet cabinet = cabinetQueryService.getCabinetForUpdate(cabinetId);
 			cabinetCommandService.changeStatus(cabinet, CabinetStatus.AVAILABLE);
 		}
+		lentRedisService.clearCabinetSession(cabinetId);
 	}
 
 	/**

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: