claims = tokenProvider
+// String accessToken = tokenProvider.createTokenForTestUser(testUser, LocalDateTime.now());
+// Cookie cookie = cookieManager.cookieOf("access_token",
+// accessToken);
+// cookieManager.setCookieToClient(res, cookie, "/", req.getServerName());
+// System.out.println("?????????????????????? cookie domain = ");
+// res.sendRedirect(DomainProperties.getLocal() + "/main");
+// res.sendRedirect(DomainProperties.getFeHost() + "/home");
+ }
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/auth/domain/CookieManager.java b/backend/src/main/java/org/ftclub/cabinet/auth/domain/CookieManager.java
index 06e80e9c0..07766a7db 100644
--- a/backend/src/main/java/org/ftclub/cabinet/auth/domain/CookieManager.java
+++ b/backend/src/main/java/org/ftclub/cabinet/auth/domain/CookieManager.java
@@ -1,14 +1,13 @@
package org.ftclub.cabinet.auth.domain;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.ftclub.cabinet.config.DomainProperties;
import org.ftclub.cabinet.config.JwtProperties;
import org.springframework.stereotype.Component;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* 클라이언트의 쿠키를 관리하는 클래스입니다.
*/
@@ -48,7 +47,7 @@ public String getCookieValue(HttpServletRequest req, String name) {
* @param serverName 쿠키 도메인
*/
public void setCookieToClient(HttpServletResponse res, Cookie cookie, String path,
- String serverName) {
+ String serverName) {
cookie.setMaxAge(60 * 60 * 24 * jwtProperties.getExpiryDays());
cookie.setPath(path);
if (serverName.equals(domainProperties.getLocal())) {
@@ -56,6 +55,7 @@ public void setCookieToClient(HttpServletResponse res, Cookie cookie, String pat
} else {
cookie.setDomain(domainProperties.getCookieDomain());
}
+ System.out.println("?????????????????????? cookie domain = " + cookie.getDomain());
res.addCookie(cookie);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenProvider.java b/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenProvider.java
index 8208db8a4..6dba0652c 100644
--- a/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenProvider.java
+++ b/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenProvider.java
@@ -1,8 +1,15 @@
package org.ftclub.cabinet.auth.domain;
+import static org.ftclub.cabinet.exception.ExceptionStatus.INVALID_ARGUMENT;
+import static org.ftclub.cabinet.exception.ExceptionStatus.UNAUTHORIZED_USER;
+
import com.fasterxml.jackson.databind.JsonNode;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.ftclub.cabinet.config.FtApiProperties;
import org.ftclub.cabinet.config.GoogleApiProperties;
@@ -13,14 +20,6 @@
import org.ftclub.cabinet.user.domain.UserRole;
import org.springframework.stereotype.Component;
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.ftclub.cabinet.exception.ExceptionStatus.INVALID_ARGUMENT;
-import static org.ftclub.cabinet.exception.ExceptionStatus.UNAUTHORIZED_USER;
-
/**
* API 제공자에 따라 JWT 토큰을 생성하는 클래스입니다.
*/
diff --git a/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenValidator.java b/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenValidator.java
index c3050fe0b..c081d6c35 100644
--- a/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenValidator.java
+++ b/backend/src/main/java/org/ftclub/cabinet/auth/domain/TokenValidator.java
@@ -1,5 +1,7 @@
package org.ftclub.cabinet.auth.domain;
+import static org.ftclub.cabinet.user.domain.AdminRole.MASTER;
+
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,6 +9,9 @@
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.MalformedJwtException;
import io.jsonwebtoken.UnsupportedJwtException;
+import java.security.Key;
+import java.util.Base64;
+import javax.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.ftclub.cabinet.config.DomainProperties;
@@ -18,12 +23,6 @@
import org.ftclub.cabinet.user.service.UserService;
import org.springframework.stereotype.Component;
-import javax.servlet.http.HttpServletRequest;
-import java.security.Key;
-import java.util.Base64;
-
-import static org.ftclub.cabinet.user.domain.AdminRole.MASTER;
-
/**
* 토큰의 유효성을 검사하는 클래스입니다.
*
@@ -34,119 +33,121 @@
@Slf4j
public class TokenValidator {
- private final MasterProperties masterProperties;
- private final DomainProperties domainProperties;
- private final JwtProperties jwtProperties;
- private final UserService userService;
+ private final MasterProperties masterProperties;
+ private final DomainProperties domainProperties;
+ private final JwtProperties jwtProperties;
+ private final UserService userService;
- /**
- * 토큰의 유효성을 검사합니다.
- *
- * USER_ONLY의 경우 검증하지 않습니다.
- *
- * @param req {@link HttpServletRequest}
- * @return 정상적인 방식의 토큰 요청인지, 유효한 토큰인지 여부
- */
- public Boolean isValidRequestWithLevel(HttpServletRequest req, AuthLevel authLevel)
- throws JsonProcessingException {
- String authHeader = req.getHeader("Authorization");
- if (authHeader == null || !authHeader.startsWith("Bearer ")) {
- return false;
- }
- String token = authHeader.substring(7);
- if (!isTokenValid(token, jwtProperties.getSigningKey())) {
- return false;
- }
- return isTokenAuthenticatable(token, authLevel);
- }
+ /**
+ * 토큰의 유효성을 검사합니다.
+ *
+ * USER_ONLY의 경우 검증하지 않습니다.
+ *
+ * @param req {@link HttpServletRequest}
+ * @return 정상적인 방식의 토큰 요청인지, 유효한 토큰인지 여부
+ */
+ public Boolean isValidRequestWithLevel(HttpServletRequest req, AuthLevel authLevel)
+ throws JsonProcessingException {
+ String authHeader = req.getHeader("Authorization");
+ if (authHeader == null || !authHeader.startsWith("Bearer ")) {
+ return false;
+ }
+ String token = authHeader.substring(7);
+ if (!isTokenValid(token, jwtProperties.getSigningKey())) {
+ return false;
+ }
+ return isTokenAuthenticatable(token, authLevel);
+ }
- /**
- * 토큰의 유효성을 검사합니다.
- *
- * MASTER의 경우 현재 정적으로 관리하므로 이메일만 검증합니다.
- *
- *
- * @param token 토큰
- * @param authLevel 인증 단계
- * @return 페이로드 정보가 실제 DB와 일치하면 true를 반환합니다.
- */
- public boolean isTokenAuthenticatable(String token, AuthLevel authLevel)
- throws JsonProcessingException {
- String email = getPayloadJson(token).get("email").asText();
- if (email == null) {
- throw new DomainException(ExceptionStatus.INVALID_ARGUMENT);
- }
- switch (authLevel) {
- case USER_OR_ADMIN:
- return true;
- case USER_ONLY:
- return !isAdminEmail(email);
- case ADMIN_ONLY:
- return isAdminEmail(email);
- case MASTER_ONLY:
- AdminRole role = userService.getAdminUserRole(email);
- return role != null && role.equals(MASTER);
- default:
- throw new DomainException(ExceptionStatus.INVALID_STATUS);
- }
- }
+ /**
+ * 해당 토큰의 페이로드 정보가 인증 단계에 알맞는지 확인합니다.
+ *
+ * MASTER의 경우 현재 정적으로 관리하므로 이메일만 검증합니다.
+ *
+ *
+ * @param token 토큰
+ * @param authLevel 인증 단계
+ * @return 페이로드 정보가 실제 DB와 일치하면 true를 반환합니다.
+ */
+ public boolean isTokenAuthenticatable(String token, AuthLevel authLevel)
+ throws JsonProcessingException {
+ String email = getPayloadJson(token).get("email").asText();
+ if (email == null) {
+ throw new DomainException(ExceptionStatus.INVALID_ARGUMENT);
+ }
+ System.out.println("Hellowsdafasdf");
+ switch (authLevel) {
+ case USER_OR_ADMIN:
+ return true;
+ case USER_ONLY:
+ return !isAdminEmail(email);
+ case ADMIN_ONLY:
+ return isAdminEmail(email);
+ case MASTER_ONLY:
+ AdminRole role = userService.getAdminUserRole(email);
+ return role != null && role.equals(MASTER);
+ default:
+ throw new DomainException(ExceptionStatus.INVALID_STATUS);
+ }
+ }
- /**
- * 해당 이메일이 관리자 이메일인지 확인합니다.
- *
- * @param email 관리자 이메일
- * @return 관리자 이메일이면 true를 반환합니다.
- */
- private boolean isAdminEmail(String email) {
- return email.endsWith(masterProperties.getDomain())
- || email.endsWith(domainProperties.getAdminEmailDomain());
- }
+ /**
+ * 해당 이메일이 관리자 이메일인지 확인합니다.
+ *
+ * @param email 관리자 이메일
+ * @return 관리자 이메일이면 true를 반환합니다.
+ */
+ private boolean isAdminEmail(String email) {
+ // TODO : 이메일 검증 로직 수정 : 현재는 도메인만 검증하고 있어서 뚫릴 가능성이 있을듯, 추후 검토 필요
+ return email.endsWith(masterProperties.getDomain())
+ || email.endsWith(domainProperties.getAdminEmailDomain());
+ }
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeService.java
index 7026403f9..f9670edfc 100644
--- a/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeService.java
+++ b/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeService.java
@@ -1,22 +1,24 @@
package org.ftclub.cabinet.auth.service;
-import org.ftclub.cabinet.config.ApiProperties;
-import org.ftclub.cabinet.dto.MasterLoginDto;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDateTime;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.ftclub.cabinet.config.ApiProperties;
+import org.ftclub.cabinet.dto.MasterLoginDto;
public interface AuthFacadeService {
void requestLoginToApi(HttpServletResponse res, ApiProperties apiProperties) throws IOException;
void handleLogin(String code, HttpServletRequest req, HttpServletResponse res,
- ApiProperties apiProperties, LocalDateTime now);
+ ApiProperties apiProperties, LocalDateTime now);
void masterLogin(MasterLoginDto masterLoginDto, HttpServletRequest req,
- HttpServletResponse res, LocalDateTime now);
+ HttpServletResponse res, LocalDateTime now);
void logout(HttpServletResponse res, ApiProperties apiProperties);
+
+ void handleTestLogin(HttpServletRequest req, ApiProperties apiProperties,
+ HttpServletResponse res, LocalDateTime now);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeServiceImpl.java
index c1552c81b..cd2147986 100644
--- a/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeServiceImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthFacadeServiceImpl.java
@@ -1,6 +1,13 @@
package org.ftclub.cabinet.auth.service;
import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.ftclub.cabinet.auth.domain.CookieManager;
import org.ftclub.cabinet.auth.domain.TokenProvider;
@@ -9,15 +16,11 @@
import org.ftclub.cabinet.dto.MasterLoginDto;
import org.ftclub.cabinet.exception.ControllerException;
import org.ftclub.cabinet.exception.ExceptionStatus;
+import org.ftclub.cabinet.user.domain.UserRole;
+import org.ftclub.cabinet.user.repository.UserOptionalFetcher;
+import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.Map;
-
@Service
@RequiredArgsConstructor
public class AuthFacadeServiceImpl implements AuthFacadeService {
@@ -28,6 +31,9 @@ public class AuthFacadeServiceImpl implements AuthFacadeService {
private final AuthService authService;
private final OauthService oauthService;
+ private final UserOptionalFetcher userOptionalFetcher;
+
+
@Override
public void requestLoginToApi(HttpServletResponse res, ApiProperties apiProperties)
throws IOException {
@@ -36,20 +42,39 @@ public void requestLoginToApi(HttpServletResponse res, ApiProperties apiProperti
@Override
public void handleLogin(String code, HttpServletRequest req, HttpServletResponse res,
- ApiProperties apiProperties, LocalDateTime now) {
+ ApiProperties apiProperties, LocalDateTime now) {
String apiToken = oauthService.getTokenByCodeRequest(code, apiProperties);
JsonNode profile = oauthService.getProfileJsonByToken(apiToken, apiProperties);
Map claims = tokenProvider.makeClaimsByProviderProfile(
apiProperties.getProviderName(), profile);
authService.addUserIfNotExistsByClaims(claims);
String accessToken = tokenProvider.createToken(claims, now);
- Cookie cookie = cookieManager.cookieOf(tokenProvider.getTokenNameByProvider(apiProperties.getProviderName()), accessToken);
+ Cookie cookie = cookieManager.cookieOf(
+ tokenProvider.getTokenNameByProvider(apiProperties.getProviderName()), accessToken);
+ cookieManager.setCookieToClient(res, cookie, "/", req.getServerName());
+ }
+
+ @Override
+ public void handleTestLogin(HttpServletRequest req, ApiProperties apiProperties,
+ HttpServletResponse res, LocalDateTime now) {
+ Map claims = new HashMap<>();
+ claims.put("name",
+ "Test:" + userOptionalFetcher.findUsersByPartialName("Test:", Pageable.unpaged())
+ .getTotalElements());
+ claims.put("email", userOptionalFetcher.findUsersByPartialName("Test:", Pageable.unpaged())
+ .getTotalElements() + "Test@student.42seoul.kr");
+ claims.put("blackholedAt", null);
+ claims.put("role", UserRole.USER);
+ authService.addUserIfNotExistsByClaims(claims);
+ String accessToken = tokenProvider.createToken(claims, now);
+ Cookie cookie = cookieManager.cookieOf(
+ tokenProvider.getTokenNameByProvider(apiProperties.getProviderName()), accessToken);
cookieManager.setCookieToClient(res, cookie, "/", req.getServerName());
}
@Override
public void masterLogin(MasterLoginDto masterLoginDto, HttpServletRequest req,
- HttpServletResponse res, LocalDateTime now) {
+ HttpServletResponse res, LocalDateTime now) {
if (!authService.validateMasterLogin(masterLoginDto)) {
throw new ControllerException(ExceptionStatus.UNAUTHORIZED);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthService.java b/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthService.java
index f46a7edf8..c5e0dd532 100644
--- a/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthService.java
+++ b/backend/src/main/java/org/ftclub/cabinet/auth/service/AuthService.java
@@ -1,8 +1,8 @@
package org.ftclub.cabinet.auth.service;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
+import static org.ftclub.cabinet.user.domain.UserRole.USER;
+
+import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.ftclub.cabinet.config.DomainProperties;
@@ -12,14 +12,8 @@
import org.ftclub.cabinet.exception.ServiceException;
import org.ftclub.cabinet.user.service.UserService;
import org.ftclub.cabinet.utils.DateUtil;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
-import java.util.Map;
-
-import static org.ftclub.cabinet.user.domain.UserRole.USER;
-
/**
* Cabi 자체의 인증 서비스입니다.
*/
@@ -57,8 +51,10 @@ public void addUserIfNotExistsByClaims(Map claims) {
if (blackHoledAtObject == null) {
userService.createUser(name, email, null, USER);
} else {
- userService.createUser(name, email, DateUtil.stringToDate(blackHoledAtObject.toString()), USER);
+ userService.createUser(name, email,
+ DateUtil.stringToDate(blackHoledAtObject.toString()), USER);
}
}
}
+
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/controller/CabinetController.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/controller/CabinetController.java
index 7d7391e79..71a79d9e6 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/controller/CabinetController.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/controller/CabinetController.java
@@ -51,8 +51,7 @@ public List getBuildingFloorsResponse() {
public List getCabinetsPerSection(
@PathVariable("building") String building,
@PathVariable("floor") Integer floor) {
- log.info("Called getCabinetsPerSection");
- return cabinetFacadeService.getCabinetsPerSection(building, floor);
+ return cabinetFacadeService.getCabinetsPerSectionDSL(building, floor);
}
/**
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/Cabinet.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/Cabinet.java
index e7707c9a4..a979beb2f 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/Cabinet.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/Cabinet.java
@@ -1,5 +1,24 @@
package org.ftclub.cabinet.cabinet.domain;
+import static org.ftclub.cabinet.exception.ExceptionStatus.INVALID_ARGUMENT;
+import static org.ftclub.cabinet.exception.ExceptionStatus.INVALID_STATUS;
+
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -9,13 +28,6 @@
import org.ftclub.cabinet.lent.domain.LentHistory;
import org.ftclub.cabinet.utils.ExceptionUtil;
-import javax.persistence.*;
-import java.util.List;
-import java.util.Objects;
-
-import static org.ftclub.cabinet.exception.ExceptionStatus.INVALID_ARGUMENT;
-import static org.ftclub.cabinet.exception.ExceptionStatus.INVALID_STATUS;
-
/**
* 사물함 엔티티
*/
@@ -27,202 +39,198 @@
@Log4j2
public class Cabinet {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "CABINET_ID")
- private Long cabinetId;
-
- /**
- * 실물로 표시되는 번호입니다.
- */
- @Column(name = "VISIBLE_NUM")
- private Integer visibleNum;
-
- /**
- * {@link CabinetStatus}
- */
- @Enumerated(value = EnumType.STRING)
- @Column(name = "STATUS", length = 32, nullable = false)
- private CabinetStatus status;
-
- /**
- * {@link LentType}
- */
- @Enumerated(value = EnumType.STRING)
- @Column(name = "LENT_TYPE", length = 16, nullable = false)
- private LentType lentType;
-
- @Column(name = "MAX_USER", nullable = false)
- private Integer maxUser;
-
- /**
- * 사물함의 상태에 대한 메모입니다. 주로 고장 사유를 적습니다.
- */
- @Column(name = "STATUS_NOTE", length = 64)
- private String statusNote;
-
- /**
- * {@link Grid}
- */
- @Embedded
- private Grid grid;
-
- /**
- * 서비스에서 나타내지는 사물함의 제목입니다.
- */
- @Column(name = "TITLE", length = 64)
- private String title;
-
- /**
- * 서비스에서 나타내지는 사물함의 메모입니다.
- */
- @Column(name = "MEMO", length = 64)
- private String memo;
-
- /**
- * {@link CabinetPlace}
- */
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
- @JoinColumn(name = "CABINET_PLACE_ID")
- private CabinetPlace cabinetPlace;
-
- @OneToMany(mappedBy = "cabinet",
- targetEntity = LentHistory.class,
- cascade = CascadeType.ALL,
- fetch = FetchType.LAZY)
- private List lentHistories;
-
- protected Cabinet(Integer visibleNum, CabinetStatus status, LentType lentType, Integer maxUser,
- Grid grid, CabinetPlace cabinetPlace) {
- this.visibleNum = visibleNum;
- this.status = status;
- this.lentType = lentType;
- this.maxUser = maxUser;
- this.grid = grid;
- this.cabinetPlace = cabinetPlace;
- this.title = "";
- this.memo = "";
- }
-
- public static Cabinet of(Integer visibleNum, CabinetStatus status, LentType lentType,
- Integer maxUser,
- Grid grid, CabinetPlace cabinetPlace) {
- Cabinet cabinet = new Cabinet(visibleNum, status, lentType, maxUser, grid, cabinetPlace);
- ExceptionUtil.throwIfFalse(cabinet.isValid(), new DomainException(INVALID_ARGUMENT));
- return cabinet;
- }
-
- private boolean isValid() {
- return (visibleNum >= 0 && maxUser >= 0 && grid != null && cabinetPlace != null
- && status != null && lentType != null);
- }
-
- public boolean isStatus(CabinetStatus cabinetStatus) {
- return this.status.equals(cabinetStatus);
- }
-
- public boolean isLentType(LentType lentType) {
- return this.lentType.equals(lentType);
- }
-
- public boolean isVisibleNum(Integer visibleNum) {
- return this.visibleNum.equals(visibleNum);
- }
-
- public boolean isCabinetPlace(CabinetPlace cabinetPlace) {
- return this.cabinetPlace.equals(cabinetPlace);
- }
-
- public void specifyCabinetPlace(CabinetPlace cabinetPlace) {
- log.info("setCabinetPlace : {}", cabinetPlace);
- this.cabinetPlace = cabinetPlace;
- }
-
- public void assignVisibleNum(Integer visibleNum) {
- log.info("assignVisibleNum : {}", visibleNum);
- this.visibleNum = visibleNum;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void specifyStatus(CabinetStatus cabinetStatus) {
- log.info("specifyStatus : {}", cabinetStatus);
- this.status = cabinetStatus;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void specifyMaxUser(Integer maxUser) {
- log.info("specifyMaxUser : {}", maxUser);
- this.maxUser = maxUser;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void writeStatusNote(String statusNote) {
- log.info("writeStatusNote : {}", statusNote);
- this.statusNote = statusNote;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void specifyLentType(LentType lentType) {
- log.info("specifyLentType : {}", lentType);
- this.lentType = lentType;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void writeTitle(String title) {
- log.info("writeTitle : {}", title);
- this.title = title;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void coordinateGrid(Grid grid) {
- log.info("coordinateGrid : {}", grid);
- this.grid = grid;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- public void writeMemo(String memo) {
- this.memo = memo;
- ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
- }
-
- @Override
- public boolean equals(final Object other) {
- if (this == other) {
- return true;
- }
- if (!(other instanceof Cabinet)) {
- return false;
- }
- return this.cabinetId.equals(((Cabinet) other).cabinetId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.cabinetId);
- }
-
- /**
- * 대여 시작/종료에 따른 사용자의 수와 현재 상태에 따라 상태를 변경합니다.
- *
- * @param userCount 현재 사용자 수
- */
- public void specifyStatusByUserCount(Integer userCount) {
- log.info("specifyStatusByUserCount : {}", userCount);
- if (this.status.equals(CabinetStatus.BROKEN)) {
- throw new DomainException(INVALID_STATUS);
- }
- if (userCount.equals(0)) {
- this.status = CabinetStatus.AVAILABLE;
- return;
- }
- if (userCount.equals(this.maxUser)) {
- this.status = CabinetStatus.FULL;
- return;
- }
- if (0 < userCount && userCount < this.maxUser) {
- if (this.status.equals(CabinetStatus.FULL)) {
- this.status = CabinetStatus.LIMITED_AVAILABLE;
- }
- }
- }
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "CABINET_ID")
+ private Long cabinetId;
+
+ /**
+ * 실물로 표시되는 번호입니다.
+ */
+ @Column(name = "VISIBLE_NUM")
+ private Integer visibleNum;
+
+ /**
+ * {@link CabinetStatus}
+ */
+ @Enumerated(value = EnumType.STRING)
+ @Column(name = "STATUS", length = 32, nullable = false)
+ private CabinetStatus status;
+
+ /**
+ * {@link LentType}
+ */
+ @Enumerated(value = EnumType.STRING)
+ @Column(name = "LENT_TYPE", length = 16, nullable = false)
+ private LentType lentType;
+
+ @Column(name = "MAX_USER", nullable = false)
+ private Integer maxUser;
+
+ /**
+ * 사물함의 상태에 대한 메모입니다. 주로 고장 사유를 적습니다.
+ */
+ @Column(name = "STATUS_NOTE", length = 64)
+ private String statusNote;
+
+ /**
+ * {@link Grid}
+ */
+ @Embedded
+ private Grid grid;
+
+ /**
+ * 서비스에서 나타내지는 사물함의 제목입니다.
+ */
+ @Column(name = "TITLE", length = 64)
+ private String title;
+
+ /**
+ * 서비스에서 나타내지는 사물함의 메모입니다.
+ */
+ @Column(name = "MEMO", length = 64)
+ private String memo;
+
+ /**
+ * {@link CabinetPlace}
+ */
+ @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+ @JoinColumn(name = "CABINET_PLACE_ID")
+ private CabinetPlace cabinetPlace;
+
+ @OneToMany(mappedBy = "cabinet",
+ targetEntity = LentHistory.class,
+ cascade = CascadeType.ALL,
+ fetch = FetchType.LAZY)
+ private List lentHistories;
+
+ protected Cabinet(Integer visibleNum, CabinetStatus status, LentType lentType, Integer maxUser,
+ Grid grid, CabinetPlace cabinetPlace) {
+ this.visibleNum = visibleNum;
+ this.status = status;
+ this.lentType = lentType;
+ this.maxUser = maxUser;
+ this.grid = grid;
+ this.cabinetPlace = cabinetPlace;
+ this.title = "";
+ this.memo = "";
+ }
+
+ public static Cabinet of(Integer visibleNum, CabinetStatus status, LentType lentType,
+ Integer maxUser,
+ Grid grid, CabinetPlace cabinetPlace) {
+ Cabinet cabinet = new Cabinet(visibleNum, status, lentType, maxUser, grid, cabinetPlace);
+ ExceptionUtil.throwIfFalse(cabinet.isValid(), new DomainException(INVALID_ARGUMENT));
+ return cabinet;
+ }
+
+ private boolean isValid() {
+ return (visibleNum >= 0 && maxUser >= 0 && grid != null && cabinetPlace != null
+ && status != null && lentType != null);
+ }
+
+ public boolean isStatus(CabinetStatus cabinetStatus) {
+ return this.status.equals(cabinetStatus);
+ }
+
+ public boolean isLentType(LentType lentType) {
+ return this.lentType.equals(lentType);
+ }
+
+ public boolean isVisibleNum(Integer visibleNum) {
+ return this.visibleNum.equals(visibleNum);
+ }
+
+ public boolean isCabinetPlace(CabinetPlace cabinetPlace) {
+ return this.cabinetPlace.equals(cabinetPlace);
+ }
+
+ public void specifyCabinetPlace(CabinetPlace cabinetPlace) {
+ log.info("setCabinetPlace : {}", cabinetPlace);
+ this.cabinetPlace = cabinetPlace;
+ }
+
+ public void assignVisibleNum(Integer visibleNum) {
+ log.info("assignVisibleNum : {}", visibleNum);
+ this.visibleNum = visibleNum;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void specifyStatus(CabinetStatus cabinetStatus) {
+ log.info("specifyStatus : {}", cabinetStatus);
+ this.status = cabinetStatus;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void specifyMaxUser(Integer maxUser) {
+ log.info("specifyMaxUser : {}", maxUser);
+ this.maxUser = maxUser;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void writeStatusNote(String statusNote) {
+ log.info("writeStatusNote : {}", statusNote);
+ this.statusNote = statusNote;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void specifyLentType(LentType lentType) {
+ log.info("specifyLentType : {}", lentType);
+ this.lentType = lentType;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void writeTitle(String title) {
+ log.info("writeTitle : {}", title);
+ this.title = title;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void coordinateGrid(Grid grid) {
+ log.info("coordinateGrid : {}", grid);
+ this.grid = grid;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ public void writeMemo(String memo) {
+ this.memo = memo;
+ ExceptionUtil.throwIfFalse(this.isValid(), new DomainException(INVALID_STATUS));
+ }
+
+ @Override
+ public boolean equals(final Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (!(other instanceof Cabinet)) {
+ return false;
+ }
+ return this.cabinetId.equals(((Cabinet) other).cabinetId);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(this.cabinetId);
+ }
+
+ /**
+ * 대여 시작/종료에 따른 사용자의 수와 현재 상태에 따라 상태를 변경합니다.
+ *
+ * @param userCount 현재 사용자 수
+ */
+ public void specifyStatusByUserCount(Integer userCount) {
+ log.info("specifyStatusByUserCount : {}", userCount);
+ if (this.status.equals(CabinetStatus.BROKEN)) {
+ throw new DomainException(INVALID_STATUS);
+ }
+ if (userCount.equals(0)) {
+ this.status = CabinetStatus.PENDING;
+// this.status = CabinetStatus.AVAILABLE;
+ return;
+ }
+ if (userCount.equals(this.maxUser)) {
+ this.status = CabinetStatus.FULL;
+ return;
+ }
+ }
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetPlace.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetPlace.java
index 4a244156e..e139fc017 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetPlace.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetPlace.java
@@ -45,6 +45,10 @@ public class CabinetPlace {
*/
@Embedded
private MapArea mapArea;
+ /* 양방향 매핑
+ @OneToMany(mappedBy = "cabinetPlace")
+ private List cabinets;
+*/
protected CabinetPlace(Location location, SectionFormation sectionFormation, MapArea mapArea) {
this.location = location;
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetStatus.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetStatus.java
index 4cf712a0f..cb12a5579 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetStatus.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/domain/CabinetStatus.java
@@ -14,12 +14,17 @@ public enum CabinetStatus {
* findCabinetsActiveLentHistoriesByBuildingAndFloor(
+ String building, Integer floor);
+
+ List findAllCabinetsByBuildingAndFloor(String building, Integer floor);
+
+ List findAllCabinetsByCabinetStatusAndBeforeEndedAt(CabinetStatus cabinetStatus, LocalDateTime endedAt);
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetComplexRepositoryImpl.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetComplexRepositoryImpl.java
new file mode 100644
index 000000000..32f4f32d1
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetComplexRepositoryImpl.java
@@ -0,0 +1,82 @@
+package org.ftclub.cabinet.cabinet.repository;
+
+import static org.ftclub.cabinet.cabinet.domain.QCabinet.cabinet;
+import static org.ftclub.cabinet.cabinet.domain.QCabinetPlace.cabinetPlace;
+import static org.ftclub.cabinet.lent.domain.QLentHistory.lentHistory;
+import static org.ftclub.cabinet.user.domain.QUser.user;
+
+import com.querydsl.jpa.impl.JPAQuery;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import javax.persistence.EntityManager;
+import org.ftclub.cabinet.cabinet.domain.Cabinet;
+import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
+import org.ftclub.cabinet.dto.ActiveCabinetInfoEntities;
+import org.ftclub.cabinet.dto.QActiveCabinetInfoEntities;
+import org.ftclub.cabinet.lent.domain.LentHistory;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.Cacheable;
+
+//@CacheConfig(cacheNames = "cabinets")
+public class CabinetComplexRepositoryImpl implements CabinetComplexRepository {
+
+ private final JPAQueryFactory queryFactory;
+
+ public CabinetComplexRepositoryImpl(EntityManager em) {
+ this.queryFactory = new JPAQueryFactory(em);
+ }
+
+ // CACHE
+// @Cacheable(key = "#building + #floor")
+ public List findAllCabinetsByBuildingAndFloor(String building, Integer floor) {
+ JPAQuery query = queryFactory.selectFrom(cabinet)
+ .join(cabinetPlace)
+ .on(cabinet.cabinetPlace.cabinetPlaceId.eq(cabinetPlace.cabinetPlaceId))
+ .where(cabinetPlace.location.building
+ .eq(building)
+ .and(cabinetPlace.location.floor.eq(floor))
+ );
+ return query.fetch();
+ }
+
+
+ @Override
+ public List findCabinetsActiveLentHistoriesByBuildingAndFloor(
+ String building, Integer floor) {
+ return queryFactory.selectDistinct(
+ new QActiveCabinetInfoEntities(cabinet, lentHistory, user))
+ .from(cabinet)
+ .join(cabinetPlace)
+ .on(cabinet.cabinetPlace.cabinetPlaceId.eq(cabinetPlace.cabinetPlaceId))
+ .join(lentHistory)
+ .on(cabinet.cabinetId.eq(lentHistory.cabinet.cabinetId))
+ .join(user)
+ .on(lentHistory.user.userId.eq(user.userId))
+ .where(cabinetPlace.location.building
+ .eq(building)
+ .and(cabinetPlace.location.floor.eq(floor))
+ .and(lentHistory.endedAt.isNull())
+ )
+ .fetch();
+ }
+
+ @Override
+ public List findAllCabinetsByCabinetStatusAndBeforeEndedAt(CabinetStatus cabinetStatus,
+ LocalDateTime currentDate) {
+ //LentHistory 에서, 오늘날짜 이전의 endedAt이면서, 중복되지 않는 레코드 와 cabinet 을 join 해서 가져온다.
+ //cabinetStatus 는 PENDING 이어야한다.
+ return queryFactory.selectFrom(cabinet)
+ .join(lentHistory)
+ .on(cabinet.cabinetId.eq(lentHistory.cabinet.cabinetId))
+ .where(cabinet.status.eq(cabinetStatus)
+ .and(lentHistory.endedAt
+ .before(currentDate)
+// .before(LocalDateTime.from(LocalDate.now().atStartOfDay()))
+ )
+ ).fetch();
+ }
+
+
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetOptionalFetcher.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetOptionalFetcher.java
index 567f3e208..2c92e416b 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetOptionalFetcher.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetOptionalFetcher.java
@@ -1,5 +1,6 @@
package org.ftclub.cabinet.cabinet.repository;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
@@ -52,6 +53,27 @@ public List findCabinetsActiveLentHistoriesByBuilding
}).collect(Collectors.toList());
}
+ public List findCabinetsActiveLentHistoriesByBuildingAndFloor2(
+ String building, Integer floor) {
+ return cabinetRepository.findCabinetsActiveLentHistoriesByBuildingAndFloor(building, floor);
+ }
+
+ public List findCabinetsByBuildingAndFloor2(String building, Integer floor) {
+ return cabinetRepository.findAllCabinetsByBuildingAndFloor(building, floor);
+ }
+
+ /**
+ * 유저 ID로 사물함을 찾습니다.
+ *
+ * @param userId 유저ID
+ * @return 사물함 엔티티
+ * @throws ServiceException 사물함을 찾을 수 없는 경우
+ */
+ public Cabinet findLentCabinetByUserId(Long userId) {
+ log.debug("Called findLentCabinetByUserId: {}", userId);
+ return cabinetRepository.findLentCabinetByUserId(userId).orElse(null);
+ }
+
public List findAllBuildings() {
log.debug("Called findAllBuildings");
return cabinetRepository.findAllBuildings();
@@ -68,6 +90,12 @@ public List findAllSectionsByBuildingAndFloor(String building, Integer f
return cabinetRepository.findAllSectionsByBuildingAndFloor(building, floor);
}
+ public List findAllPendingCabinetsByCabinetStatusAndBeforeEndedAt(CabinetStatus cabinetStatus,
+ LocalDateTime currentDate) {
+ log.debug("Called findAllCabinetsByCabinetStatusAndBeforeEndedAt: {}", cabinetStatus);
+ return cabinetRepository.findAllCabinetsByCabinetStatusAndBeforeEndedAt(cabinetStatus, currentDate);
+ }
+
public Page findPaginationByLentType(LentType lentType, PageRequest pageable) {
log.debug("Called findPaginationByLentType: {}", lentType);
return cabinetRepository.findPaginationByLentType(lentType, pageable);
@@ -93,17 +121,6 @@ public List findAllCabinetsByBuildingAndFloor(String building, Integer
}
/*-------------------------------------------GET--------------------------------------------*/
- /**
- * 유저 ID로 사물함을 찾습니다.
- *
- * @param userId 유저ID
- * @return 사물함 엔티티
- * @throws ServiceException 사물함을 찾을 수 없는 경우
- */
- public Cabinet findLentCabinetByUserId(Long userId) {
- log.debug("Called findLentCabinetByUserId: {}", userId);
- return cabinetRepository.findLentCabinetByUserId(userId).orElse(null);
- }
/**
* 사물함 ID로 변경 사항이 예정된 사물함을 찾습니다.
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetRepository.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetRepository.java
index 8ac9515fe..4a6c13fa7 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetRepository.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/repository/CabinetRepository.java
@@ -17,7 +17,7 @@
import org.springframework.stereotype.Repository;
@Repository
-public interface CabinetRepository extends JpaRepository {
+public interface CabinetRepository extends JpaRepository, CabinetComplexRepository {
@Lock(LockModeType.PESSIMISTIC_WRITE)
@Query("SELECT c "
@@ -68,19 +68,19 @@ List findAllSectionsByBuildingAndFloor(
"FROM Cabinet c " +
"WHERE c.lentType = :lentType")
Page findPaginationByLentType(@Param("lentType") LentType lentType,
- Pageable pageable);
+ Pageable pageable);
@Query("SELECT c " +
"FROM Cabinet c " +
"WHERE c.status = :status")
Page findPaginationByStatus(@Param("status") CabinetStatus status,
- Pageable pageable);
+ Pageable pageable);
@Query("SELECT c " +
"FROM Cabinet c " +
"WHERE c.visibleNum = :visibleNum")
Page findPaginationByVisibleNum(@Param("visibleNum") Integer visibleNum,
- Pageable pageable);
+ Pageable pageable);
@Query("SELECT c " +
"FROM Cabinet c " +
@@ -92,7 +92,8 @@ Page findPaginationByVisibleNum(@Param("visibleNum") Integer visibleNum
"FROM Cabinet c " +
"JOIN c.lentHistories lh ON lh.cabinetId = c.cabinetId " +
"JOIN lh.user u ON lh.userId = u.userId " +
- "WHERE c.cabinetPlace.location.building = :building AND c.cabinetPlace.location.floor = :floor " +
+ "WHERE c.cabinetPlace.location.building = :building AND c.cabinetPlace.location.floor = :floor "
+ +
"AND lh.endedAt IS NULL")
List findCabinetActiveLentHistoryUserListByBuildingAndFloor(
@Param("building") String building, @Param("floor") Integer floor);
@@ -101,5 +102,6 @@ List findCabinetActiveLentHistoryUserListByBuildingAndFloor(
@Query("SELECT c " +
"FROM Cabinet c " +
"WHERE c.cabinetPlace.location.building = :building AND c.cabinetPlace.location.floor = :floor")
- List findAllByBuildingAndFloor(@Param("building") String building, @Param("floor") Integer floor);
+ List findAllByBuildingAndFloor(@Param("building") String building,
+ @Param("floor") Integer floor);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeService.java
index eb82ce860..0e7138ab6 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeService.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeService.java
@@ -49,8 +49,10 @@ public interface CabinetFacadeService {
*/
List getCabinetsPerSection(String building, Integer floor);
- List getCabinetsPerSectionRefactor(String building, Integer floor);
+ List getCabinetsPerSectionRefactor(String building,
+ Integer floor);
+ List getCabinetsPerSectionDSL(String building, Integer floor);
/**
* 사물함의 상태 메모를 업데이트합니다.
*
@@ -150,4 +152,5 @@ LentHistoryPaginationDto getCabinetLentHistoriesPagination(Long cabinetId,
* @param clubStatusRequestDto
*/
void updateCabinetClubStatus(CabinetClubStatusRequestDto clubStatusRequestDto);
+
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeServiceImpl.java
index 9b8cfbc6c..4c1142076 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeServiceImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetFacadeServiceImpl.java
@@ -1,5 +1,12 @@
package org.ftclub.cabinet.cabinet.service;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
@@ -7,21 +14,34 @@
import org.ftclub.cabinet.cabinet.domain.Grid;
import org.ftclub.cabinet.cabinet.domain.LentType;
import org.ftclub.cabinet.cabinet.repository.CabinetOptionalFetcher;
-import org.ftclub.cabinet.dto.*;
+import org.ftclub.cabinet.dto.ActiveCabinetInfoEntities;
+import org.ftclub.cabinet.dto.BuildingFloorsDto;
+import org.ftclub.cabinet.dto.CabinetClubStatusRequestDto;
+import org.ftclub.cabinet.dto.CabinetDto;
+import org.ftclub.cabinet.dto.CabinetInfoPaginationDto;
+import org.ftclub.cabinet.dto.CabinetInfoResponseDto;
+import org.ftclub.cabinet.dto.CabinetPaginationDto;
+import org.ftclub.cabinet.dto.CabinetPreviewDto;
+import org.ftclub.cabinet.dto.CabinetSimpleDto;
+import org.ftclub.cabinet.dto.CabinetSimplePaginationDto;
+import org.ftclub.cabinet.dto.CabinetStatusRequestDto;
+import org.ftclub.cabinet.dto.CabinetsPerSectionResponseDto;
+import org.ftclub.cabinet.dto.LentDto;
+import org.ftclub.cabinet.dto.LentHistoryDto;
+import org.ftclub.cabinet.dto.LentHistoryPaginationDto;
import org.ftclub.cabinet.lent.domain.LentHistory;
import org.ftclub.cabinet.lent.repository.LentOptionalFetcher;
+import org.ftclub.cabinet.lent.repository.LentRedis;
import org.ftclub.cabinet.mapper.CabinetMapper;
import org.ftclub.cabinet.mapper.LentMapper;
import org.ftclub.cabinet.user.domain.User;
+import org.ftclub.cabinet.user.repository.UserOptionalFetcher;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
-import java.util.stream.Collectors;
-
@Service
@RequiredArgsConstructor
@Log4j2
@@ -32,6 +52,8 @@ public class CabinetFacadeServiceImpl implements CabinetFacadeService {
private final LentOptionalFetcher lentOptionalFetcher;
private final CabinetMapper cabinetMapper;
private final LentMapper lentMapper;
+ private final LentRedis lentRedis;
+ private final UserOptionalFetcher userOptionalFetcher;
/*-------------------------------------------READ-------------------------------------------*/
@@ -62,12 +84,22 @@ public CabinetInfoResponseDto getCabinetInfo(Long cabinetId) {
List lentDtos = new ArrayList<>();
List lentHistories = lentOptionalFetcher.findAllActiveLentByCabinetId(
cabinetId);
+ if (lentHistories.isEmpty()) {
+// ArrayList users = ticketingSharedCabinet.findUsersInSessionByCabinetIdFromRedis(
+// cabinetId);
+ ArrayList users = lentRedis.getUserIdsByCabinetIdInRedis(
+ cabinetId.toString());
+ for (String user : users) {
+ String userName = userOptionalFetcher.findUser(Long.valueOf(user)).getName();
+ lentDtos.add(new LentDto(null, userName, null, null, null));
+ }
+ }
for (LentHistory lentHistory : lentHistories) {
User findUser = lentHistory.getUser();
lentDtos.add(lentMapper.toLentDto(findUser, lentHistory));
}
return cabinetMapper.toCabinetInfoResponseDto(cabinetOptionalFetcher.findCabinet(cabinetId),
- lentDtos);
+ lentDtos, lentRedis.getSessionExpiredAtInRedis(cabinetId));
}
/**
@@ -91,14 +123,18 @@ public CabinetSimplePaginationDto getCabinetsSimpleInfoByVisibleNum(Integer visi
*/
@Override
@Transactional(readOnly = true)
- public List getCabinetsPerSection(String building, Integer floor) {
+ public List getCabinetsPerSection(String building,
+ Integer floor) {
log.debug("getCabinetsPerSection");
- List currentLentCabinets = cabinetOptionalFetcher.findCabinetsActiveLentHistoriesByBuildingAndFloor(building, floor);
- List allCabinetsByBuildingAndFloor = cabinetOptionalFetcher.findAllCabinetsByBuildingAndFloor(building, floor);
+ List currentLentCabinets = cabinetOptionalFetcher.findCabinetsActiveLentHistoriesByBuildingAndFloor(
+ building, floor);
+ List allCabinetsByBuildingAndFloor = cabinetOptionalFetcher.findAllCabinetsByBuildingAndFloor(
+ building, floor);
Map> cabinetLentHistories = currentLentCabinets.stream().
collect(Collectors.groupingBy(ActiveCabinetInfoEntities::getCabinet,
- Collectors.mapping(ActiveCabinetInfoEntities::getLentHistory, Collectors.toList())));
+ Collectors.mapping(ActiveCabinetInfoEntities::getLentHistory,
+ Collectors.toList())));
Map> cabinetPreviewsBySection = new HashMap<>();
cabinetLentHistories.forEach((cabinet, lentHistories) -> {
@@ -115,7 +151,8 @@ public List getCabinetsPerSection(String building
allCabinetsByBuildingAndFloor.forEach(cabinet -> {
if (!cabinetLentHistories.containsKey(cabinet)) {
String section = cabinet.getCabinetPlace().getLocation().getSection();
- CabinetPreviewDto preview = createCabinetPreviewDto(cabinet, Collections.emptyList());
+ CabinetPreviewDto preview = createCabinetPreviewDto(cabinet,
+ Collections.emptyList());
if (cabinetPreviewsBySection.containsKey(section)) {
cabinetPreviewsBySection.get(section).add(preview);
} else {
@@ -125,41 +162,50 @@ public List getCabinetsPerSection(String building
}
}
});
- cabinetPreviewsBySection.values().forEach(cabinetList -> cabinetList.sort(Comparator.comparing(CabinetPreviewDto::getVisibleNum)));
+ cabinetPreviewsBySection.values().forEach(cabinetList -> cabinetList.sort(
+ Comparator.comparing(CabinetPreviewDto::getVisibleNum)));
return cabinetPreviewsBySection.entrySet().stream()
.sorted(Comparator.comparing(entry -> entry.getValue().get(0).getVisibleNum()))
- .map(entry -> cabinetMapper.toCabinetsPerSectionResponseDto(entry.getKey(), entry.getValue()))
+ .map(entry -> cabinetMapper.toCabinetsPerSectionResponseDto(entry.getKey(),
+ entry.getValue()))
.collect(Collectors.toList());
}
@Override
public List getCabinetsPerSectionRefactor(String building,
Integer floor) {
- List cabinets = cabinetOptionalFetcher.findAllCabinetsByBuildingAndFloor(building, floor);
+ List cabinets = cabinetOptionalFetcher.findAllCabinetsByBuildingAndFloor(building,
+ floor);
Map> map = new HashMap<>();
cabinets.forEach(cabinet -> {
List lentHistories = lentOptionalFetcher
.findActiveLentByCabinetIdWithUser(cabinet.getCabinetId());
String section = cabinet.getCabinetPlace().getLocation().getSection();
if (map.containsKey(section)) {
- map.get(section).add(cabinetMapper.toCabinetPreviewDto(cabinet, lentHistories.size(),
- lentHistories.isEmpty() ? null : lentHistories.get(0).getUser().getName()));
- }
- else {
+ map.get(section)
+ .add(cabinetMapper.toCabinetPreviewDto(cabinet, lentHistories.size(),
+ lentHistories.isEmpty() ? null
+ : lentHistories.get(0).getUser().getName()));
+ } else {
List cabinetPreviewDtoList = new ArrayList<>();
- cabinetPreviewDtoList.add(cabinetMapper.toCabinetPreviewDto(cabinet, lentHistories.size(),
- lentHistories.isEmpty() ? null : lentHistories.get(0).getUser().getName()));
+ cabinetPreviewDtoList.add(
+ cabinetMapper.toCabinetPreviewDto(cabinet, lentHistories.size(),
+ lentHistories.isEmpty() ? null
+ : lentHistories.get(0).getUser().getName()));
map.put(section, cabinetPreviewDtoList);
}
});
- map.forEach((key, value) -> value.sort(Comparator.comparing(CabinetPreviewDto::getVisibleNum)));
+ map.forEach(
+ (key, value) -> value.sort(Comparator.comparing(CabinetPreviewDto::getVisibleNum)));
return map.entrySet().stream()
.sorted(Comparator.comparing(entry -> entry.getValue().get(0).getVisibleNum()))
- .map(entry -> cabinetMapper.toCabinetsPerSectionResponseDto(entry.getKey(), entry.getValue()))
+ .map(entry -> cabinetMapper.toCabinetsPerSectionResponseDto(entry.getKey(),
+ entry.getValue()))
.collect(Collectors.toList());
}
- private CabinetPreviewDto createCabinetPreviewDto(Cabinet cabinet, List lentHistories) {
+ private CabinetPreviewDto createCabinetPreviewDto(Cabinet cabinet,
+ List lentHistories) {
String lentUserName = null;
if (!lentHistories.isEmpty() && lentHistories.get(0).getUser() != null) {
lentUserName = lentHistories.get(0).getUser().getName();
@@ -167,6 +213,54 @@ private CabinetPreviewDto createCabinetPreviewDto(Cabinet cabinet, List getCabinetsPerSectionDSL(String building,
+ Integer floor) {
+ log.debug("getCabinetsPerSection");
+ List currentLentCabinets = cabinetOptionalFetcher.findCabinetsActiveLentHistoriesByBuildingAndFloor2(
+ building, floor);
+ List allCabinetsByBuildingAndFloor = cabinetOptionalFetcher.findAllCabinetsByBuildingAndFloor(
+ building, floor);
+
+ Map> cabinetLentHistories = currentLentCabinets.stream().
+ collect(Collectors.groupingBy(ActiveCabinetInfoEntities::getCabinet,
+ Collectors.mapping(ActiveCabinetInfoEntities::getLentHistory,
+ Collectors.toList())));
+
+ Map> cabinetPreviewsBySection = new HashMap<>();
+ cabinetLentHistories.forEach((cabinet, lentHistories) -> {
+ String section = cabinet.getCabinetPlace().getLocation().getSection();
+ CabinetPreviewDto preview = createCabinetPreviewDto(cabinet, lentHistories);
+ if (cabinetPreviewsBySection.containsKey(section)) {
+ cabinetPreviewsBySection.get(section).add(preview);
+ } else {
+ List previews = new ArrayList<>();
+ previews.add(preview);
+ cabinetPreviewsBySection.put(section, previews);
+ }
+ });
+ allCabinetsByBuildingAndFloor.forEach(cabinet -> {
+ if (!cabinetLentHistories.containsKey(cabinet)) {
+ String section = cabinet.getCabinetPlace().getLocation().getSection();
+ CabinetPreviewDto preview = createCabinetPreviewDto(cabinet,
+ Collections.emptyList());
+ if (cabinetPreviewsBySection.containsKey(section)) {
+ cabinetPreviewsBySection.get(section).add(preview);
+ } else {
+ List previews = new ArrayList<>();
+ previews.add(preview);
+ cabinetPreviewsBySection.put(section, previews);
+ }
+ }
+ });
+ cabinetPreviewsBySection.values().forEach(cabinetList -> cabinetList.sort(
+ Comparator.comparing(CabinetPreviewDto::getVisibleNum)));
+ return cabinetPreviewsBySection.entrySet().stream()
+ .sorted(Comparator.comparing(entry -> entry.getValue().get(0).getVisibleNum()))
+ .map(entry -> cabinetMapper.toCabinetsPerSectionResponseDto(entry.getKey(),
+ entry.getValue()))
+ .collect(Collectors.toList());
+ }
/**
* {@inheritDoc}
@@ -174,7 +268,7 @@ private CabinetPreviewDto createCabinetPreviewDto(Cabinet cabinet, List getCabinetsPerSection2(String building,
+ Integer floor) {
+ log.debug("getCabinetsPerSection2");
+ List cabinetsByBuildingAndFloor2 = cabinetOptionalFetcher.findCabinetsByBuildingAndFloor2(
+ building, floor);
+ List currentLentCabinets = cabinetOptionalFetcher.findCabinetsActiveLentHistoriesByBuildingAndFloor2(
+ building, floor);
+ // List currentLentCabinets = cabinetOptionalFetcher.findCabinetsActiveLentHistoriesByBuildingAndFloor(building, floor);
+ List allCabinetsByBuildingAndFloor = cabinetOptionalFetcher.findAllCabinetsByBuildingAndFloor(
+ building, floor);
+
+ // 층별 / 건물로 가져온 Cabinet 은 cache
+ // Cabinet 기준으로 lentHistory 를 조회
+ // LentHistory와 연결된 User 조회
+
+ Map> cabinetLentHistories = currentLentCabinets.stream().
+ collect(Collectors.groupingBy(ActiveCabinetInfoEntities::getCabinet,
+ Collectors.mapping(ActiveCabinetInfoEntities::getLentHistory,
+ Collectors.toList())));
+
+ Map> cabinetPreviewsBySection = new HashMap<>();
+ cabinetLentHistories.forEach((cabinet, lentHistories) -> {
+ String section = cabinet.getCabinetPlace().getLocation().getSection();
+ CabinetPreviewDto preview = createCabinetPreviewDto(cabinet, lentHistories);
+ if (cabinetPreviewsBySection.containsKey(section)) {
+ cabinetPreviewsBySection.get(section).add(preview);
+ } else {
+ List previews = new ArrayList<>();
+ previews.add(preview);
+ cabinetPreviewsBySection.put(section, previews);
+ }
+ });
+ allCabinetsByBuildingAndFloor.forEach(cabinet -> {
+ if (!cabinetLentHistories.containsKey(cabinet)) {
+ String section = cabinet.getCabinetPlace().getLocation().getSection();
+ CabinetPreviewDto preview = createCabinetPreviewDto(cabinet,
+ Collections.emptyList());
+ if (cabinetPreviewsBySection.containsKey(section)) {
+ cabinetPreviewsBySection.get(section).add(preview);
+ } else {
+ List previews = new ArrayList<>();
+ previews.add(preview);
+ cabinetPreviewsBySection.put(section, previews);
+ }
+ }
+ });
+ cabinetPreviewsBySection.values().forEach(cabinetList -> cabinetList.sort(
+ Comparator.comparing(CabinetPreviewDto::getVisibleNum)));
+ return cabinetPreviewsBySection.entrySet().stream()
+ .sorted(Comparator.comparing(entry -> entry.getValue().get(0).getVisibleNum()))
+ .map(entry -> cabinetMapper.toCabinetsPerSectionResponseDto(entry.getKey(),
+ entry.getValue()))
+ .collect(Collectors.toList());
+ }
+ **/
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetServiceImpl.java
index 8292b0722..dafc83f52 100644
--- a/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetServiceImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/cabinet/service/CabinetServiceImpl.java
@@ -8,6 +8,7 @@
import org.ftclub.cabinet.cabinet.domain.Grid;
import org.ftclub.cabinet.cabinet.domain.LentType;
import org.ftclub.cabinet.cabinet.repository.CabinetOptionalFetcher;
+import org.ftclub.cabinet.config.CabinetProperties;
import org.ftclub.cabinet.exception.ExceptionStatus;
import org.ftclub.cabinet.exception.ServiceException;
import org.ftclub.cabinet.lent.repository.LentOptionalFetcher;
@@ -24,6 +25,7 @@ public class CabinetServiceImpl implements CabinetService {
private final CabinetOptionalFetcher cabinetOptionalFetcher;
private final UserOptionalFetcher userOptionalFetcher;
private final LentOptionalFetcher lentOptionalFetcher;
+ private final CabinetProperties cabinetProperties;
/**
* {@inheritDoc}
@@ -121,7 +123,8 @@ public void updateLentType(Long cabinetId, LentType lentType) {
Cabinet cabinet = cabinetOptionalFetcher.getCabinet(cabinetId);
cabinet.specifyLentType(lentType);
if (lentType == LentType.SHARE) {
- cabinet.specifyMaxUser(3); // todo : policy에서 외부에서 설정된 properties 변수로 설정하게끔 수정
+ cabinet.specifyMaxUser(Math.toIntExact(
+ cabinetProperties.getShareMaxUserCount()));
} else { // club 도 1명으로 변경
cabinet.specifyMaxUser(1);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/config/CabinetProperties.java b/backend/src/main/java/org/ftclub/cabinet/config/CabinetProperties.java
index d80a98ac2..776a52b98 100644
--- a/backend/src/main/java/org/ftclub/cabinet/config/CabinetProperties.java
+++ b/backend/src/main/java/org/ftclub/cabinet/config/CabinetProperties.java
@@ -18,5 +18,8 @@ public class CabinetProperties {
private Integer penaltyDayShare;
@Value("${spring.cabinet.penalty.day.padding}")
private Integer penaltyDayPadding;
-
+ @Value("${spring.cabinet.lent.limit.share.min-user-count}")
+ private Long shareMinUserCount;
+ @Value("${spring.cabinet.lent.limit.share.max-user-count}")
+ private Long shareMaxUserCount;
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/config/RedisRepositoryConfig.java b/backend/src/main/java/org/ftclub/cabinet/config/RedisRepositoryConfig.java
new file mode 100644
index 000000000..0a860cf27
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/config/RedisRepositoryConfig.java
@@ -0,0 +1,59 @@
+package org.ftclub.cabinet.config;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Getter
+@Configuration
+@RequiredArgsConstructor
+@EnableRedisRepositories // Redis Repository 활성화
+public class RedisRepositoryConfig {
+
+ private final String PATTERN = "__keyevent@*__:expired";
+
+ @Value("${spring.redis.host}")
+ private String host;
+ @Value("${spring.redis.port}")
+ private int port;
+
+ @Bean
+ public RedisMessageListenerContainer redisMessageListenerContainer(
+ RedisConnectionFactory redisConnectionFactory) {
+ RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
+ redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
+ return redisMessageListenerContainer;
+ }
+
+ /**
+ * 내장 혹은 외부의 Redis를 연결
+ */
+ @Bean
+ public RedisConnectionFactory redisConnectionFactory() {
+ return new LettuceConnectionFactory(host, port);
+ }
+
+ /**
+ * RedisConnection에서 넘겨준 byte 값 객체 직렬화
+ */
+ @Bean
+ public RedisTemplate redisTemplate() {
+ RedisTemplate redisTemplate = new RedisTemplate<>();
+// GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer();
+ StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+ redisTemplate.setConnectionFactory(redisConnectionFactory());
+ redisTemplate.setKeySerializer(stringRedisSerializer);
+ redisTemplate.setValueSerializer(stringRedisSerializer);
+ redisTemplate.setHashKeySerializer(stringRedisSerializer);
+ redisTemplate.setHashValueSerializer(stringRedisSerializer);
+ return redisTemplate;
+ }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/org/ftclub/cabinet/config/SlackBotProperties.java b/backend/src/main/java/org/ftclub/cabinet/config/SlackBotProperties.java
new file mode 100644
index 000000000..21349fd0a
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/config/SlackBotProperties.java
@@ -0,0 +1,29 @@
+package org.ftclub.cabinet.config;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+@Getter
+public class SlackBotProperties {
+
+ @Value("${spring.slack.token.singing-secret}")
+ private String singingSecret;
+
+ @Value("${spring.slack.token.bot-token}")
+ private String botToken;
+
+ @Value("${spring.slack.token.app-token}")
+ private String appToken;
+
+ @Value("${spring.slack.token.channel}")
+ private String channelId;
+
+ @Value("${spring.slack.urls.slack-find-user}")
+ private String slackFindUserUrl;
+
+ @Value("${spring.slack.urls.intra-email-domain}")
+ private String intraDomainUrl;
+
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/ActiveCabinetInfoEntities.java b/backend/src/main/java/org/ftclub/cabinet/dto/ActiveCabinetInfoEntities.java
index deacb1175..655c6591a 100644
--- a/backend/src/main/java/org/ftclub/cabinet/dto/ActiveCabinetInfoEntities.java
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/ActiveCabinetInfoEntities.java
@@ -1,6 +1,6 @@
package org.ftclub.cabinet.dto;
-import lombok.AllArgsConstructor;
+import com.querydsl.core.annotations.QueryProjection;
import lombok.Getter;
import lombok.ToString;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
@@ -8,10 +8,16 @@
import org.ftclub.cabinet.user.domain.User;
@Getter
-@AllArgsConstructor
@ToString
public class ActiveCabinetInfoEntities {
private final Cabinet cabinet;
private final LentHistory lentHistory;
private final User user;
+
+ @QueryProjection
+ public ActiveCabinetInfoEntities(Cabinet cabinet, LentHistory lentHistory, User user) {
+ this.cabinet = cabinet;
+ this.lentHistory = lentHistory;
+ this.user = user;
+ }
}
\ No newline at end of file
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/CabinetInfoResponseDto.java b/backend/src/main/java/org/ftclub/cabinet/dto/CabinetInfoResponseDto.java
index b9b1bb301..265714f19 100644
--- a/backend/src/main/java/org/ftclub/cabinet/dto/CabinetInfoResponseDto.java
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/CabinetInfoResponseDto.java
@@ -1,6 +1,7 @@
package org.ftclub.cabinet.dto;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -27,11 +28,13 @@ public class CabinetInfoResponseDto {
@JsonUnwrapped
private final Location location;
private final List lents;
+ private final LocalDateTime sessionExpiredAt;
public static boolean isValid(CabinetInfoResponseDto dto) {
- return (dto != null && dto.cabinetId != null && dto.visibleNum != null && dto.lentType != null
+ return (dto != null && dto.cabinetId != null && dto.visibleNum != null
+ && dto.lentType != null
&& dto.maxUser != null && dto.title != null && dto.status != null
- && dto.statusNote != null && dto.location != null && dto.lents != null)
- ? true : false;
+ && dto.statusNote != null && dto.location != null && dto.lents != null
+ && dto.sessionExpiredAt != null);
}
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/MyCabinetResponseDto.java b/backend/src/main/java/org/ftclub/cabinet/dto/MyCabinetResponseDto.java
index e16c76401..b6bb2fafb 100644
--- a/backend/src/main/java/org/ftclub/cabinet/dto/MyCabinetResponseDto.java
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/MyCabinetResponseDto.java
@@ -1,6 +1,7 @@
package org.ftclub.cabinet.dto;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import java.time.LocalDateTime;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -26,4 +27,8 @@ public class MyCabinetResponseDto {
@JsonUnwrapped
private final Location location;
private final List lents;
+ // 공유사물함에 필요한 정보
+ private final String shareCode;
+ private final LocalDateTime sessionExpiredAt;
+ private final String previousUserName;
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/MyProfileResponseDto.java b/backend/src/main/java/org/ftclub/cabinet/dto/MyProfileResponseDto.java
index d0c550916..ee2714728 100644
--- a/backend/src/main/java/org/ftclub/cabinet/dto/MyProfileResponseDto.java
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/MyProfileResponseDto.java
@@ -1,7 +1,6 @@
package org.ftclub.cabinet.dto;
import java.time.LocalDateTime;
-import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -16,4 +15,5 @@ public class MyProfileResponseDto {
private final String name;
private final Long cabinetId;
private final LocalDateTime unbannedAt;
+ private final boolean isExtensible;
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/ShareCodeDto.java b/backend/src/main/java/org/ftclub/cabinet/dto/ShareCodeDto.java
new file mode 100644
index 000000000..225b53f20
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/ShareCodeDto.java
@@ -0,0 +1,13 @@
+package org.ftclub.cabinet.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class ShareCodeDto {
+
+ private String shareCode;
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/SlackResponse.java b/backend/src/main/java/org/ftclub/cabinet/dto/SlackResponse.java
new file mode 100644
index 000000000..2eaba79dd
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/SlackResponse.java
@@ -0,0 +1,15 @@
+package org.ftclub.cabinet.dto;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class SlackResponse {
+ private String ok;
+ @JsonAlias("user")
+ private SlackUserInfo slackUserInfo;
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/dto/SlackUserInfo.java b/backend/src/main/java/org/ftclub/cabinet/dto/SlackUserInfo.java
new file mode 100644
index 000000000..6a4fea034
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/dto/SlackUserInfo.java
@@ -0,0 +1,21 @@
+package org.ftclub.cabinet.dto;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class SlackUserInfo {
+ String id;
+ String name;
+ @JsonAlias("real_name")
+ String realName;
+ @JsonAlias("team_id")
+ String teamId;
+ Boolean deleted;
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/event/BlackholedUserLentEventListener.java b/backend/src/main/java/org/ftclub/cabinet/event/BlackholedUserLentEventListener.java
index b2478601b..d5a278597 100644
--- a/backend/src/main/java/org/ftclub/cabinet/event/BlackholedUserLentEventListener.java
+++ b/backend/src/main/java/org/ftclub/cabinet/event/BlackholedUserLentEventListener.java
@@ -9,13 +9,11 @@
@Log4j2
@Component
-//@EnableAsync
@RequiredArgsConstructor
public class BlackholedUserLentEventListener {
private final BlackholeManager blackholeManager;
- // @Async
@EventListener
public void handleBlackholedUserLentAttemptingEvent(UserBlackholeInfoDto userBlackholeInfoDto) {
log.info("Called handleBlackholedUserLentAttemptingEvent");
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/controller/LentController.java b/backend/src/main/java/org/ftclub/cabinet/lent/controller/LentController.java
index 1b935be36..b63617c32 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/controller/LentController.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/controller/LentController.java
@@ -7,6 +7,7 @@
import org.ftclub.cabinet.dto.LentEndMemoDto;
import org.ftclub.cabinet.dto.LentHistoryPaginationDto;
import org.ftclub.cabinet.dto.MyCabinetResponseDto;
+import org.ftclub.cabinet.dto.ShareCodeDto;
import org.ftclub.cabinet.dto.UpdateCabinetMemoDto;
import org.ftclub.cabinet.dto.UpdateCabinetTitleDto;
import org.ftclub.cabinet.dto.UserSessionDto;
@@ -38,6 +39,23 @@ public void startLentCabinet(
log.info("Called startLentCabinet user: {}, cabinetId: {}", user, cabinetId);
lentFacadeService.startLentCabinet(user.getUserId(), cabinetId);
}
+ @PostMapping("/cabinets/share/{cabinetId}")
+ public void startLentShareCabinet(
+ @UserSession UserSessionDto user,
+ @PathVariable Long cabinetId,
+ @Valid @RequestBody ShareCodeDto shareCodeDto) {
+ log.info("Called startLentShareCabinet user: {}, cabinetId: {}", user, cabinetId);
+ lentFacadeService.startLentShareCabinet(user.getUserId(), cabinetId,
+ shareCodeDto.getShareCode());
+ }
+
+ @PatchMapping("/cabinets/share/cancel/{cabinetId}")
+ public void cancelLentShareCabinet(
+ @UserSession UserSessionDto user,
+ @PathVariable Long cabinetId) {
+ log.info("Called cancelLentShareCabinet user: {}, cabinetId: {}", user, cabinetId);
+ lentFacadeService.cancelLentShareCabinet(user.getUserId(), cabinetId);
+ }
@PatchMapping("/return")
public void endLent(
@@ -50,7 +68,8 @@ public void endLent(
public void endLentWithMemo(
@UserSession UserSessionDto userSessionDto,
@Valid @RequestBody LentEndMemoDto lentEndMemoDto) {
- log.info("Called endLentWithMemo user: {}, lentEndMemoDto: {}", userSessionDto, lentEndMemoDto);
+ log.info("Called endLentWithMemo user: {}, lentEndMemoDto: {}", userSessionDto,
+ lentEndMemoDto);
lentFacadeService.endLentCabinetWithMemo(userSessionDto, lentEndMemoDto);
}
@@ -58,7 +77,8 @@ public void endLentWithMemo(
public void updateCabinetMemo(
@UserSession UserSessionDto user,
@Valid @RequestBody UpdateCabinetMemoDto updateCabinetMemoDto) {
- log.info("Called updateCabinetMemo user: {}, updateCabinetMemoDto: {}", user, updateCabinetMemoDto);
+ log.info("Called updateCabinetMemo user: {}, updateCabinetMemoDto: {}", user,
+ updateCabinetMemoDto);
lentFacadeService.updateCabinetMemo(user, updateCabinetMemoDto);
}
@@ -66,7 +86,8 @@ public void updateCabinetMemo(
public void updateCabinetTitle(
@UserSession UserSessionDto user,
@Valid @RequestBody UpdateCabinetTitleDto updateCabinetTitleDto) {
- log.info("Called updateCabinetTitle user: {}, updateCabinetTitleDto: {}", user, updateCabinetTitleDto);
+ log.info("Called updateCabinetTitle user: {}, updateCabinetTitleDto: {}", user,
+ updateCabinetTitleDto);
lentFacadeService.updateCabinetTitle(user, updateCabinetTitleDto);
}
@@ -74,7 +95,8 @@ public void updateCabinetTitle(
public void updateCabinetInfo(
@UserSession UserSessionDto user,
@RequestBody CabinetInfoRequestDto cabinetInfoRequestDto) {
- log.info("Called updateCabinetInfo user: {}, cabinetInfoRequestDto: {}", user, cabinetInfoRequestDto);
+ log.info("Called updateCabinetInfo user: {}, cabinetInfoRequestDto: {}", user,
+ cabinetInfoRequestDto);
lentFacadeService.updateCabinetInfo(user, cabinetInfoRequestDto);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentHistory.java b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentHistory.java
index 3389adefb..a0b8ffe16 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentHistory.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentHistory.java
@@ -1,5 +1,17 @@
package org.ftclub.cabinet.lent.domain;
+import static javax.persistence.FetchType.LAZY;
+
+import java.time.LocalDateTime;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Version;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -12,11 +24,6 @@
import org.ftclub.cabinet.utils.DateUtil;
import org.ftclub.cabinet.utils.ExceptionUtil;
-import javax.persistence.*;
-import java.time.LocalDateTime;
-
-import static javax.persistence.FetchType.LAZY;
-
/**
* lent의 기록을 관리하기 위한 data mapper
*/
@@ -28,215 +35,215 @@
@Log4j2
public class LentHistory {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "LENT_HISTORY_ID")
- private Long lentHistoryId;
-
- /**
- * 낙관적 락을 위한 version
- */
- @Version
- @Getter(AccessLevel.NONE)
- private Long version = 1L;
-
- /**
- * 대여 시작일
- */
- @Column(name = "STARTED_AT", nullable = false)
- private LocalDateTime startedAt;
-
- /**
- * 연체 시작일
- */
- @Column(name = "EXPIRED_AT")
- private LocalDateTime expiredAt = null;
-
- /**
- * 반납일
- */
- @Column(name = "ENDED_AT")
- private LocalDateTime endedAt = null;
-
- /**
- * 대여하는 유저
- */
- @Column(name = "USER_ID", nullable = false)
- private Long userId;
-
- /**
- * 대여하는 캐비넷
- */
- @Column(name = "CABINET_ID", nullable = false)
- private Long cabinetId;
-
- @JoinColumn(name = "USER_ID", insertable = false, updatable = false)
- @ManyToOne(fetch = LAZY)
- private User user;
-
- @JoinColumn(name = "CABINET_ID", insertable = false, updatable = false)
- @ManyToOne(fetch = LAZY)
- private Cabinet cabinet;
-
- protected LentHistory(LocalDateTime startedAt, LocalDateTime expiredAt, Long userId,
- Long cabinetId) {
- this.startedAt = startedAt;
- this.expiredAt = expiredAt;
- this.userId = userId;
- this.cabinetId = cabinetId;
- }
-
- /**
- * @param startedAt 대여 시작일
- * @param expiredAt 연체 시작일
- * @param userId 대여하는 user id
- * @param cabinetId 대여하는 cabinet id
- * @return 인자 정보를 담고있는 {@link LentHistory}
- */
- public static LentHistory of(LocalDateTime startedAt, LocalDateTime expiredAt, Long userId,
- Long cabinetId) {
- LentHistory lentHistory = new LentHistory(startedAt, expiredAt, userId, cabinetId);
- if (!lentHistory.isValid()) {
- throw new DomainException(ExceptionStatus.INVALID_ARGUMENT);
- }
- return lentHistory;
- }
-
- /**
- * startedAt, userId, cabinetId, expiredAt 의 null 이 아닌지 확인합니다.
- *
- * @return 유효한 인스턴스 여부
- */
-
- private boolean isValid() {
- return this.startedAt != null && this.userId != null && this.cabinetId != null
- && this.expiredAt != null;
- }
-
- /**
- * endedAt 보다 startedAt 이 나중이 아닌지 확인합니다. endedAt 종료시점이 null 이 아닌지 확인합니다.
- *
- * @param endedAt 대여 종료 날짜, 시간
- * @return
- */
- private boolean isEndLentValid(LocalDateTime endedAt) {
- return endedAt != null && 0 <= DateUtil.calculateTwoDateDiff(endedAt, this.startedAt);
- }
-
-
- @Override
- public boolean equals(final Object other) {
- if (this == other) {
- return true;
- }
- if (!(other instanceof LentHistory)) {
- return false;
- }
- return (this.lentHistoryId.equals(((LentHistory) other).lentHistoryId));
- }
-
- /**
- * 대여한 아이디와 같은지 비교한다.
- *
- * @param cabinetId 비교하고 싶은 id
- * @return boolean 같으면 true 다르면 false
- */
- public boolean isCabinetIdEqual(Long cabinetId) {
- return this.cabinetId.equals(cabinetId);
- }
-
- /**
- * 만료일을 변경합니다.
- *
- * @param expiredAt 변경하고 싶은 만료일
- */
- public void setExpiredAt(LocalDateTime expiredAt) {
- log.info("setExpiredAt : {}", expiredAt);
- this.expiredAt = expiredAt;
- ExceptionUtil.throwIfFalse(this.isValid(),
- new DomainException(ExceptionStatus.INVALID_STATUS));
- }
-
- /**
- * 만료일이 설정 되어있는 지 확인합니다. 만료일이 {@link DateUtil}의 infinityDate와 같으면 만료일이 설정되어 있지 않다고 판단합니다.
- *
- * @return 설정이 되어있으면 true 아니면 false
- */
- public boolean isSetExpiredAt() {
- LocalDateTime expiredAt = getExpiredAt();
- if (expiredAt == null) {
- return false;
- }
- if (expiredAt.isEqual(DateUtil.getInfinityDate())) {
- return false;
- }
- return true;
- }
-
- /**
- * 반납일이 설정 되어있는 지 확인합니다. 반납일이 {@link DateUtil}의 infinityDate와 같으면 만료일이 설정되어 있지 않다고 판단합니다.
- *
- * @return 설정이 되어있으면 ture 아니면 false
- */
- public boolean isSetEndedAt() {
- if (getEndedAt() == null) {
- return false;
- }
- if (getEndedAt().isEqual(DateUtil.getInfinityDate())) {
- return false;
- }
- return true;
- }
-
-
- /**
- * 반납일과 만료일의 차이를 계산합니다.
- *
- * @return endedAt - expiredAt의 값을(일 기준)
- */
- public Long getDaysDiffEndedAndExpired() {
- if (isSetExpiredAt() && isSetEndedAt()) {
- return DateUtil.calculateTwoDateDiff(endedAt, expiredAt);
- }
- return null;
- }
-
- /**
- * 만료일이 지났는지 확인합니다.
- *
- * @return 만료일이 지났으면 true 아니면 false, 만료일이 설정되어 있지 않으면 false
- */
- public Boolean isExpired(LocalDateTime now) {
- if (isSetExpiredAt()) {
- return DateUtil.calculateTwoDateDiffCeil(expiredAt, now) > 0;
- }
- return false;
- }
-
- /**
- * 만료일까지 남은 일수를 계산합니다. 만료시간이 설정되지 않았으면 null을 반환합니다.
- *
- * @return 만료일까지 남은 일수 (만료일 - 현재시간) (일 기준, 올림)
- */
- public Long getDaysUntilExpiration(LocalDateTime now) {
- if (isSetExpiredAt()) {
- return DateUtil.calculateTwoDateDiffCeil(expiredAt, now);
- }
- return null;
- }
-
-
- /**
- * 반납일을 설정합니다.
- *
- * @param now 설정하려고 하는 반납일
- */
- public void endLent(LocalDateTime now) {
- log.info("setEndLent : {}", now);
- ExceptionUtil.throwIfFalse((this.isEndLentValid(now)),
- new DomainException(ExceptionStatus.INVALID_ARGUMENT));
- this.endedAt = now;
- ExceptionUtil.throwIfFalse((this.isValid()),
- new DomainException(ExceptionStatus.INVALID_STATUS));
- }
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "LENT_HISTORY_ID")
+ private Long lentHistoryId;
+
+ /**
+ * 낙관적 락을 위한 version
+ */
+ @Version
+ @Getter(AccessLevel.NONE)
+ private Long version = 1L;
+
+ /**
+ * 대여 시작일
+ */
+ @Column(name = "STARTED_AT", nullable = false)
+ private LocalDateTime startedAt;
+
+ /**
+ * 연체 시작일
+ */
+ @Column(name = "EXPIRED_AT")
+ private LocalDateTime expiredAt = null;
+
+ /**
+ * 반납일
+ */
+ @Column(name = "ENDED_AT")
+ private LocalDateTime endedAt = null;
+
+ /**
+ * 대여하는 유저
+ */
+ @Column(name = "USER_ID", nullable = false)
+ private Long userId;
+
+ /**
+ * 대여하는 캐비넷
+ */
+ @Column(name = "CABINET_ID", nullable = false)
+ private Long cabinetId;
+
+ @JoinColumn(name = "USER_ID", insertable = false, updatable = false)
+ @ManyToOne(fetch = LAZY)
+ private User user;
+
+ @JoinColumn(name = "CABINET_ID", insertable = false, updatable = false)
+ @ManyToOne(fetch = LAZY)
+ private Cabinet cabinet;
+
+ protected LentHistory(LocalDateTime startedAt, LocalDateTime expiredAt, Long userId,
+ Long cabinetId) {
+ this.startedAt = startedAt;
+ this.expiredAt = expiredAt;
+ this.userId = userId;
+ this.cabinetId = cabinetId;
+ }
+
+ /**
+ * @param startedAt 대여 시작일
+ * @param expiredAt 연체 시작일
+ * @param userId 대여하는 user id
+ * @param cabinetId 대여하는 cabinet id
+ * @return 인자 정보를 담고있는 {@link LentHistory}
+ */
+ public static LentHistory of(LocalDateTime startedAt, LocalDateTime expiredAt, Long userId,
+ Long cabinetId) {
+ LentHistory lentHistory = new LentHistory(startedAt, expiredAt, userId, cabinetId);
+ if (!lentHistory.isValid()) {
+ throw new DomainException(ExceptionStatus.INVALID_ARGUMENT);
+ }
+ return lentHistory;
+ }
+
+ /**
+ * startedAt, userId, cabinetId, expiredAt 의 null 이 아닌지 확인합니다.
+ *
+ * @return 유효한 인스턴스 여부
+ */
+
+ private boolean isValid() {
+ return this.startedAt != null && this.userId != null && this.cabinetId != null
+ && this.expiredAt != null;
+ }
+
+ /**
+ * endedAt 보다 startedAt 이 나중이 아닌지 확인합니다. endedAt 종료시점이 null 이 아닌지 확인합니다.
+ *
+ * @param endedAt 대여 종료 날짜, 시간
+ * @return
+ */
+ private boolean isEndLentValid(LocalDateTime endedAt) {
+ return endedAt != null && 0 <= DateUtil.calculateTwoDateDiff(endedAt, this.startedAt);
+ }
+
+
+ @Override
+ public boolean equals(final Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (!(other instanceof LentHistory)) {
+ return false;
+ }
+ return (this.lentHistoryId.equals(((LentHistory) other).lentHistoryId));
+ }
+
+ /**
+ * 대여한 아이디와 같은지 비교한다.
+ *
+ * @param cabinetId 비교하고 싶은 id
+ * @return boolean 같으면 true 다르면 false
+ */
+ public boolean isCabinetIdEqual(Long cabinetId) {
+ return this.cabinetId.equals(cabinetId);
+ }
+
+ /**
+ * 만료일을 변경합니다.
+ *
+ * @param expiredAt 변경하고 싶은 만료일
+ */
+ public void setExpiredAt(LocalDateTime expiredAt) {
+ log.info("setExpiredAt : {}", expiredAt);
+ this.expiredAt = expiredAt;
+ ExceptionUtil.throwIfFalse(this.isValid(),
+ new DomainException(ExceptionStatus.INVALID_STATUS));
+ }
+
+ /**
+ * 만료일이 설정 되어있는 지 확인합니다. 만료일이 {@link DateUtil}의 infinityDate와 같으면 만료일이 설정되어 있지 않다고 판단합니다.
+ *
+ * @return 설정이 되어있으면 true 아니면 false
+ */
+ public boolean isSetExpiredAt() {
+ LocalDateTime expiredAt = getExpiredAt();
+ if (expiredAt == null) {
+ return false;
+ }
+ if (expiredAt.isEqual(DateUtil.getInfinityDate())) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 반납일이 설정 되어있는 지 확인합니다. 반납일이 {@link DateUtil}의 infinityDate와 같으면 만료일이 설정되어 있지 않다고 판단합니다.
+ *
+ * @return 설정이 되어있으면 ture 아니면 false
+ */
+ public boolean isSetEndedAt() {
+ if (getEndedAt() == null) {
+ return false;
+ }
+ if (getEndedAt().isEqual(DateUtil.getInfinityDate())) {
+ return false;
+ }
+ return true;
+ }
+
+
+ /**
+ * 반납일과 만료일의 차이를 계산합니다.
+ *
+ * @return endedAt - expiredAt의 값을(일 기준)
+ */
+ public Long getDaysDiffEndedAndExpired() {
+ if (isSetExpiredAt() && isSetEndedAt()) {
+ return DateUtil.calculateTwoDateDiff(endedAt, expiredAt);
+ }
+ return null;
+ }
+
+ /**
+ * 만료일이 지났는지 확인합니다.
+ *
+ * @return 만료일이 지났으면 true 아니면 false, 만료일이 설정되어 있지 않으면 false
+ */
+ public Boolean isExpired(LocalDateTime now) {
+ if (isSetExpiredAt()) {
+ return DateUtil.calculateTwoDateDiffCeil(expiredAt, now) > 0;
+ }
+ return false;
+ }
+
+ /**
+ * 만료일까지 남은 일수를 계산합니다. 만료시간이 설정되지 않았으면 null을 반환합니다.
+ *
+ * @return 만료일까지 남은 일수 (만료일 - 현재시간) (일 기준, 올림)
+ */
+ public Long getDaysUntilExpiration(LocalDateTime now) {
+ if (isSetExpiredAt()) {
+ return DateUtil.calculateTwoDateDiffCeil(expiredAt, now);
+ }
+ return null;
+ }
+
+
+ /**
+ * 반납일을 설정합니다.
+ *
+ * @param now 설정하려고 하는 반납일
+ */
+ public void endLent(LocalDateTime now) {
+ log.info("setEndLent : {}", now);
+ ExceptionUtil.throwIfFalse((this.isEndLentValid(now)),
+ new DomainException(ExceptionStatus.INVALID_ARGUMENT));
+ this.endedAt = now;
+ ExceptionUtil.throwIfFalse((this.isValid()),
+ new DomainException(ExceptionStatus.INVALID_STATUS));
+ }
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicy.java b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicy.java
index a545c16bb..851324d30 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicy.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicy.java
@@ -3,6 +3,7 @@
import java.time.LocalDateTime;
import java.util.List;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
+import org.ftclub.cabinet.exception.ServiceException;
import org.ftclub.cabinet.user.domain.BanHistory;
import org.ftclub.cabinet.user.domain.User;
@@ -11,25 +12,36 @@
*/
public interface LentPolicy {
+ /**
+ * @param now : 현재 시각
+ * @param totalUserCount : 공유사물함에 성공적으로 등록된 유저 수
+ * @return
+ */
+ LocalDateTime generateSharedCabinetExpirationDate(LocalDateTime now,
+ Integer totalUserCount);
+
/**
* 적절한 만료일을 만들어냅니다
*
- * @param now 현재 시각
- * @param cabinet 대여하려는 사물함
- * @param activeLentHistories 대여 하려는 사물함의 이전 대여 하고있었던 기록들 없다면 빈 리스트
+ * @param now 현재 시각
+ * @param cabinet 대여하려는 사물함
* @return cabinet을 빌릴 때 들어가야 하는 만료일
*/
- LocalDateTime generateExpirationDate(LocalDateTime now, Cabinet cabinet, List activeLentHistories);
+ LocalDateTime generateExpirationDate(LocalDateTime now, Cabinet cabinet);
+
+ /**
+ * @param now
+ * @return
+ */
+ LocalDateTime generateExtendedExpirationDate(LocalDateTime now);
/**
* 만료일을 @{@link LentHistory}에 적용시킵니다. 현재와 과거의 기록들에 적용합니다.
*
- * @param curHistory 현재 대여 기록
- * @param beforeActiveHistories 이전 대여 하고있는 기록들 없다면 빈 리스트
- * @param expiredAt 적용하려는 만료일
+ * @param curHistory 현재 대여 기록
+ * @param expiredAt 적용하려는 만료일
*/
- void applyExpirationDate(LentHistory curHistory, List beforeActiveHistories,
- LocalDateTime expiredAt);
+ void applyExpirationDate(LentHistory curHistory, LocalDateTime expiredAt);
/**
* 대여할 수 있는 유저인지 확인합니다.
@@ -43,16 +55,16 @@ void applyExpirationDate(LentHistory curHistory, List beforeActiveH
LentPolicyStatus verifyUserForLent(User user, Cabinet cabinet, int userActiveLentCount,
List userActiveBanList);
+ LentPolicyStatus verifyUserForLentShare(User user, Cabinet cabinet, int userActiveLentCount,
+ List userActiveBanList);
+
/**
* 대여할 수 있는 사물함인지 확인합니다.
*
- * @param cabinet 대여하려는 사물함
- * @param cabinetLentHistories 대여하려는 사물함을 빌리고 있는 기록들 없다면 빈리스트
- * @param now 현재 시각
+ * @param cabinet 대여하려는 사물함
* @return {@link LentPolicyStatus}
*/
- LentPolicyStatus verifyCabinetForLent(Cabinet cabinet,
- List cabinetLentHistories, LocalDateTime now);
+ LentPolicyStatus verifyCabinetForLent(Cabinet cabinet);
/**
* @return 개인 사물함을 대여 할 수 있는 날
@@ -62,10 +74,19 @@ LentPolicyStatus verifyCabinetForLent(Cabinet cabinet,
/**
* @return 공유 사물함을 대여 할 수 있는 날
*/
- Integer getDaysForLentTermShare();
+ Integer getDaysForLentTermShare(Integer totalUserCount);
/**
* @return 만료가 임박하여 공유 사물함을 빌릴 수 없는 날
*/
Integer getDaysForNearExpiration();
+
+ /**
+ * 정책에 대한 결과 상태({@link LentPolicyStatus})에 맞는 적절한 {@link ServiceException}을 throw합니다.
+ *
+ * @param status 정책에 대한 결과 상태
+ * @param banHistory 유저의 ban history
+ */
+ void handlePolicyStatus(LentPolicyStatus status, List banHistory);
+
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyImpl.java b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyImpl.java
index a39b8b081..752b22000 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyImpl.java
@@ -1,16 +1,20 @@
package org.ftclub.cabinet.lent.domain;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
-import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
import org.ftclub.cabinet.cabinet.domain.LentType;
import org.ftclub.cabinet.config.CabinetProperties;
import org.ftclub.cabinet.dto.UserBlackholeInfoDto;
+import org.ftclub.cabinet.exception.CustomExceptionStatus;
+import org.ftclub.cabinet.exception.CustomServiceException;
import org.ftclub.cabinet.exception.DomainException;
import org.ftclub.cabinet.exception.ExceptionStatus;
+import org.ftclub.cabinet.exception.ServiceException;
+import org.ftclub.cabinet.lent.repository.LentRedis;
import org.ftclub.cabinet.user.domain.BanHistory;
import org.ftclub.cabinet.user.domain.User;
import org.ftclub.cabinet.user.domain.UserRole;
@@ -25,35 +29,22 @@ public class LentPolicyImpl implements LentPolicy {
private final CabinetProperties cabinetProperties;
private final ApplicationEventPublisher publisher;
+ private final LentRedis lentRedis;
-
- private LocalDateTime generateSharedCabinetExpirationDate(LocalDateTime now,
- CabinetStatus cabinetStatus, LentHistory activeLentHistory) {
- log.debug("Called shareCabinetExpirationDateProcess");
-
- switch (cabinetStatus) {
- case AVAILABLE:
- return DateUtil.getInfinityDate();
-
- case LIMITED_AVAILABLE:
- return activeLentHistory.getExpiredAt();
-
- case FULL:
- if (activeLentHistory.isSetExpiredAt()) {
- return activeLentHistory.getExpiredAt();
- }
- return now.plusDays(getDaysForLentTermShare());
-
- default:
- throw new IllegalArgumentException("대여 현황 상태가 잘못되었습니다.");
- }
+ @Override
+ public LocalDateTime generateSharedCabinetExpirationDate(LocalDateTime now,
+ Integer totalUserCount) {
+ log.info("Called generateSharedCabinetExpirationDate now: {}, totalUserCount: {}", now,
+ totalUserCount);
+ return now.plusDays(getDaysForLentTermShare(totalUserCount))
+ .withHour(23)
+ .withMinute(59)
+ .withSecond(0);
}
@Override
- public LocalDateTime generateExpirationDate(LocalDateTime now, Cabinet cabinet,
- List activeLentHistories) {
- log.info("Called generateExpirationDate now: {}, cabinet: {}, activeLentHistories: {}",
- now, cabinet, activeLentHistories);
+ public LocalDateTime generateExpirationDate(LocalDateTime now, Cabinet cabinet) {
+ log.info("Called generateExpirationDate now: {}, cabinet: {}", now, cabinet);
if (!DateUtil.isSameDay(now)) {
throw new IllegalArgumentException("현재 시각이 아닙니다.");
@@ -62,14 +53,10 @@ public LocalDateTime generateExpirationDate(LocalDateTime now, Cabinet cabinet,
LentType lentType = cabinet.getLentType();
switch (lentType) {
case PRIVATE:
- return now.plusDays(getDaysForLentTermPrivate());
- case SHARE:
- if (activeLentHistories.isEmpty()) {
- return DateUtil.getInfinityDate();
- }
- LentHistory lentHistory = activeLentHistories.get(0);
- return generateSharedCabinetExpirationDate(now,
- cabinet.getStatus(), lentHistory);
+ return now.plusDays(getDaysForLentTermPrivate())
+ .withHour(23)
+ .withMinute(59)
+ .withSecond(0);
case CLUB:
return DateUtil.getInfinityDate();
}
@@ -77,23 +64,27 @@ public LocalDateTime generateExpirationDate(LocalDateTime now, Cabinet cabinet,
}
@Override
- public void applyExpirationDate(LentHistory curHistory, List beforeActiveHistories,
- LocalDateTime expiredAt) {
- log.info(
- "Called applyExpirationDate curHistory: {}, beforeActiveHistories: {}, expiredAt: {}",
- curHistory, beforeActiveHistories, expiredAt);
+ public LocalDateTime generateExtendedExpirationDate(LocalDateTime now) {
+ log.info("Called generateExtendedExpirationDate now: {}, cabinet: {}", now);
+ if (DateUtil.isPast(now)) {
+ throw new DomainException(ExceptionStatus.LENT_EXPIRED);
+ }
+ return now.plusDays(getDaysForLentTermPrivate())
+ .withHour(23)
+ .withMinute(59)
+ .withSecond(0);
+ }
+ @Override
+ public void applyExpirationDate(LentHistory curHistory, LocalDateTime expiredAt) {
+ log.info(
+ "Called applyExpirationDate curHistory: {}, expiredAt: {}", curHistory, expiredAt);
if (expiredAt == null) {
throw new DomainException(ExceptionStatus.INVALID_ARGUMENT);
}
-
if (DateUtil.isPast(expiredAt)) {
throw new DomainException(ExceptionStatus.INVALID_EXPIRED_AT);
}
-
- for (LentHistory lentHistory : beforeActiveHistories) {
- lentHistory.setExpiredAt(expiredAt);
- }
curHistory.setExpiredAt(expiredAt);
}
@@ -104,7 +95,7 @@ public LentPolicyStatus verifyUserForLent(User user, Cabinet cabinet, int userAc
if (!user.isUserRole(UserRole.USER)) {
return LentPolicyStatus.NOT_USER;
}
- if (userActiveLentCount >= 1) {
+ if (userActiveLentCount != 0) {
return LentPolicyStatus.ALREADY_LENT_USER;
}
if (user.getBlackholedAt() != null && user.getBlackholedAt()
@@ -117,7 +108,7 @@ public LentPolicyStatus verifyUserForLent(User user, Cabinet cabinet, int userAc
}
// 유저가 페널티 2 종류 이상 받을 수 있나? <- 실제로 그럴리 없지만 lentPolicy 객체는 그런 사실을 모르고, 유연하게 구현?
- if (userActiveBanList == null || userActiveBanList.size() == 0) {
+ if (userActiveBanList == null || userActiveBanList.isEmpty()) {
return LentPolicyStatus.FINE;
}
LentPolicyStatus ret = LentPolicyStatus.FINE;
@@ -138,10 +129,33 @@ public LentPolicyStatus verifyUserForLent(User user, Cabinet cabinet, int userAc
}
@Override
- public LentPolicyStatus verifyCabinetForLent(Cabinet cabinet,
- List cabinetLentHistories, LocalDateTime now) {
- log.info("Called verifyCabinetForLent cabinet: {}, cabinetLentHistories: {}, now: {}",
- cabinet, cabinetLentHistories, now);
+ public LentPolicyStatus verifyUserForLentShare(User user, Cabinet cabinet,
+ int userActiveLentCount,
+ List userActiveBanList) {
+
+ LentPolicyStatus ret = verifyUserForLent(user, cabinet, userActiveLentCount,
+ userActiveBanList);
+
+ // 유저가 패스워드를 3번 이상 틀린 경우
+ Long cabinetId = cabinet.getCabinetId();
+ Long userId = user.getUserId();
+ // 사물함을 빌릴 수 있는 유저라면 공유 사물함 비밀번호 입력 횟수를 확인
+ if (ret == LentPolicyStatus.FINE && lentRedis.isShadowKey(
+ cabinet.getCabinetId())) {
+ String passwordCount = lentRedis.getPwTrialCountInRedis(
+ cabinetId.toString(),
+ userId.toString());
+ // 사물함을 빌릴 수 있는 유저면서, 해당 공유사물함에 처음 접근하는 유저인 경우
+ if (passwordCount != null && Integer.parseInt(passwordCount) >= 3) {
+ ret = LentPolicyStatus.SHARE_BANNED_USER;
+ }
+ }
+ return ret;
+ }
+
+ @Override
+ public LentPolicyStatus verifyCabinetForLent(Cabinet cabinet) {
+ log.info("Called verifyCabinetForLent cabinet: {}", cabinet);
// 빌릴 수 있는지 검증. 빌릴 수 없으면 return lentPolicyDto;
switch (cabinet.getStatus()) {
case FULL:
@@ -150,21 +164,23 @@ public LentPolicyStatus verifyCabinetForLent(Cabinet cabinet,
return LentPolicyStatus.BROKEN_CABINET;
case OVERDUE:
return LentPolicyStatus.OVERDUE_CABINET;
+ case PENDING:
+ return LentPolicyStatus.PENDING_CABINET;
}
if (cabinet.isLentType(LentType.CLUB)) {
return LentPolicyStatus.LENT_CLUB;
}
- if (cabinet.isLentType(LentType.SHARE)
- && cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)) {
- if (cabinetLentHistories == null || cabinetLentHistories.isEmpty()) {
- return LentPolicyStatus.INTERNAL_ERROR;
- }
- Long diffDays = DateUtil.calculateTwoDateDiffAbs(
- cabinetLentHistories.get(0).getExpiredAt(), now);
- if (diffDays <= getDaysForNearExpiration()) {
- return LentPolicyStatus.IMMINENT_EXPIRATION;
- }
- }
+ // 기존의 공유사물함 정책에서 검사해야 되는 부분 -> 현재 필요 x
+// if (cabinet.isLentType(LentType.SHARE)) {
+// if (cabinetLentHistories == null || cabinetLentHistories.isEmpty()) {
+// return LentPolicyStatus.INTERNAL_ERROR;
+// }
+// Long diffDays = DateUtil.calculateTwoDateDiffAbs(
+// cabinetLentHistories.get(0).getExpiredAt(), now);
+// if (diffDays <= getDaysForNearExpiration()) { //
+// return LentPolicyStatus.IMMINENT_EXPIRATION;
+// }
+// }
return LentPolicyStatus.FINE;
}
@@ -175,9 +191,9 @@ public Integer getDaysForLentTermPrivate() {
}
@Override
- public Integer getDaysForLentTermShare() {
+ public Integer getDaysForLentTermShare(Integer totalUserCount) {
log.debug("Called getDaysForLentTermShare");
- return cabinetProperties.getLentTermShare();
+ return cabinetProperties.getLentTermShare() * totalUserCount;
}
@Override
@@ -185,4 +201,55 @@ public Integer getDaysForNearExpiration() {
log.debug("Called getDaysForNearExpiration");
return cabinetProperties.getPenaltyDayShare() + cabinetProperties.getPenaltyDayPadding();
}
+
+ @Override
+ public void handlePolicyStatus(LentPolicyStatus status, List banHistory)
+ throws ServiceException {
+ log.info("Called handlePolicyStatus status: {}", status);
+ switch (status) {
+ case FINE:
+ break;
+ case BROKEN_CABINET:
+ throw new ServiceException(ExceptionStatus.LENT_BROKEN);
+ case FULL_CABINET:
+ throw new ServiceException(ExceptionStatus.LENT_FULL);
+ case OVERDUE_CABINET:
+ throw new ServiceException(ExceptionStatus.LENT_EXPIRED);
+ case LENT_CLUB:
+ throw new ServiceException(ExceptionStatus.LENT_CLUB);
+ case IMMINENT_EXPIRATION:
+ throw new ServiceException(ExceptionStatus.LENT_EXPIRE_IMMINENT);
+ case ALREADY_LENT_USER:
+ throw new ServiceException(ExceptionStatus.LENT_ALREADY_EXISTED);
+ case ALL_BANNED_USER:
+ handleBannedUserResponse(status, banHistory.get(0));
+ case SHARE_BANNED_USER:
+ throw new ServiceException(ExceptionStatus.SHARE_CODE_TRIAL_EXCEEDED);
+ case BLACKHOLED_USER:
+ throw new ServiceException(ExceptionStatus.BLACKHOLED_USER);
+ case PENDING_CABINET:
+ throw new ServiceException(ExceptionStatus.LENT_PENDING);
+ case NOT_USER:
+ case INTERNAL_ERROR:
+ default:
+ throw new ServiceException(ExceptionStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ public void handleBannedUserResponse(LentPolicyStatus status, BanHistory banHistory) {
+ log.info("Called handleBannedUserResponse: {}", status);
+
+ LocalDateTime unbannedAt = banHistory.getUnbannedAt();
+ String unbannedTimeString = unbannedAt.format(
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+
+ if (status.equals(LentPolicyStatus.ALL_BANNED_USER)) {
+ throw new CustomServiceException(
+ new CustomExceptionStatus(ExceptionStatus.ALL_BANNED_USER, unbannedTimeString));
+ } else if (status.equals(LentPolicyStatus.SHARE_BANNED_USER)) {
+ throw new CustomServiceException(
+ new CustomExceptionStatus(ExceptionStatus.SHARE_BANNED_USER,
+ unbannedTimeString));
+ }
+ }
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyStatus.java b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyStatus.java
index da30bf705..ecc93fc66 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyStatus.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/domain/LentPolicyStatus.java
@@ -29,6 +29,10 @@
* 사물함이 고장남
*/
BROKEN_CABINET,
+ /**
+ * 대여 가능하도록 풀릴 사물함
+ */
+ PENDING_CABINET,
/**
* 내부 에러
*/
@@ -46,7 +50,9 @@
*/
ALL_BANNED_USER,
/**
- * share 벤 기록(패널티)이 있음
+ * shareCode를 3회 이상 틀린 유저
*/
- SHARE_BANNED_USER, BLACKHOLED_USER,
+ SHARE_BANNED_USER,
+ BLACKHOLED_USER,
+
}
\ No newline at end of file
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentOptionalFetcher.java b/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentOptionalFetcher.java
index 22a63e185..17a9874c0 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentOptionalFetcher.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentOptionalFetcher.java
@@ -2,6 +2,7 @@
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
@@ -24,8 +25,10 @@
public class LentOptionalFetcher {
private final LentRepository lentRepository;
+
private final CabinetRepository cabinetRepository;
private final CabinetOptionalFetcher cabinetExceptionHandler;
+ private final LentRedis lentRedis;
public List findAllActiveLentByCabinetId(Long cabinetId) {
log.debug("Called findAllActiveLentByCabinetId: {}", cabinetId);
@@ -90,6 +93,20 @@ public LentHistory getActiveLentHistoryWithUserId(Long userId) {
.orElseThrow(() -> new ServiceException(ExceptionStatus.NO_LENT_CABINET));
}
+ /**
+ * 아직 반납하지 않은 {@link LentHistory} 중에서 user id에 {@link LentHistory}를 찾습니다.
+ *
+ * @param userId 찾고 싶은 user id
+ * @return user id에 맞는 반납하지 않은 {@link LentHistory}
+ * @throws ServiceException NO_LENT_CABINET
+ * @Lock
+ */
+ public LentHistory getActiveLentHistoryWithUserIdForUpdate(Long userId) {
+ log.debug("Called getActiveLentHistoryWithUserId: {}", userId);
+ return lentRepository.findFirstByUserIdAndEndedAtIsNullForUpdate(userId)
+ .orElseThrow(() -> new ServiceException(ExceptionStatus.NO_LENT_CABINET));
+ }
+
/**
* 사물함에 남은 자리가 있는 지 확인합니다. 남은 자리가 없으면 throw합니다.
@@ -174,6 +191,28 @@ public Cabinet findActiveLentCabinetByUserId(Long userId) {
return cabinetRepository.findLentCabinetByUserId(userId).orElse(null);
}
+ /**
+ * Redis에서 유저가 대여대기중인 캐비넷을 가져옵니다.
+ *
+ * @param userId
+ * @return 유저가 대여대기중인 cabinet Id
+ */
+ public Long findCabinetIdByUserIdFromRedis(Long userId) {
+ log.debug("Called findActiveLentCabinetByUserIdFromRedis: {}", userId);
+ return lentRedis.findCabinetIdByUserIdInRedis(userId);
+ }
+
+ /**
+ * Redis에서 캐비넷을 대여대기중인 유저들의 user Ids를 가져옵니다.
+ *
+ * @param cabinetId 캐비넷 id
+ * @return 해당 캐비넷을 대여대기중인 유저들의 user Ids
+ */
+ public List findUserIdsByCabinetIdFromRedis(Long cabinetId) {
+ log.debug("Called findActiveLentUserIdsByCabinetId: {}", cabinetId);
+ return lentRedis.getUserIdsByCabinetIdInRedis(cabinetId.toString());
+ }
+
public List findAllOverdueLent(LocalDateTime date, Pageable pageable) {
log.debug("Called findAllOverdueLent: {}", date);
return lentRepository.findAllOverdueLent(date, pageable);
@@ -183,4 +222,26 @@ public Integer countCabinetAllActiveLent(Long cabinetId) {
log.debug("Called countCabinetAllActiveLent: {}", cabinetId);
return lentRepository.countCabinetAllActiveLent(cabinetId);
}
+
+ public LocalDateTime getSessionExpiredAtFromRedis(Long cabinetId) {
+ log.debug("Called getSessionExpiredAtFromRedis: {}", cabinetId);
+ return lentRedis.getSessionExpiredAtInRedis(cabinetId);
+ }
+
+ /**
+ * 아직 반납하지 않은 {@link LentHistory} 중에서 user id를 통해 {@link LentHistory}를 찾습니다. CABINET JOIN 없이,
+ * LentHistory의 subquery를 통해 찾습니다.
+ *
+ * @param userId 찾고 싶은 LentHistory 의 user id
+ * @return user id에 맞는 반납하지 않은 {@link LentHistory}
+ */
+ public List findAllActiveLentHistoriesByUserId(Long userId) {
+ log.debug("Called findAllActiveLentHistoriesByUserId: {}", userId);
+ return lentRepository.findAllActiveLentHistoriesByUserId(userId);
+ }
+
+ public Optional findPreviousLentHistoryByCabinetId(Long cabinetId) {
+ log.debug("Called findPreviousLentUserNameByCabinetId: {}", cabinetId);
+ return lentRepository.findFirstByCabinetIdAndEndedAtIsNotNullOrderByEndedAtDesc(cabinetId);
+ }
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRedis.java b/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRedis.java
new file mode 100644
index 000000000..9a7264244
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRedis.java
@@ -0,0 +1,181 @@
+package org.ftclub.cabinet.lent.repository;
+
+import lombok.extern.log4j.Log4j2;
+import org.ftclub.cabinet.exception.ExceptionStatus;
+import org.ftclub.cabinet.exception.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Component
+@Log4j2
+public class LentRedis {
+
+ private static final String MAX_SHARE_CODE_TRY = "3";
+ private static final String USER_ENTERED = "entered";
+ private static final String SHADOW_KEY_SUFFIX = ":shadow";
+ private static final String VALUE_KEY_SUFFIX = ":user";
+ private static final String PREVIOUS_USER_SUFFIX = ":previousUser";
+
+ private final HashOperations valueHashOperations;
+ private final ValueOperations valueOperations;
+ private final RedisTemplate shadowKeyRedisTemplate;
+ private final ValueOperations previousUserRedisTemplate;
+
+ @Autowired
+ public LentRedis(RedisTemplate valueHashRedisTemplate,
+ RedisTemplate valueRedisTemplate,
+ RedisTemplate shadowKeyRedisTemplate,
+ RedisTemplate previousUserRedisTemplate) {
+ this.valueOperations = valueRedisTemplate.opsForValue();
+ this.valueHashOperations = valueHashRedisTemplate.opsForHash();
+ this.shadowKeyRedisTemplate = shadowKeyRedisTemplate;
+ this.previousUserRedisTemplate = previousUserRedisTemplate.opsForValue();
+ }
+
+ /**
+ * @param cabinetId : cabinetId
+ * @param userId : userId
+ * @param shareCode : 초대코드
+ * @param hasShadowKey : 최초 대여인지 아닌지 여부
+ */
+ public void saveUserInRedis(String cabinetId, String userId, String shareCode,
+ boolean hasShadowKey) {
+ log.debug("called saveUserInRedis: {}, {}, {}, {}", cabinetId, userId, shareCode,
+ hasShadowKey);
+ if (!hasShadowKey || isValidShareCode(Long.valueOf(cabinetId),
+ shareCode)) { // 방장이거나 초대코드를 맞게 입력한 경우
+ valueHashOperations.put(cabinetId, userId,
+ USER_ENTERED); // userId를 hashKey로 하여 -1을 value로 저장 // TODO: -1 대신 새로운 플래그값 넣어도 될듯?
+ valueOperations.set(userId + VALUE_KEY_SUFFIX,
+ cabinetId); // userId를 key로 하여 cabinetId를 value로 저장
+ } else { // 초대코드가 틀린 경우
+ if (valueHashOperations.hasKey(cabinetId, userId)) { // 이미 존재하는 유저인 경우
+ System.out.println("value : " + valueHashOperations.get(cabinetId, userId));
+ valueHashOperations.increment(cabinetId, userId, 1L); // trialCount를 1 증가시켜서 저장
+ } else { // 존재하지 않는 유저인 경우
+ valueHashOperations.put(cabinetId, userId, "1"); // trialCount를 1로 저장
+ }
+ throw new ServiceException(ExceptionStatus.WRONG_SHARE_CODE);
+ }
+ }
+
+ public boolean isValidShareCode(Long cabinetId, String shareCode) {
+ log.debug("called isValidShareCode: {}, {}", cabinetId, shareCode);
+ return Objects.equals(
+ shadowKeyRedisTemplate.opsForValue().get(cabinetId + SHADOW_KEY_SUFFIX),
+ shareCode);
+ }
+
+ public boolean checkPwTrialCount(String cabinetId, String userId) {
+ log.debug("called checkPwTrialCount: {}, {}", cabinetId, userId);
+ return Objects.equals(valueHashOperations.get(cabinetId, userId), MAX_SHARE_CODE_TRY);
+ }
+
+ public Boolean isUserInRedis(String cabinetId, String userId) {
+ log.debug("called isUserInRedis: {}, {}", cabinetId, userId);
+ return valueHashOperations.hasKey(cabinetId, userId);
+ }
+
+ public Long getSizeOfUsersInSession(String cabinetId) {
+ log.debug("called getSizeOfUsersInSession: {}", cabinetId);
+ Map entries = valueHashOperations.entries(cabinetId);
+ return entries.values().stream().filter(Objects::nonNull)
+ .filter(value -> value.equals(USER_ENTERED))
+ .count();
+ }
+
+ public String getPwTrialCountInRedis(String cabinetId, String userId) {
+ log.debug("called getPwTrialCountInRedis: {}, {}", cabinetId, userId);
+ return valueHashOperations.get(cabinetId, userId);
+ }
+
+ public String getShareCode(Long cabinetId) {
+ log.debug("called getShareCode: {}", cabinetId);
+ return shadowKeyRedisTemplate.opsForValue().get(cabinetId + SHADOW_KEY_SUFFIX);
+ }
+
+ public void setShadowKey(Long cabinetId) {
+ Random rand = new Random();
+ Integer shareCode = 1000 + rand.nextInt(9000);
+ String shadowKey = cabinetId + SHADOW_KEY_SUFFIX;
+ shadowKeyRedisTemplate.opsForValue().set(shadowKey, shareCode.toString());
+ // 해당 키가 처음 생성된 것이라면 timeToLive 설정
+ log.debug("called setShadowKey: {}, shareCode: {}", shadowKey, shareCode);
+ shadowKeyRedisTemplate.expire(shadowKey, 10, TimeUnit.MINUTES);
+ }
+
+ public Boolean isShadowKey(Long cabinetId) {
+ log.debug("called isShadowKey: {}", cabinetId);
+ // 해당 키가 존재하는지 확인
+ return shadowKeyRedisTemplate.hasKey(cabinetId + SHADOW_KEY_SUFFIX);
+ }
+
+ public void deleteShadowKey(Long cabinetId) {
+ log.debug("called deleteShadowKey: {}", cabinetId);
+ shadowKeyRedisTemplate.delete(cabinetId + SHADOW_KEY_SUFFIX);
+ }
+
+ public void deleteUserInRedis(String cabinetId, String userId) { // user를 지우는 delete
+ log.debug("called deleteUserInRedis: {}, {}", cabinetId, userId);
+ valueHashOperations.delete(cabinetId, userId);
+ valueOperations.getOperations().delete(userId + VALUE_KEY_SUFFIX);
+ }
+
+ public void deleteCabinetIdInRedis(String cabinetId) {
+ log.debug("called deleteCabinetIdInRedis: {}", cabinetId);
+ valueHashOperations.getOperations().delete(cabinetId);
+ }
+
+ public void deleteUserIdInRedis(Long userId) {
+ log.debug("called deleteUserIdInRedis: {}", userId);
+ valueOperations.getOperations().delete(userId + VALUE_KEY_SUFFIX);
+ }
+
+ public Long findCabinetIdByUserIdInRedis(Long userId) {
+ log.debug("Called findCabinetIdByUserIdInRedis: {}", userId);
+ String cabinetId = valueOperations.get(userId + VALUE_KEY_SUFFIX);
+ if (cabinetId == null) {
+ log.info("cabinetId is null");
+ return null;
+ }
+ return Long.valueOf(cabinetId);
+ }
+
+ public ArrayList getUserIdsByCabinetIdInRedis(String cabinetId) {
+ log.debug("Called getUserIdsByCabinetIdInRedis: {}", cabinetId);
+ Map entries = valueHashOperations.entries(cabinetId);
+ return entries.entrySet().stream().filter(entry -> entry.getValue().equals(USER_ENTERED))
+ .map(Map.Entry::getKey).collect(Collectors.toCollection(ArrayList::new));
+ }
+
+ public LocalDateTime getSessionExpiredAtInRedis(Long cabinetId) {
+ log.debug("Called getSessionExpiredAtInRedis: {}", cabinetId);
+ if (isShadowKey(cabinetId)) {
+ return LocalDateTime.now().plusSeconds(
+ shadowKeyRedisTemplate.getExpire(cabinetId + SHADOW_KEY_SUFFIX,
+ TimeUnit.SECONDS).longValue());
+ }
+ return null;
+ }
+
+ public void setPreviousUser(String cabinetId, String userName) {
+ log.debug("Called setPreviousUser: {}, {}", cabinetId, userName);
+ previousUserRedisTemplate.set(cabinetId + PREVIOUS_USER_SUFFIX, userName);
+ }
+
+ public String getPreviousUserName(String cabinetId) {
+ log.debug("Called getPreviousUser: {}", cabinetId);
+ return previousUserRedisTemplate.get(cabinetId + PREVIOUS_USER_SUFFIX);
+ }
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRepository.java b/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRepository.java
index ebec18d9b..bbda21a0b 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRepository.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/repository/LentRepository.java
@@ -3,10 +3,12 @@
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
+import javax.persistence.LockModeType;
import org.ftclub.cabinet.lent.domain.LentHistory;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
@@ -33,6 +35,19 @@ public interface LentRepository extends JpaRepository {
*/
Optional findFirstByUserIdAndEndedAtIsNull(@Param("userId") Long userId);
+ /**
+ * 유저를 기준으로 아직 반납하지 않은 {@link LentHistory}중 하나를 가져옵니다. X Lock을 걸어서 가져옵니다.
+ *
+ * @param userId 찾으려는 user id
+ * @return 반납하지 않은 {@link LentHistory}의 {@link Optional}
+ */
+ @Lock(LockModeType.PESSIMISTIC_WRITE)
+ @Query("SELECT lh " +
+ "FROM LentHistory lh " +
+ "WHERE lh.userId = :userId AND lh.endedAt is null")
+ Optional findFirstByUserIdAndEndedAtIsNullForUpdate(@Param("userId") Long userId);
+
+
/**
* 유저가 지금까지 빌렸던 {@link LentHistory}들을 가져옵니다. {@link Pageable}이 적용되었습니다.
*
@@ -62,6 +77,14 @@ List findByUserIdAndEndedAtNotNull(@Param("userId") Long userId,
*/
List findByCabinetId(@Param("cabinetId") Long cabinetId, Pageable pageable);
+ /***
+ * 사물함을 기준으로 가장 최근에 반납한 {@link LentHistory} 를 가져옵니다.
+ * @param cabinetId 찾으려는 cabinet id
+ * @return 반납한 {@link LentHistory}의 {@link Optional}
+ */
+ Optional findFirstByCabinetIdAndEndedAtIsNotNullOrderByEndedAtDesc(
+ @Param("cabinetId") Long cabinetId);
+
/**
* 유저가 빌리고 있는 사물함의 개수를 가져옵니다.
*
@@ -122,7 +145,8 @@ List findByUserIdAndEndedAtNotNull(@Param("userId") Long userId,
"FROM LentHistory lh " +
"LEFT JOIN FETCH lh.user " +
"WHERE lh.cabinetId = :cabinetId and lh.endedAt is null")
- List findActiveLentHistoriesByCabinetIdWithUser(@Param("cabinetId") Long cabinetId);
+ List findActiveLentHistoriesByCabinetIdWithUser(
+ @Param("cabinetId") Long cabinetId);
@Query("SELECT lh " +
"FROM LentHistory lh " +
@@ -165,10 +189,19 @@ Integer countReturnByTimeDuration(@Param("startDate") LocalDateTime startDate,
@Query("SELECT count(lh) " +
"FROM LentHistory lh " +
"WHERE lh.cabinetId = :cabinetId AND lh.endedAt IS NULL")
- Integer countCabinetAllActiveLent(Long cabinetId);
+ Integer countCabinetAllActiveLent(@Param("cabinetId") Long cabinetId);
@Query("SELECT lh " +
"FROM LentHistory lh " +
"WHERE lh.endedAt IS NULL")
List findAllActiveLentHistories();
-}
+
+ @Query("SELECT lh "
+ + "FROM LentHistory lh "
+ + "WHERE lh.endedAt IS NULL "
+ + "AND lh.cabinetId "
+ + "IN (SELECT lh2.cabinetId "
+ + "FROM LentHistory lh2 WHERE lh2.userId = :userId AND lh2.endedAt IS NULL)")
+ List findAllActiveLentHistoriesByUserId(@Param("userId") Long userId);
+
+}
\ No newline at end of file
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java
index 47694d083..e0a440e3e 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java
@@ -10,12 +10,21 @@
import org.ftclub.cabinet.dto.UpdateCabinetMemoDto;
import org.ftclub.cabinet.dto.UpdateCabinetTitleDto;
import org.ftclub.cabinet.dto.UserSessionDto;
+import org.ftclub.cabinet.user.domain.UserSession;
/**
* controller에서 사용하는 파사드 서비스
*/
public interface LentFacadeService {
+ /**
+ * 유저의 대여대기 정보를 가져옵니다.
+ *
+ * @param user
+ * @return
+ */
+ MyCabinetResponseDto getMyLentInfoFromRedis(@UserSession UserSessionDto user);
+
/**
* 사물함 대여를 합니다.
*
@@ -24,6 +33,15 @@ public interface LentFacadeService {
*/
void startLentCabinet(Long userId, Long cabinetId);
+ /***
+ * 공유사물함 대여를 합니다.
+ *
+ * @param userId 대여하려는 일반 user id
+ * @param cabinetId 대여하려는 cabinet id
+ * @param shareCode 10분 간 유지되는 공유사물함 초대 코드
+ */
+ void startLentShareCabinet(Long userId, Long cabinetId, String shareCode);
+
/**
* 동아리 사물함 대여를 합니다.
*
@@ -47,6 +65,13 @@ public interface LentFacadeService {
*/
void endLentCabinetWithMemo(UserSessionDto userSessionDto, LentEndMemoDto lentEndMemoDto);
+ /**
+ * 공유사물함 대여 대기열을 취소합니다.
+ *
+ * @param userId 대여하려는 일반 user id
+ */
+ void cancelLentShareCabinet(Long userId, Long cabinetId);
+
/**
* 사물함을 강제 반납 합니다. 유저가 벤이 되진 않습니다
@@ -93,6 +118,8 @@ LentHistoryPaginationDto getAllCabinetLentHistories(Long cabinetId, Integer page
*/
List getLentDtoList(Long cabinetId);
+ List getLentDtoListFromRedis(Long cabinetId);
+
/**
* 내가 대여한 기록들을 페이지네이션 기준으로 가져옵니다.
*
@@ -136,4 +163,5 @@ void updateCabinetInfo(UserSessionDto userSessionDto,
* @param cabinetId 대여시킬 캐비넷 Id
*/
void assignLent(Long userId, Long cabinetId);
+
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeServiceImpl.java
index 5c5ab58d9..1722cc87f 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeServiceImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeServiceImpl.java
@@ -1,6 +1,7 @@
package org.ftclub.cabinet.lent.service;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
import javax.transaction.Transactional;
import lombok.AllArgsConstructor;
@@ -8,6 +9,7 @@
import org.ftclub.cabinet.cabinet.domain.Cabinet;
import org.ftclub.cabinet.cabinet.repository.CabinetOptionalFetcher;
import org.ftclub.cabinet.cabinet.service.CabinetService;
+import org.ftclub.cabinet.config.CabinetProperties;
import org.ftclub.cabinet.dto.CabinetInfoRequestDto;
import org.ftclub.cabinet.dto.LentDto;
import org.ftclub.cabinet.dto.LentEndMemoDto;
@@ -21,8 +23,10 @@
import org.ftclub.cabinet.dto.UserSessionDto;
import org.ftclub.cabinet.lent.domain.LentHistory;
import org.ftclub.cabinet.lent.repository.LentOptionalFetcher;
+import org.ftclub.cabinet.lent.repository.LentRedis;
import org.ftclub.cabinet.mapper.CabinetMapper;
import org.ftclub.cabinet.mapper.LentMapper;
+import org.ftclub.cabinet.user.domain.User;
import org.ftclub.cabinet.user.domain.UserSession;
import org.ftclub.cabinet.user.repository.UserOptionalFetcher;
import org.ftclub.cabinet.user.service.UserService;
@@ -44,8 +48,9 @@ public class LentFacadeServiceImpl implements LentFacadeService {
private final LentMapper lentMapper;
private final CabinetService cabinetService;
private final CabinetMapper cabinetMapper;
- private final UserService userService;
-
+ private final LentRedis lentRedis;
+ private final CabinetProperties cabinetProperties;
+ private final UserService userService;
/*-------------------------------------------READ-------------------------------------------*/
@@ -59,8 +64,10 @@ public LentHistoryPaginationDto getAllUserLentHistories(Long userId, Integer pag
size = Integer.MAX_VALUE;
}
PageRequest pageable = PageRequest.of(page, size, Sort.by("startedAt"));
- Page lentHistories = lentOptionalFetcher.findPaginationByUserId(userId, pageable);
- return generateLentHistoryPaginationDto(lentHistories.toList(), lentHistories.getTotalElements());
+ Page lentHistories = lentOptionalFetcher.findPaginationByUserId(userId,
+ pageable);
+ return generateLentHistoryPaginationDto(lentHistories.toList(),
+ lentHistories.getTotalElements());
}
@Override
@@ -69,8 +76,10 @@ public LentHistoryPaginationDto getAllCabinetLentHistories(Long cabinetId, Integ
log.debug("Called getAllCabinetLentHistories: {}", cabinetId);
cabinetOptionalFetcher.getCabinet(cabinetId);
PageRequest pageable = PageRequest.of(page, size, Sort.by("startedAt"));
- Page lentHistories = lentOptionalFetcher.findPaginationByCabinetId(cabinetId, pageable);
- return generateLentHistoryPaginationDto(lentHistories.toList(), lentHistories.getTotalElements());
+ Page lentHistories = lentOptionalFetcher.findPaginationByCabinetId(cabinetId,
+ pageable);
+ return generateLentHistoryPaginationDto(lentHistories.toList(),
+ lentHistories.getTotalElements());
}
@Override
@@ -91,6 +100,23 @@ public List getLentDtoList(Long cabinetId) {
// .collect(Collectors.toList());
}
+ @Override
+ public List getLentDtoListFromRedis(Long cabinetId) {
+ log.debug("Called getLentDtoListFromRedis: {}", cabinetId);
+
+ List userIds = lentOptionalFetcher.findUserIdsByCabinetIdFromRedis(cabinetId);
+ return userIds.stream().map(
+ userId -> {
+ User user = userOptionalFetcher.findUser(Long.valueOf(userId));
+ return new LentDto(
+ user.getUserId(),
+ user.getName(),
+ null,
+ null,
+ null);
+ }).collect(Collectors.toList());
+ }
+
/**
* {@InheritDocs}
*
@@ -131,13 +157,43 @@ private LentHistoryPaginationDto generateLentHistoryPaginationDto(
public MyCabinetResponseDto getMyLentInfo(@UserSession UserSessionDto user) {
log.debug("Called getMyLentInfo: {}", user.getName());
Cabinet myCabinet = lentOptionalFetcher.findActiveLentCabinetByUserId(user.getUserId());
- if (myCabinet == null) {
+ if (myCabinet == null) { // 대여 기록이 없거나 대여 대기 중인 경우
+ return getMyLentInfoFromRedis(user);
+ }
+ Long cabinetId = myCabinet.getCabinetId();
+ List lentDtoList = getLentDtoList(cabinetId);
+ String previousUserName = lentRedis.getPreviousUserName(
+ myCabinet.getCabinetId().toString());
+ if (previousUserName == null) {
+ Optional previousLentHistory = lentOptionalFetcher.findPreviousLentHistoryByCabinetId(
+ cabinetId);
+ if (previousLentHistory.isPresent()) {
+ previousUserName = previousLentHistory.get().getUser().getName();
+ }
+ }
+ return cabinetMapper.toMyCabinetResponseDto(myCabinet, lentDtoList,
+ null, null, previousUserName);
+ }
+
+ @Override
+ public MyCabinetResponseDto getMyLentInfoFromRedis(@UserSession UserSessionDto user) {
+ log.debug("Called getMyLentInfoFromRedis: {}", user.getName());
+ Long userId = user.getUserId();
+ Long cabinetId = lentOptionalFetcher.findCabinetIdByUserIdFromRedis(userId);
+ log.debug("cabinetId: {}", cabinetId);
+ if (cabinetId == null) {
+ log.info("cabinetId is null");
return null;
}
- List lentDtoList = getLentDtoList(myCabinet.getCabinetId());
- return cabinetMapper.toMyCabinetResponseDto(myCabinet, lentDtoList);
+ Cabinet cabinet = cabinetOptionalFetcher.getCabinet(cabinetId);
+ cabinet.specifyMaxUser(Math.toIntExact(cabinetProperties.getShareMaxUserCount()));
+ List lentDtoList = getLentDtoListFromRedis(cabinetId);
+ return cabinetMapper.toMyCabinetResponseDto(cabinet, lentDtoList,
+ lentRedis.getShareCode(cabinetId),
+ lentRedis.getSessionExpiredAtInRedis(cabinetId), null);
}
+
/*--------------------------------------------CUD--------------------------------------------*/
@Override
@@ -145,6 +201,11 @@ public void startLentCabinet(Long userId, Long cabinetId) {
lentService.startLentCabinet(userId, cabinetId);
}
+ @Override
+ public void startLentShareCabinet(Long userId, Long cabinetId, String shareCode) {
+ lentService.startLentShareCabinet(userId, cabinetId, shareCode);
+ }
+
@Override
public void startLentClubCabinet(Long userId, Long cabinetId) {
lentService.startLentClubCabinet(userId, cabinetId);
@@ -163,8 +224,14 @@ public void endLentCabinetWithMemo(UserSessionDto user, LentEndMemoDto lentEndMe
cabinetService.updateMemo(cabinet.getCabinetId(), lentEndMemoDto.getCabinetMemo());
}
+ @Override
+ public void cancelLentShareCabinet(Long userId, Long cabinetId) {
+ lentService.cancelLentShareCabinet(userId, cabinetId);
+ }
+
@Override
public void terminateLentCabinet(Long userId) {
+ log.debug("Called terminateLentCabinet {}", userId);
lentService.terminateLentCabinet(userId);
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentService.java
index 68444f94a..3910e10b6 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentService.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentService.java
@@ -16,6 +16,14 @@ public interface LentService {
*/
void startLentCabinet(Long userId, Long cabinetId);
+ /**
+ * 공유사물함 대여를 합니다.
+ *
+ * @param userId 대여하려는 일반 user id
+ * @param cabinetId 대여하려는 cabinet id
+ */
+ void startLentShareCabinet(Long userId, Long cabinetId, String shareCode);
+
/**
* 동아리 사물함 대여를 합니다.
*
@@ -31,6 +39,13 @@ public interface LentService {
*/
void endLentCabinet(Long userId);
+ /**
+ * 공유사물함 대기열에서 취소합니다.
+ *
+ * @param userId - 취소하려는 user id
+ */
+ void cancelLentShareCabinet(Long userId, Long cabinetId);
+
/**
* 사물함을 강제 반납 합니다. 유저가 벤이 되진 않습니다
*
@@ -53,10 +68,26 @@ public interface LentService {
*/
void assignLent(Long userId, Long cabinetId);
+ /**
+ * Redis에 저장된 대여 정보를 DB에 저장하고 Redis에서 삭제합니다.
+ *
+ * @param cabinetIdString Redis에 저장된 대여 정보의 키
+ */
+ void handleLentFromRedisExpired(String cabinetIdString);
+
/**
* 현재 대여중인 모든 사물함의 대여기록을 가져옵니다.
*
* @return {@link ActiveLentHistoryDto}의 {@link List}
*/
List getAllActiveLentHistories();
+
+ /**
+ * 현재 대여중인 사물함의 모든 대여기록을 가져온 후, expiredAt을 갱신시키고, user 의 is_extensible 을 false 한다 userId로,
+ * cabinet 을 조회하고, cabinetId로 LentHistory를 조회한다. LentHistory의 expiredAt을 user의 isExtensible로
+ * 갱신한다.
+ *
+ * @param userId
+ */
+
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentServiceImpl.java
index 9dcd7d516..fe561b4ee 100644
--- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentServiceImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentServiceImpl.java
@@ -1,23 +1,22 @@
package org.ftclub.cabinet.lent.service;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
-import javax.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
+import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
+import org.ftclub.cabinet.cabinet.domain.LentType;
import org.ftclub.cabinet.cabinet.repository.CabinetOptionalFetcher;
+import org.ftclub.cabinet.config.CabinetProperties;
import org.ftclub.cabinet.dto.ActiveLentHistoryDto;
-import org.ftclub.cabinet.exception.CustomExceptionStatus;
-import org.ftclub.cabinet.exception.CustomServiceException;
-import org.ftclub.cabinet.exception.ExceptionStatus;
-import org.ftclub.cabinet.exception.ServiceException;
import org.ftclub.cabinet.lent.domain.LentHistory;
import org.ftclub.cabinet.lent.domain.LentPolicy;
-import org.ftclub.cabinet.lent.domain.LentPolicyStatus;
import org.ftclub.cabinet.lent.repository.LentOptionalFetcher;
+import org.ftclub.cabinet.lent.repository.LentRedis;
import org.ftclub.cabinet.lent.repository.LentRepository;
import org.ftclub.cabinet.mapper.LentMapper;
import org.ftclub.cabinet.user.domain.BanHistory;
@@ -26,6 +25,7 @@
import org.ftclub.cabinet.user.repository.UserOptionalFetcher;
import org.ftclub.cabinet.user.service.UserService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
@@ -41,6 +41,9 @@ public class LentServiceImpl implements LentService {
private final UserService userService;
private final BanHistoryRepository banHistoryRepository;
private final LentMapper lentMapper;
+ private final LentRedis lentRedis;
+ private final CabinetProperties cabinetProperties;
+
@Override
public void startLentCabinet(Long userId, Long cabinetId) {
@@ -52,38 +55,66 @@ public void startLentCabinet(Long userId, Long cabinetId) {
List userActiveBanList = banHistoryRepository.findUserActiveBanList(userId,
now);
// 대여 가능한 유저인지 확인
- LentPolicyStatus userPolicyStatus = lentPolicy.verifyUserForLent(user, cabinet,
- userActiveLentCount, userActiveBanList);
- handlePolicyStatus(userPolicyStatus,
- userActiveBanList); // UserPolicyStatus 와 LentPolicyStatus 가 분리해야 하지않는가? 23/8/15
- List cabinetActiveLentHistories = lentRepository.findAllActiveLentByCabinetId(
- cabinetId);
-
+ lentPolicy.handlePolicyStatus(
+ lentPolicy.verifyUserForLent(user, cabinet, userActiveLentCount, userActiveBanList),
+ userActiveBanList);
// 대여 가능한 캐비넷인지 확인
- LentPolicyStatus cabinetPolicyStatus = lentPolicy.verifyCabinetForLent(cabinet,
- cabinetActiveLentHistories,
- now);
- handlePolicyStatus(cabinetPolicyStatus,
- userActiveBanList); // UserPolicyStatus 와 LentPolicyStatus 가 분리해야 하지않는가? 23/8/15
-
+ lentPolicy.handlePolicyStatus(lentPolicy.verifyCabinetForLent(cabinet), userActiveBanList);
// 캐비넷 상태 변경
- cabinet.specifyStatusByUserCount(cabinetActiveLentHistories.size() + 1);
- LocalDateTime expiredAt = lentPolicy.generateExpirationDate(now, cabinet,
- cabinetActiveLentHistories);
+ cabinet.specifyStatus(CabinetStatus.FULL);
+ // 만료 시간 적용
+ LocalDateTime expiredAt = lentPolicy.generateExpirationDate(now, cabinet);
LentHistory lentHistory = LentHistory.of(now, expiredAt, userId, cabinetId);
-
- // 연체 시간 적용
- lentPolicy.applyExpirationDate(lentHistory, cabinetActiveLentHistories, expiredAt);
+ lentPolicy.applyExpirationDate(lentHistory, expiredAt);
lentRepository.save(lentHistory);
}
+ @Override
+ public void startLentShareCabinet(Long userId, Long cabinetId, String shareCode) {
+ log.info("Called startLentShareCabinet: {}, {}, {}", userId, cabinetId, shareCode);
+ LocalDateTime now = LocalDateTime.now();
+ Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(cabinetId);
+ User user = userOptionalFetcher.getUser(userId);
+ int userActiveLentCount = lentRepository.countUserActiveLent(userId);
+ List userActiveBanList = banHistoryRepository.findUserActiveBanList(userId,
+ now);
+ // 대여 가능한 유저인지 확인
+ lentPolicy.handlePolicyStatus(
+ lentPolicy.verifyUserForLentShare(user, cabinet, userActiveLentCount,
+ userActiveBanList), userActiveBanList);
+ boolean hasShadowKey = lentRedis.isShadowKey(cabinetId);
+ if (!hasShadowKey) {// 최초 대여인 경우
+ lentPolicy.handlePolicyStatus(lentPolicy.verifyCabinetForLent(cabinet),
+ userActiveBanList);
+ cabinet.specifyStatus(CabinetStatus.IN_SESSION);
+ lentRedis.setShadowKey(cabinetId);
+ }
+ lentRedis.saveUserInRedis(cabinetId.toString(), userId.toString(), shareCode,
+ hasShadowKey);
+ // 4번째 (마지막) 대여자인 경우
+ if (Objects.equals(lentRedis.getSizeOfUsersInSession(cabinetId.toString()),
+ cabinetProperties.getShareMaxUserCount())) {
+ cabinet.specifyStatus(CabinetStatus.FULL);
+ saveLentHistories(now, cabinetId);
+ // cabinetId에 대한 shadowKey, valueKey 삭제
+ lentRedis.deleteShadowKey(cabinetId);
+// lentRedis.deleteUserIdInRedis(cabinetId);
+ ArrayList userIds = lentRedis.getUserIdsByCabinetIdInRedis(
+ cabinetId.toString());
+ for (String id : userIds) {
+ lentRedis.deleteUserIdInRedis(Long.valueOf(id));
+ }
+ lentRedis.deleteCabinetIdInRedis(cabinetId.toString());
+ }
+ }
+
@Override
public void startLentClubCabinet(Long userId, Long cabinetId) {
log.debug("Called startLentClubCabinet: {}, {}", userId, cabinetId);
Cabinet cabinet = cabinetOptionalFetcher.getClubCabinet(cabinetId);
lentOptionalFetcher.checkExistedSpace(cabinetId);
LocalDateTime expirationDate = lentPolicy.generateExpirationDate(LocalDateTime.now(),
- cabinet, null);
+ cabinet);
LentHistory result =
LentHistory.of(LocalDateTime.now(), expirationDate, userId, cabinetId);
lentRepository.save(result);
@@ -93,11 +124,33 @@ public void startLentClubCabinet(Long userId, Long cabinetId) {
@Override
public void endLentCabinet(Long userId) {
log.debug("Called endLentCabinet: {}", userId);
+ List allActiveLentHistoriesByUserId = lentRepository.findAllActiveLentHistoriesByUserId(
+ userId);
LentHistory lentHistory = returnCabinetByUserId(userId);
Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(lentHistory.getCabinetId());
// cabinetType도 인자로 전달하면 좋을 거 같습니다 (공유사물함 3일이내 반납 페널티)
userService.banUser(userId, cabinet.getLentType(), lentHistory.getStartedAt(),
lentHistory.getEndedAt(), lentHistory.getExpiredAt());
+ // 공유 사물함 반납 시 남은 대여일 수 차감 (원래 남은 대여일 수 * (남은 인원 / 원래 있던 인원))
+ if (cabinet.getLentType().equals(LentType.SHARE)) {
+ Double usersInShareCabinet = lentRepository.countCabinetAllActiveLent(
+ cabinet.getCabinetId()).doubleValue();
+ Double daysUntilExpiration =
+ lentHistory.getDaysUntilExpiration(LocalDateTime.now()).doubleValue() * -1.0;
+ Double secondsRemaining =
+ daysUntilExpiration * (usersInShareCabinet / (usersInShareCabinet + 1.0) * 24.0
+ * 60.0 * 60.0);
+ LocalDateTime expiredAt = LocalDateTime.now().plusSeconds(
+ secondsRemaining.longValue())
+ .withHour(23)
+ .withMinute(59)
+ .withSecond(0); // 23:59:59
+ allActiveLentHistoriesByUserId.forEach(e -> {
+ e.setExpiredAt(expiredAt);
+ });
+ }
+ lentRedis.setPreviousUser(cabinet.getCabinetId().toString(),
+ lentHistory.getUser().getName());
}
@Override
@@ -112,6 +165,18 @@ public void terminateLentByCabinetId(Long cabinetId) {
returnCabinetByCabinetId(cabinetId);
}
+ @Override
+ public void cancelLentShareCabinet(Long userId, Long cabinetId) {
+ log.debug("Called cancelLentShareCabinet: {}, {}", userId, cabinetId);
+ lentRedis.deleteUserInRedis(cabinetId.toString(), userId.toString());
+ // 유저가 나갔을 때, 해당 키에 다른 유저가 없다면 전체 키 삭제
+ if (lentRedis.getSizeOfUsersInSession(cabinetId.toString()) == 0) {
+ lentRedis.deleteShadowKey(cabinetId);
+ Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(cabinetId);
+ cabinet.specifyStatus(CabinetStatus.AVAILABLE);
+ }
+ }
+
// cabinetId로 return하는 경우에서, 공유 사물함과 개인 사물함의 경우에 대한 분기가 되어 있지 않음.
// 또한 어드민의 경우에서 사용하는 returnByCabinetId와 유저가 사용하는 returnByCabinetId가 다른 상황이므로
// (어드민의 경우에는 뭐든지 전체 반납, 유저가 사용하는 경우에는 본인이 사용하는 사물함에 대한 반납)
@@ -121,31 +186,31 @@ private List returnCabinetByCabinetId(Long cabinetId) {
log.debug("Called returnCabinetByCabinetId: {}", cabinetId);
Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(cabinetId);
List lentHistories = lentOptionalFetcher.findAllActiveLentByCabinetId(
- cabinetId);
+ cabinetId); // todo : 현재 returnCabinetByCabinetId는 개인사물함 반납에 대해서만 사용되고 있기 때문에 lentHistory에 대한 list로 받을 필요가 없음 - 추후 추가 확인 후 로직 수정 필요
lentHistories.forEach(lentHistory -> lentHistory.endLent(LocalDateTime.now()));
- userService.banUser(lentHistories.get(0).getUserId(), cabinet.getLentType(),
- lentHistories.get(0).getStartedAt(),
- lentHistories.get(0).getEndedAt(), lentHistories.get(0).getExpiredAt());
cabinet.specifyStatusByUserCount(0); // policy로 빼는게..?
+// log.info("cabinet status {}",cabinet.getStatus());
cabinet.writeMemo("");
cabinet.writeTitle("");
+ lentRedis.setPreviousUser(cabinet.getCabinetId().toString(),
+ lentHistories.get(0).getUser().getName());
return lentHistories;
}
private LentHistory returnCabinetByUserId(Long userId) {
log.debug("Called returnCabinet: {}", userId);
- userOptionalFetcher.getUser(userId);
- LentHistory lentHistory = lentOptionalFetcher.getActiveLentHistoryWithUserId(userId);
+ LentHistory lentHistory = lentOptionalFetcher.getActiveLentHistoryWithUserIdForUpdate(
+ userId);
Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(lentHistory.getCabinetId());
int activeLentCount = lentRepository.countCabinetActiveLent(lentHistory.getCabinetId());
lentHistory.endLent(LocalDateTime.now());
- userService.banUser(userId, cabinet.getLentType(), lentHistory.getStartedAt(),
- lentHistory.getEndedAt(), lentHistory.getExpiredAt());
cabinet.specifyStatusByUserCount(activeLentCount - 1); // policy로 빠질만한 부분인듯?
if (activeLentCount - 1 == 0) {
cabinet.writeMemo("");
cabinet.writeTitle("");
}
+ lentRedis.setPreviousUser(cabinet.getCabinetId().toString(),
+ lentHistory.getUser().getName());
return lentHistory;
}
@@ -156,12 +221,33 @@ public void assignLent(Long userId, Long cabinetId) {
Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(cabinetId);
lentOptionalFetcher.checkExistedSpace(cabinetId);
LocalDateTime expirationDate = lentPolicy.generateExpirationDate(LocalDateTime.now(),
- cabinet, null);
+ cabinet);
LentHistory result = LentHistory.of(LocalDateTime.now(), expirationDate, userId, cabinetId);
cabinet.specifyStatusByUserCount(1);
lentRepository.save(result);
}
+ @Override
+ public void handleLentFromRedisExpired(String cabinetIdString) {
+ Long cabinetId = Long.parseLong(cabinetIdString);
+ Cabinet cabinet = cabinetOptionalFetcher.getCabinetForUpdate(cabinetId);
+ Long userCount = lentRedis.getSizeOfUsersInSession(cabinetId.toString());
+ if (cabinetProperties.getShareMinUserCount() <= userCount
+ && userCount <= cabinetProperties.getShareMaxUserCount()) { // 2명 이상 4명 이하: 대여 성공
+ LocalDateTime now = LocalDateTime.now();
+ cabinet.specifyStatus(CabinetStatus.FULL);
+ saveLentHistories(now, cabinetId);
+ } else {
+ cabinet.specifyStatus(CabinetStatus.AVAILABLE);
+ }
+ ArrayList userIds = lentRedis.getUserIdsByCabinetIdInRedis(
+ cabinetId.toString());
+ for (String userId : userIds) {
+ lentRedis.deleteUserIdInRedis(Long.valueOf(userId));
+ }
+ lentRedis.deleteCabinetIdInRedis(cabinetId.toString());
+ }
+
@Override
public List getAllActiveLentHistories() {
log.debug("Called getAllActiveLentHistories");
@@ -177,55 +263,18 @@ public List getAllActiveLentHistories() {
.collect(Collectors.toList());
}
- /**
- * 정책에 대한 결과 상태({@link LentPolicyStatus})에 맞는 적절한 {@link ServiceException}을 throw합니다.
- *
- * @param status 정책에 대한 결과 상태
- * @throws ServiceException 정책에 따라 다양한 exception이 throw될 수 있습니다.
- */
- private void handlePolicyStatus(LentPolicyStatus status, List banHistory) {
- log.info("Called handlePolicyStatus status: {}", status);
- switch (status) {
- case FINE:
- break;
- case BROKEN_CABINET:
- throw new ServiceException(ExceptionStatus.LENT_BROKEN);
- case FULL_CABINET:
- throw new ServiceException(ExceptionStatus.LENT_FULL);
- case OVERDUE_CABINET:
- throw new ServiceException(ExceptionStatus.LENT_EXPIRED);
- case LENT_CLUB:
- throw new ServiceException(ExceptionStatus.LENT_CLUB);
- case IMMINENT_EXPIRATION:
- throw new ServiceException(ExceptionStatus.LENT_EXPIRE_IMMINENT);
- case ALREADY_LENT_USER:
- throw new ServiceException(ExceptionStatus.LENT_ALREADY_EXISTED);
- case ALL_BANNED_USER:
- case SHARE_BANNED_USER:
- handleBannedUserResponse(status, banHistory.get(0));
- case BLACKHOLED_USER:
- throw new ServiceException(ExceptionStatus.BLACKHOLED_USER);
- case NOT_USER:
- case INTERNAL_ERROR:
- default:
- throw new ServiceException(ExceptionStatus.INTERNAL_SERVER_ERROR);
- }
- }
-
- private void handleBannedUserResponse(LentPolicyStatus status, BanHistory banHistory) {
- log.info("Called handleBannedUserResponse: {}", status);
-
- LocalDateTime unbannedAt = banHistory.getUnbannedAt();
- String unbannedTimeString = unbannedAt.format(
- DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-
- if (status.equals(LentPolicyStatus.ALL_BANNED_USER)) {
- throw new CustomServiceException(
- new CustomExceptionStatus(ExceptionStatus.ALL_BANNED_USER, unbannedTimeString));
- } else if (status.equals(LentPolicyStatus.SHARE_BANNED_USER)) {
- throw new CustomServiceException(
- new CustomExceptionStatus(ExceptionStatus.SHARE_BANNED_USER,
- unbannedTimeString));
- }
+ public void saveLentHistories(LocalDateTime now, Long cabinetId) {
+ ArrayList userIdList = lentRedis.getUserIdsByCabinetIdInRedis(
+ cabinetId.toString());
+ LocalDateTime expiredAt = lentPolicy.generateSharedCabinetExpirationDate(now,
+ userIdList.size());
+ // userId 반복문 돌면서 수행
+ userIdList.stream()
+ .map(userId -> LentHistory.of(now, expiredAt, Long.parseLong(userId), cabinetId))
+ .forEach(lentHistory -> {
+ lentPolicy.applyExpirationDate(lentHistory, expiredAt);
+ lentRepository.save(lentHistory);
+ });
}
}
+
diff --git a/backend/src/main/java/org/ftclub/cabinet/mapper/CabinetMapper.java b/backend/src/main/java/org/ftclub/cabinet/mapper/CabinetMapper.java
index 583402267..afb039b2a 100644
--- a/backend/src/main/java/org/ftclub/cabinet/mapper/CabinetMapper.java
+++ b/backend/src/main/java/org/ftclub/cabinet/mapper/CabinetMapper.java
@@ -1,7 +1,26 @@
package org.ftclub.cabinet.mapper;
+import static org.mapstruct.NullValueMappingStrategy.RETURN_DEFAULT;
+
+import java.time.LocalDateTime;
+import java.util.List;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
-import org.ftclub.cabinet.dto.*;
+import org.ftclub.cabinet.dto.ActiveCabinetInfoDto;
+import org.ftclub.cabinet.dto.ActiveCabinetInfoEntities;
+import org.ftclub.cabinet.dto.BuildingFloorsDto;
+import org.ftclub.cabinet.dto.CabinetDto;
+import org.ftclub.cabinet.dto.CabinetInfoResponseDto;
+import org.ftclub.cabinet.dto.CabinetPaginationDto;
+import org.ftclub.cabinet.dto.CabinetPreviewDto;
+import org.ftclub.cabinet.dto.CabinetSimpleDto;
+import org.ftclub.cabinet.dto.CabinetsPerSectionResponseDto;
+import org.ftclub.cabinet.dto.LentDto;
+import org.ftclub.cabinet.dto.MyCabinetResponseDto;
+import org.ftclub.cabinet.dto.OverdueUserCabinetDto;
+import org.ftclub.cabinet.dto.OverdueUserCabinetPaginationDto;
+import org.ftclub.cabinet.dto.UserBlockedInfoDto;
+import org.ftclub.cabinet.dto.UserCabinetDto;
+import org.ftclub.cabinet.dto.UserCabinetPaginationDto;
import org.ftclub.cabinet.lent.domain.LentHistory;
import org.ftclub.cabinet.user.domain.User;
import org.mapstruct.Mapper;
@@ -9,10 +28,6 @@
import org.mapstruct.factory.Mappers;
import org.springframework.stereotype.Component;
-import java.util.List;
-
-import static org.mapstruct.NullValueMappingStrategy.RETURN_DEFAULT;
-
//@NullableMapper
@Mapper(componentModel = "spring",
nullValueMappingStrategy = RETURN_DEFAULT,
@@ -31,7 +46,7 @@ public interface CabinetMapper {
@Mapping(target = "cabinetId", source = "lentHistory.cabinetId")
@Mapping(target = "location", source = "cabinet.cabinetPlace.location")
OverdueUserCabinetDto toOverdueUserCabinetDto(LentHistory lentHistory, User user,
- Cabinet cabinet, Long overdueDays);
+ Cabinet cabinet, Long overdueDays);
UserCabinetDto toUserCabinetDto(UserBlockedInfoDto userInfo, CabinetDto cabinetInfo);
@@ -41,34 +56,39 @@ OverdueUserCabinetDto toOverdueUserCabinetDto(LentHistory lentHistory, User user
@Mapping(target = "cabinetId", source = "lentHistory.cabinetId")
@Mapping(target = "userId", source = "lentHistory.userId")
@Mapping(target = "location", source = "cabinet.cabinetPlace.location")
- ActiveCabinetInfoDto toActiveCabinetInfoDto(Cabinet cabinet, LentHistory lentHistory, User user);
+ ActiveCabinetInfoDto toActiveCabinetInfoDto(Cabinet cabinet, LentHistory lentHistory,
+ User user);
@Mapping(target = "cabinet", source = "cabinet")
@Mapping(target = "lentHistory", source = "lentHistory")
@Mapping(target = "user", source = "user")
- ActiveCabinetInfoEntities toActiveCabinetInfoEntitiesDto(Cabinet cabinet, LentHistory lentHistory, User user);
+ ActiveCabinetInfoEntities toActiveCabinetInfoEntitiesDto(Cabinet cabinet,
+ LentHistory lentHistory, User user);
/*--------------------------------Wrapped DTO--------------------------------*/
//TO do : cabinetPlace러 바꾸기
CabinetsPerSectionResponseDto toCabinetsPerSectionResponseDto(String section,
- List cabinets);
+ List cabinets);
@Mapping(target = "location", source = "cabinet.cabinetPlace.location")
- CabinetInfoResponseDto toCabinetInfoResponseDto(Cabinet cabinet, List lents);
+ CabinetInfoResponseDto toCabinetInfoResponseDto(Cabinet cabinet, List lents,
+ LocalDateTime sessionExpiredAt);
@Mapping(target = "totalLength", source = "totalLength")
CabinetPaginationDto toCabinetPaginationDtoList(List result,
- Long totalLength);
+ Long totalLength);
OverdueUserCabinetPaginationDto toOverdueUserCabinetPaginationDto(
List result, Long totalLength);
UserCabinetPaginationDto toUserCabinetPaginationDto(List result,
- Long totalLength);
+ Long totalLength);
@Mapping(target = "location", source = "cabinet.cabinetPlace.location")
- MyCabinetResponseDto toMyCabinetResponseDto(Cabinet cabinet, List lents);
+ @Mapping(target = "shareCode", source = "sessionShareCode")
+ MyCabinetResponseDto toMyCabinetResponseDto(Cabinet cabinet, List lents,
+ String sessionShareCode, LocalDateTime sessionExpiredAt, String previousUserName);
CabinetPreviewDto toCabinetPreviewDto(Cabinet cabinet, Integer userCount, String name);
diff --git a/backend/src/main/java/org/ftclub/cabinet/occupiedtime/UserMonthDataDto.java b/backend/src/main/java/org/ftclub/cabinet/occupiedtime/UserMonthDataDto.java
new file mode 100644
index 000000000..eac8bdd19
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/occupiedtime/UserMonthDataDto.java
@@ -0,0 +1,16 @@
+package org.ftclub.cabinet.occupiedtime;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class UserMonthDataDto {
+
+ private int id;
+ private String login;
+ private int monthAccumationTime;
+
+ // Getters and setters
+}
+
diff --git a/backend/src/main/java/org/ftclub/cabinet/redis/ExpirationListener.java b/backend/src/main/java/org/ftclub/cabinet/redis/ExpirationListener.java
new file mode 100644
index 000000000..77ba3f2a1
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/redis/ExpirationListener.java
@@ -0,0 +1,44 @@
+package org.ftclub.cabinet.redis;
+
+import lombok.extern.log4j.Log4j2;
+import org.ftclub.cabinet.lent.service.LentServiceImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.stereotype.Component;
+
+
+@Component
+@Log4j2
+public class ExpirationListener extends KeyExpirationEventMessageListener {
+
+ private final LentServiceImpl lentServiceImpl;
+
+ /**
+ * Creates new {@link MessageListener} for {@code __keyevent@*__:expired} messages.
+ *
+ * @param listenerContainer must not be {@literal null}.
+ * @param lentServiceImpl must not be {@literal null}.
+ */
+ public ExpirationListener(
+ @Qualifier("redisMessageListenerContainer")
+ RedisMessageListenerContainer listenerContainer,
+ LentServiceImpl lentServiceImpl) {
+ super(listenerContainer);
+ this.lentServiceImpl = lentServiceImpl;
+ }
+
+ /**
+ * @param message redis key
+ * @param pattern __keyevent@*__:expired
+ */
+ @Override
+ public void onMessage(Message message, byte[] pattern) {
+ log.debug("Called onMessage: {}, {}", message.toString(), pattern);
+ String cabinetIdString = message.toString().split(":")[0];
+ log.debug("cabinetIdWithSuffix: {}", cabinetIdString);
+ lentServiceImpl.handleLentFromRedisExpired(cabinetIdString);
+ }
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/redis/config/RedisConfig.java b/backend/src/main/java/org/ftclub/cabinet/redis/config/RedisConfig.java
deleted file mode 100644
index b8515cff2..000000000
--- a/backend/src/main/java/org/ftclub/cabinet/redis/config/RedisConfig.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.ftclub.cabinet.redis.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-@Configuration
-public class RedisConfig {
-
- @Value("${spring.redis.host}")
- private String redisHost;
-
- @Value("${spring.redis.port}")
- private int redisPort;
-
- @Bean
- public RedisConnectionFactory redisConnectionFactory() {
- return new LettuceConnectionFactory(redisHost, redisPort);
- }
-
- @Bean
- public RedisTemplate redisTemplate() {
- RedisTemplate redisTemplate = new RedisTemplate<>();
- redisTemplate.setConnectionFactory(redisConnectionFactory());
-
- redisTemplate.setKeySerializer(new StringRedisSerializer());
- redisTemplate.setValueSerializer(new StringRedisSerializer());
-
- return redisTemplate;
- }
-}
diff --git a/backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionServiceImpl.java b/backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionServiceImpl.java
index b69fb652d..87b990400 100644
--- a/backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionServiceImpl.java
+++ b/backend/src/main/java/org/ftclub/cabinet/user/service/LentExtensionServiceImpl.java
@@ -50,6 +50,7 @@ public void issueLentExtension() {
});
}
+
@Override
public void assignLentExtension(String username) {
log.debug("Called assignLentExtension {}", username);
diff --git a/backend/src/main/java/org/ftclub/cabinet/user/service/UserService.java b/backend/src/main/java/org/ftclub/cabinet/user/service/UserService.java
index f268d754b..4d688158b 100644
--- a/backend/src/main/java/org/ftclub/cabinet/user/service/UserService.java
+++ b/backend/src/main/java/org/ftclub/cabinet/user/service/UserService.java
@@ -4,6 +4,7 @@
import java.util.List;
import org.ftclub.cabinet.cabinet.domain.LentType;
import org.ftclub.cabinet.dto.UserBlackholeInfoDto;
+import org.ftclub.cabinet.occupiedtime.UserMonthDataDto;
import org.ftclub.cabinet.user.domain.AdminRole;
import org.ftclub.cabinet.user.domain.UserRole;
diff --git a/backend/src/main/java/org/ftclub/cabinet/utils/DateUtil.java b/backend/src/main/java/org/ftclub/cabinet/utils/DateUtil.java
index 3362b8d7d..be8605e38 100644
--- a/backend/src/main/java/org/ftclub/cabinet/utils/DateUtil.java
+++ b/backend/src/main/java/org/ftclub/cabinet/utils/DateUtil.java
@@ -117,10 +117,11 @@ public static boolean isSameDay(LocalDateTime now) {
/**
* now 가 서버의 현재 시간보다 과거인지 확입합니다.
+ *
* @param now
* @return
*/
- public static boolean isPast(LocalDateTime now){
+ public static boolean isPast(LocalDateTime now) {
LocalDate currentServerDate = LocalDate.now();
return currentServerDate.isAfter(now.toLocalDate());
}
@@ -134,6 +135,7 @@ public static boolean isPast(LocalDateTime now){
*/
public static Long calculateTwoDateDiffCeil(LocalDateTime day1, LocalDateTime day2) {
long diffInMillis = Duration.between(day1, day2).toMillis();
+ System.out.println("diffInMillis = " + diffInMillis);
return (long) Math.ceil(diffInMillis / 1000.0 / 60 / 60 / 24);
}
}
\ No newline at end of file
diff --git a/backend/src/main/java/org/ftclub/cabinet/utils/annotations/ComplexRepository.java b/backend/src/main/java/org/ftclub/cabinet/utils/annotations/ComplexRepository.java
index 81a7f1f03..96bf4cb70 100644
--- a/backend/src/main/java/org/ftclub/cabinet/utils/annotations/ComplexRepository.java
+++ b/backend/src/main/java/org/ftclub/cabinet/utils/annotations/ComplexRepository.java
@@ -4,9 +4,11 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.springframework.stereotype.Repository;
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
+@Repository
public @interface ComplexRepository {
Class[] entityClass() default Object[].class;
}
diff --git a/backend/src/main/java/org/ftclub/cabinet/utils/release/ReleaseManager.java b/backend/src/main/java/org/ftclub/cabinet/utils/release/ReleaseManager.java
new file mode 100644
index 000000000..9d3081d98
--- /dev/null
+++ b/backend/src/main/java/org/ftclub/cabinet/utils/release/ReleaseManager.java
@@ -0,0 +1,43 @@
+package org.ftclub.cabinet.utils.release;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.ftclub.cabinet.cabinet.domain.Cabinet;
+import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
+import org.ftclub.cabinet.cabinet.repository.CabinetOptionalFetcher;
+import org.ftclub.cabinet.cabinet.service.CabinetService;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Log4j2
+public class ReleaseManager {
+
+ private final CabinetOptionalFetcher cabinetOptionalFetcher;
+ private final CabinetService cabinetService;
+
+ private List getAllPendedYesterdayCabinet() {
+ return cabinetOptionalFetcher.findAllPendingCabinetsByCabinetStatusAndBeforeEndedAt(
+ CabinetStatus.PENDING, LocalDateTime.from(
+ LocalDate.now().atStartOfDay()));
+ }
+
+ private void releaseCabinets(List cabinets) {
+ for (Cabinet cabinet : cabinets) {
+ releaseCabinet(cabinet);
+ }
+ }
+
+ private void releaseCabinet(Cabinet cabinet) {
+ cabinetService.updateStatus(cabinet.getCabinetId(), CabinetStatus.AVAILABLE);
+ }
+
+
+ public void releasingCabinets() {
+ List cabinets = getAllPendedYesterdayCabinet();
+ releaseCabinets(cabinets);
+ }
+}
diff --git a/backend/src/main/java/org/ftclub/cabinet/utils/scheduler/SystemScheduler.java b/backend/src/main/java/org/ftclub/cabinet/utils/scheduler/SystemScheduler.java
index 7a49c5d3e..9334889c5 100644
--- a/backend/src/main/java/org/ftclub/cabinet/utils/scheduler/SystemScheduler.java
+++ b/backend/src/main/java/org/ftclub/cabinet/utils/scheduler/SystemScheduler.java
@@ -1,15 +1,18 @@
package org.ftclub.cabinet.utils.scheduler;
+import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.ftclub.cabinet.dto.ActiveLentHistoryDto;
import org.ftclub.cabinet.dto.UserBlackholeInfoDto;
import org.ftclub.cabinet.lent.service.LentService;
+import org.ftclub.cabinet.occupiedtime.OccupiedTimeManager;
import org.ftclub.cabinet.user.service.UserService;
import org.ftclub.cabinet.utils.blackhole.manager.BlackholeManager;
import org.ftclub.cabinet.utils.leave.absence.LeaveAbsenceManager;
import org.ftclub.cabinet.utils.overdue.manager.OverdueManager;
+import org.ftclub.cabinet.utils.release.ReleaseManager;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -28,6 +31,8 @@ public class SystemScheduler {
private final LentService lentService;
private final UserService userService;
private final BlackholeManager blackholeManager;
+ private final ReleaseManager releaseManager;
+ private final OccupiedTimeManager occupiedTimeManager;
private static final long DELAY_TIME = 2000;
@@ -82,4 +87,21 @@ public void checkNoRiskOfBlackhole() {
}
}
}
+
+ /**
+ * 매월 1일 01시 42분에 블랙홀에 빠질 위험이 없는 유저들의 블랙홀 처리를 트리거하는 메소드 2초 간격으로 블랙홀 검증
+ */
+ //현재 5분마다 도는 로직 0 */5 * * * *
+ @Scheduled(cron = "${spring.schedule.cron.cabinet-release-time}")
+ public void releasePendingCabinet() {
+ log.info("releasePendingCabinet {}", LocalDateTime.now());
+ releaseManager.releasingCabinets();
+ }
+
+// @Scheduled(cron = "${spring.schedule.cron.extensible-user-check}")
+// public void checkUserQualifyForExtensible(){
+// log.info("called checkUserQualifyForExtensible");
+// List userMonthDataDtos = occupiedTimeManager.metLimitTimeUser(occupiedTimeManager.getUserLastMonthOccupiedTime());
+// userService.updateUserExtensible(userMonthDataDtos);
+// }
}
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 2e00e6d9f..e603bbb55 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -4,7 +4,7 @@ server:
port: 4242
spring:
config:
- import: classpath:application-auth.yml, classpath:application-mail.yml
+ import: classpath:application-auth.yml, classpath:application-mail.yml, classpath:application-slack.yml
activate:
on-profile: prod
logging:
@@ -16,7 +16,7 @@ server:
port: 4242
spring:
config:
- import: classpath:application-auth.yml, classpath:application-mail.yml
+ import: classpath:application-auth.yml, classpath:application-mail.yml, classpath:application-slack.yml
activate:
on-profile: dev
logging:
@@ -28,7 +28,7 @@ server:
port: 2424
spring:
config:
- import: classpath:application-auth.yml, classpath:application-mail.yml
+ import: classpath:application-auth.yml, classpath:application-mail.yml, classpath:application-slack.yml
activate:
on-profile: local
logging:
diff --git a/backend/src/main/resources/log4j2-local.yml b/backend/src/main/resources/log4j2-local.yml
index 7f1087801..7d6979406 100644
--- a/backend/src/main/resources/log4j2-local.yml
+++ b/backend/src/main/resources/log4j2-local.yml
@@ -24,7 +24,7 @@ Configuration:
- ref: console
-
name: org.ftclub.cabinet
- level: info
+ level: debug
additivity: false
AppenderRef:
- ref: console
diff --git a/backend/src/test/java/org/ftclub/cabinet/cabinet/domain/CabinetStatusUnitTest.java b/backend/src/test/java/org/ftclub/cabinet/cabinet/domain/CabinetStatusUnitTest.java
index 07bd25d7c..88b2d22f5 100644
--- a/backend/src/test/java/org/ftclub/cabinet/cabinet/domain/CabinetStatusUnitTest.java
+++ b/backend/src/test/java/org/ftclub/cabinet/cabinet/domain/CabinetStatusUnitTest.java
@@ -18,11 +18,15 @@ public class CabinetStatusUnitTest {
CabinetStatus cabinetStatusBroken = CabinetStatus.BROKEN;
CabinetStatus cabinetStatusLimitedAvailable = CabinetStatus.LIMITED_AVAILABLE;
CabinetStatus cabinetStatusOverdue = CabinetStatus.OVERDUE;
+ CabinetStatus cabinetStatusPending = CabinetStatus.PENDING;
+ CabinetStatus cabinetStatusInSession = CabinetStatus.IN_SESSION;
assertTrue(cabinetStatusAvailable.isValid());
assertTrue(cabinetStatusFull.isValid());
assertTrue(cabinetStatusBroken.isValid());
assertTrue(cabinetStatusLimitedAvailable.isValid());
assertTrue(cabinetStatusOverdue.isValid());
+ assertTrue(cabinetStatusPending.isValid());
+ assertTrue(cabinetStatusInSession.isValid());
}
}
diff --git a/backend/src/test/java/org/ftclub/cabinet/lent/domain/LentPolicyUnitTest.java b/backend/src/test/java/org/ftclub/cabinet/lent/domain/LentPolicyUnitTest.java
index af5f95beb..08cf96667 100644
--- a/backend/src/test/java/org/ftclub/cabinet/lent/domain/LentPolicyUnitTest.java
+++ b/backend/src/test/java/org/ftclub/cabinet/lent/domain/LentPolicyUnitTest.java
@@ -1,482 +1,482 @@
-package org.ftclub.cabinet.lent.domain;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import org.ftclub.cabinet.cabinet.domain.Cabinet;
-import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
-import org.ftclub.cabinet.cabinet.domain.LentType;
-import org.ftclub.cabinet.config.CabinetProperties;
-import org.ftclub.cabinet.exception.DomainException;
-import org.ftclub.cabinet.user.domain.BanHistory;
-import org.ftclub.cabinet.user.domain.BanType;
-import org.ftclub.cabinet.user.domain.User;
-import org.ftclub.cabinet.user.domain.UserRole;
-import org.ftclub.cabinet.utils.DateUtil;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class LentPolicyUnitTest {
-
- @Mock
- CabinetProperties cabinetProperties = mock(CabinetProperties.class);
-
- @InjectMocks
- LentPolicyImpl lentPolicy;
-
- @Test
- @DisplayName("성공: 만료일자 설정 - 개인사물함")
- void 성공_개인사물함_generateExpirationDate() {
- LocalDateTime current = LocalDateTime.now();
- LocalDateTime expect = LocalDateTime.now().plusDays(21);
- given(cabinetProperties.getLentTermPrivate()).willReturn(21);
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getLentType()).willReturn(LentType.PRIVATE);
-
- LocalDateTime expirationDate = lentPolicy.generateExpirationDate(
- current,
- cabinet,
- null);
-
- assertEquals(expect.truncatedTo(ChronoUnit.SECONDS),
- expirationDate.truncatedTo(ChronoUnit.SECONDS));
- }
-
- @Test
- @DisplayName("실패: 대여시간이 과거")
- void 실패_대여시간과거_generateExpirationDate() {
- LocalDateTime past = LocalDateTime.now().minusDays(1);
-
- assertThrows(IllegalArgumentException.class,
- () -> lentPolicy.generateExpirationDate(past, null, null));
- }
-
- @Test
- @DisplayName("실패: 대여시간이 미래")
- void 실패_대여시간미래_generateExpirationDate() {
- LocalDateTime future = LocalDateTime.now().plusDays(1);
-
- assertThrows(IllegalArgumentException.class,
- () -> lentPolicy.generateExpirationDate(future, null, null));
- }
-
- @Test
- @DisplayName("성공: 만료시간무한 설정 - 공유사물함 최초 대여 - AVAILABLE")
- void 성공_공유사물함_최초_대여_generateExpirationDate() {
- List activeLentHistories = new ArrayList<>();
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getLentType()).willReturn(LentType.SHARE);
- LocalDateTime expiredDate = lentPolicy.generateExpirationDate(LocalDateTime.now(),
- cabinet, activeLentHistories);
-
- assertEquals(expiredDate, DateUtil.getInfinityDate());
- }
-
- @Test
- @DisplayName("성공: 기존만료일자 리턴 - 공유사물함 합류 - LIMITED_AVAILABLE")
- void 성공_공유사물함_합류_기존만료시간_존재_generateExpirationDate() {
- LocalDateTime currentDate = LocalDateTime.now();
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getLentType()).willReturn(LentType.SHARE);
- given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
-
- LentHistory activeLentHistory = mock(LentHistory.class);
- given(activeLentHistory.getExpiredAt()).willReturn(currentDate.plusDays(42));
- List lentHistoryList = new ArrayList<>();
- lentHistoryList.add(activeLentHistory);
-
- LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
- lentHistoryList);
-
- assertEquals(expirationDate, currentDate.plusDays(42));
- }
-
- @Test
- @DisplayName("성공: 기존만료일자 리턴 - 공유사물함 마지막 합류 - FULL")
- void 성공_공유사물함_만석_기존만료시간_존재_generateExpirationDate() {
- LocalDateTime currentDate = LocalDateTime.now();
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getLentType()).willReturn(LentType.SHARE);
- given(cabinet.getStatus()).willReturn(CabinetStatus.FULL);
-
- LentHistory activeLentHistories = mock(LentHistory.class);
- given(activeLentHistories.getExpiredAt()).willReturn(currentDate.plusDays(42));
- given(activeLentHistories.isSetExpiredAt()).willReturn(true);
- List mockLentHistorieList = new ArrayList<>();
- mockLentHistorieList.add(activeLentHistories);
-
- LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
- mockLentHistorieList);
-
- assertEquals(expirationDate, currentDate.plusDays(42));
- }
-
- @Test
- @DisplayName("성공: 만료일자 새로설정 - 공유사물함 마지막 합류 - FULL")
- void 성공_공유사물함_만석_기존만료시간_설정_generateExpirationDate() {
- LocalDateTime currentDate = LocalDateTime.now();
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getLentType()).willReturn(LentType.SHARE);
- given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
-
- LentHistory activeLentHistories = mock(LentHistory.class);
- List mockLentHistoriesList = new ArrayList<>();
- given(activeLentHistories.getExpiredAt()).willReturn(currentDate.plusDays(42));
- mockLentHistoriesList.add(activeLentHistories);
- LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
- mockLentHistoriesList);
-
- assertEquals(expirationDate, currentDate.plusDays(42));
- }
-
- @Test
- @DisplayName("성공: 만료일자 새로설정 - 동아리사물함")
- void 성공_동아리사물함_대여시간_설정_generateExpirationDate() {
- LocalDateTime currentDate = LocalDateTime.now();
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getLentType()).willReturn(LentType.CLUB);
-
- LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
- null);
-
- assertEquals(expirationDate, DateUtil.getInfinityDate());
- }
-
- @Test
- @DisplayName("성공: 만료일자 일괄 설정")
- void 성공_applyExpirationDate() {
- LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
- LocalDateTime tomorrow = LocalDateTime.now().plusDays(1);
-
- LentHistory curHistory = LentHistory.of(LocalDateTime.now(), yesterday, 993L, 9999L);
- LentHistory realHistory = LentHistory.of(LocalDateTime.now(), yesterday, 992L, 9999L);
- LentHistory trueHistory = LentHistory.of(LocalDateTime.now(), yesterday, 991L, 9999L);
-
- List beforeActiveHistories = new ArrayList<>();
- beforeActiveHistories.add(trueHistory);
- beforeActiveHistories.add(realHistory);
-
- lentPolicy.applyExpirationDate(curHistory, beforeActiveHistories, tomorrow);
-
- assertEquals(tomorrow, curHistory.getExpiredAt());
- assertEquals(tomorrow, realHistory.getExpiredAt());
- assertEquals(tomorrow, trueHistory.getExpiredAt());
- }
-
- @Test
- @DisplayName("실패: 만료일자 과거")
- void 실패_EXPIREDAT_IS_PAST_applyExpirationDate() {
- LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
-
- assertThrows(DomainException.class,
- () -> lentPolicy.applyExpirationDate(null, null, yesterday));
-
- }
-
- @Test
- @DisplayName("실패: 만료일자 null")
- void 실패_EXPIREDAT_IS_NULL_applyExpirationDate() {
-
- assertThrows(DomainException.class,
- () -> lentPolicy.applyExpirationDate(null, null, null));
- }
-
- @Test
- @DisplayName("실패: UserRole.User가 아닌 유저")
- void 실패_NO_ROLE_verifyUserForLent() {
- User user = mock(User.class);
-
- given(user.isUserRole(UserRole.USER)).willReturn(false);
- LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null, 0, null);
-
- assertEquals(LentPolicyStatus.NOT_USER, result);
- }
-
- @Test
- @DisplayName("실패: 기존 대여한 사물함이 존재하는 유저")
- void 실패_ALREADY_LENT_USER_verifyUserForLent() {
- int userActiveLentCount = 2;
- User user = mock(User.class);
- given(user.isUserRole(UserRole.USER)).willReturn(true);
-
- LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
- userActiveLentCount, null);
-
- assertEquals(LentPolicyStatus.ALREADY_LENT_USER, result);
- }
-
- /**
- * @See {@link LentPolicyImpl#verifyUserForLent(User, Cabinet, int, List)}
- *
- * 설계 상의 문제로 테스트 코드 비활성화 처리 해두었습니다.
- */
+//package org.ftclub.cabinet.lent.domain;
+//
+//import static org.junit.jupiter.api.Assertions.assertEquals;
+//import static org.junit.jupiter.api.Assertions.assertThrows;
+//import static org.mockito.BDDMockito.given;
+//import static org.mockito.Mockito.mock;
+//
+//import java.time.LocalDateTime;
+//import java.time.temporal.ChronoUnit;
+//import java.util.ArrayList;
+//import java.util.List;
+//import org.ftclub.cabinet.cabinet.domain.Cabinet;
+//import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
+//import org.ftclub.cabinet.cabinet.domain.LentType;
+//import org.ftclub.cabinet.config.CabinetProperties;
+//import org.ftclub.cabinet.exception.DomainException;
+//import org.ftclub.cabinet.user.domain.BanHistory;
+//import org.ftclub.cabinet.user.domain.BanType;
+//import org.ftclub.cabinet.user.domain.User;
+//import org.ftclub.cabinet.user.domain.UserRole;
+//import org.ftclub.cabinet.utils.DateUtil;
+//import org.junit.jupiter.api.Disabled;
+//import org.junit.jupiter.api.DisplayName;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
+//import org.mockito.InjectMocks;
+//import org.mockito.Mock;
+//import org.mockito.junit.jupiter.MockitoExtension;
+//
+//@ExtendWith(MockitoExtension.class)
+//@Disabled
+//class LentPolicyUnitTest {
+///*
+// @Mock
+// CabinetProperties cabinetProperties = mock(CabinetProperties.class);
+//
+// @InjectMocks
+// LentPolicyImpl lentPolicy;
+//
// @Test
-// @DisplayName("실패: 블랙홀 유저")
-// void 실패_BLACKHOLED_USER_verifyUserForLent() {
-// int userActiveLentCount = 0;
+// @DisplayName("성공: 만료일자 설정 - 개인사물함")
+// void 성공_개인사물함_generateExpirationDate() {
+// LocalDateTime current = LocalDateTime.now();
+// LocalDateTime expect = LocalDateTime.now().plusDays(21);
+// given(cabinetProperties.getLentTermPrivate()).willReturn(21);
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getLentType()).willReturn(LentType.PRIVATE);
+//
+// LocalDateTime expirationDate = lentPolicy.generateExpirationDate(
+// current,
+// cabinet,
+// null);
+//
+// assertEquals(expect.truncatedTo(ChronoUnit.SECONDS),
+// expirationDate.truncatedTo(ChronoUnit.SECONDS));
+// }
+//
+// @Test
+// @DisplayName("실패: 대여시간이 과거")
+// void 실패_대여시간과거_generateExpirationDate() {
+// LocalDateTime past = LocalDateTime.now().minusDays(1);
+//
+// assertThrows(IllegalArgumentException.class,
+// () -> lentPolicy.generateExpirationDate(past, null, null));
+// }
+//
+// @Test
+// @DisplayName("실패: 대여시간이 미래")
+// void 실패_대여시간미래_generateExpirationDate() {
+// LocalDateTime future = LocalDateTime.now().plusDays(1);
+//
+// assertThrows(IllegalArgumentException.class,
+// () -> lentPolicy.generateExpirationDate(future, null, null));
+// }
+//
+// @Test
+// @DisplayName("성공: 만료시간무한 설정 - 공유사물함 최초 대여 - AVAILABLE")
+// void 성공_공유사물함_최초_대여_generateExpirationDate() {
+// List activeLentHistories = new ArrayList<>();
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getLentType()).willReturn(LentType.SHARE);
+// LocalDateTime expiredDate = lentPolicy.generateExpirationDate(LocalDateTime.now(),
+// cabinet, activeLentHistories);
+//
+// assertEquals(expiredDate, DateUtil.getInfinityDate());
+// }
+//
+// @Test
+// @DisplayName("성공: 기존만료일자 리턴 - 공유사물함 합류 - LIMITED_AVAILABLE")
+// void 성공_공유사물함_합류_기존만료시간_존재_generateExpirationDate() {
+// LocalDateTime currentDate = LocalDateTime.now();
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getLentType()).willReturn(LentType.SHARE);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
+//
+// LentHistory activeLentHistory = mock(LentHistory.class);
+// given(activeLentHistory.getExpiredAt()).willReturn(currentDate.plusDays(42));
+// List lentHistoryList = new ArrayList<>();
+// lentHistoryList.add(activeLentHistory);
+//
+// LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
+// lentHistoryList);
+//
+// assertEquals(expirationDate, currentDate.plusDays(42));
+// }
+//
+// @Test
+// @DisplayName("성공: 기존만료일자 리턴 - 공유사물함 마지막 합류 - FULL")
+// void 성공_공유사물함_만석_기존만료시간_존재_generateExpirationDate() {
+// LocalDateTime currentDate = LocalDateTime.now();
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getLentType()).willReturn(LentType.SHARE);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.FULL);
+//
+// LentHistory activeLentHistories = mock(LentHistory.class);
+// given(activeLentHistories.getExpiredAt()).willReturn(currentDate.plusDays(42));
+// given(activeLentHistories.isSetExpiredAt()).willReturn(true);
+// List mockLentHistorieList = new ArrayList<>();
+// mockLentHistorieList.add(activeLentHistories);
+//
+// LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
+// mockLentHistorieList);
+//
+// assertEquals(expirationDate, currentDate.plusDays(42));
+// }
+//
+// @Test
+// @DisplayName("성공: 만료일자 새로설정 - 공유사물함 마지막 합류 - FULL")
+// void 성공_공유사물함_만석_기존만료시간_설정_generateExpirationDate() {
+// LocalDateTime currentDate = LocalDateTime.now();
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getLentType()).willReturn(LentType.SHARE);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
+//
+// LentHistory activeLentHistories = mock(LentHistory.class);
+// List mockLentHistoriesList = new ArrayList<>();
+// given(activeLentHistories.getExpiredAt()).willReturn(currentDate.plusDays(42));
+// mockLentHistoriesList.add(activeLentHistories);
+// LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
+// mockLentHistoriesList);
+//
+// assertEquals(expirationDate, currentDate.plusDays(42));
+// }
+//
+// @Test
+// @DisplayName("성공: 만료일자 새로설정 - 동아리사물함")
+// void 성공_동아리사물함_대여시간_설정_generateExpirationDate() {
+// LocalDateTime currentDate = LocalDateTime.now();
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getLentType()).willReturn(LentType.CLUB);
+//
+// LocalDateTime expirationDate = lentPolicy.generateExpirationDate(currentDate, cabinet,
+// null);
+//
+// assertEquals(expirationDate, DateUtil.getInfinityDate());
+// }
+//
+// @Test
+// @DisplayName("성공: 만료일자 일괄 설정")
+// void 성공_applyExpirationDate() {
+// LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
+// LocalDateTime tomorrow = LocalDateTime.now().plusDays(1);
+//
+// LentHistory curHistory = LentHistory.of(LocalDateTime.now(), yesterday, 993L, 9999L);
+// LentHistory realHistory = LentHistory.of(LocalDateTime.now(), yesterday, 992L, 9999L);
+// LentHistory trueHistory = LentHistory.of(LocalDateTime.now(), yesterday, 991L, 9999L);
+//
+// List beforeActiveHistories = new ArrayList<>();
+// beforeActiveHistories.add(trueHistory);
+// beforeActiveHistories.add(realHistory);
+//
+// lentPolicy.applyExpirationDate(curHistory, beforeActiveHistories, tomorrow);
+//
+// assertEquals(tomorrow, curHistory.getExpiredAt());
+// assertEquals(tomorrow, realHistory.getExpiredAt());
+// assertEquals(tomorrow, trueHistory.getExpiredAt());
+// }
+//
+// @Test
+// @DisplayName("실패: 만료일자 과거")
+// void 실패_EXPIREDAT_IS_PAST_applyExpirationDate() {
+// LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
+//
+// assertThrows(DomainException.class,
+// () -> lentPolicy.applyExpirationDate(null, null, yesterday));
+//
+// }
+//
+// @Test
+// @DisplayName("실패: 만료일자 null")
+// void 실패_EXPIREDAT_IS_NULL_applyExpirationDate() {
+//
+// assertThrows(DomainException.class,
+// () -> lentPolicy.applyExpirationDate(null, null, null));
+// }
+//
+// @Test
+// @DisplayName("실패: UserRole.User가 아닌 유저")
+// void 실패_NO_ROLE_verifyUserForLent() {
+// User user = mock(User.class);
+//
+// given(user.isUserRole(UserRole.USER)).willReturn(false);
+// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null, 0, null);
+//
+// assertEquals(LentPolicyStatus.NOT_USER, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 기존 대여한 사물함이 존재하는 유저")
+// void 실패_ALREADY_LENT_USER_verifyUserForLent() {
+// int userActiveLentCount = 2;
// User user = mock(User.class);
// given(user.isUserRole(UserRole.USER)).willReturn(true);
-// given(user.getBlackholedAt()).willReturn(LocalDateTime.now());
//
// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
// userActiveLentCount, null);
//
-// assertEquals(LentPolicyStatus.BLACKHOLED_USER, result);
+// assertEquals(LentPolicyStatus.ALREADY_LENT_USER, result);
// }
-
- @Test
- @DisplayName("실패: ALL BAN 유저")
- void 실패_ALL_BANNED_USER_verifyUserForLent() {
- int userActiveLentCount = 0;
- User user = mock(User.class);
- given(user.isUserRole(UserRole.USER)).willReturn(true);
-
- BanHistory mockBanHistory = mock(BanHistory.class);
- given(mockBanHistory.getBanType()).willReturn(BanType.ALL);
- List mockBanHistoryList = new ArrayList<>();
- mockBanHistoryList.add(mockBanHistory);
-
- LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
- userActiveLentCount, mockBanHistoryList);
-
- assertEquals(LentPolicyStatus.ALL_BANNED_USER, result);
- }
-
- @Test
- @DisplayName("실패: 공유사물함 BAN된 유저")
- void 실패_SHARE_BANNED_USER_verifyUserForLent() {
- int userActiveLentCount = 0;
- User user = mock(User.class);
- given(user.isUserRole(UserRole.USER)).willReturn(true);
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
-
- BanHistory banHistory = mock(BanHistory.class);
- given(banHistory.getBanType()).willReturn(BanType.SHARE);
- List userActiveBanList = new ArrayList<>();
- userActiveBanList.add(banHistory);
-
- LentPolicyStatus result = lentPolicy.verifyUserForLent(user, cabinet,
- userActiveLentCount, userActiveBanList);
-
- assertEquals(LentPolicyStatus.SHARE_BANNED_USER, result);
- }
-
- @Test
- @DisplayName("성공: 공유사물함 BAN - 공유사물함 이외 대여")
- void 성공_SHAREBANNED_LENT_OTHER_verifyUserForLent() {
- int userActiveLentCount = 0;
- User user = mock(User.class);
- given(user.isUserRole(UserRole.USER)).willReturn(true);
-
- BanHistory banHistory = mock(BanHistory.class);
- given(banHistory.getBanType()).willReturn(BanType.SHARE);
- List userActiveBanList = new ArrayList<>();
- userActiveBanList.add(banHistory);
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.isLentType(LentType.SHARE)).willReturn(false);
-
- LentPolicyStatus result = lentPolicy.verifyUserForLent(user, cabinet,
- userActiveLentCount, userActiveBanList);
-
- assertEquals(LentPolicyStatus.FINE, result);
- }
-
-
- @Test
- @DisplayName("성공: 유저의 밴 기록 없음")
- void 성공_NO_BANHISTORY_verifyUserForLent() {
- int userActiveLentCount = 0;
- User user = mock(User.class);
- given(user.isUserRole(UserRole.USER)).willReturn(true);
-
- LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
- userActiveLentCount, null);
-
- assertEquals(LentPolicyStatus.FINE, result);
- }
-
- /**
- * @See {@link LentPolicyImpl#verifyUserForLent(User, Cabinet, int, List)}
- *
- * 설계 상의 문제로 테스트 코드 비활성화 처리 해두었습니다.
- */
+//
+// /**
+// * @See {@link LentPolicyImpl#verifyUserForLent(User, Cabinet, int, List)}
+// *
+// * 설계 상의 문제로 테스트 코드 비활성화 처리 해두었습니다.
+// */
+//// @Test
+//// @DisplayName("실패: 블랙홀 유저")
+//// void 실패_BLACKHOLED_USER_verifyUserForLent() {
+//// int userActiveLentCount = 0;
+//// User user = mock(User.class);
+//// given(user.isUserRole(UserRole.USER)).willReturn(true);
+//// given(user.getBlackholedAt()).willReturn(LocalDateTime.now());
+////
+//// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
+//// userActiveLentCount, null);
+////
+//// assertEquals(LentPolicyStatus.BLACKHOLED_USER, result);
+//// }
// @Test
-// @DisplayName("성공: 유저 미래 블랙홀 예정")
-// void 성공_BLACKHOLE_IS_FUTURE_verifyUserForLent() {
+// @DisplayName("실패: ALL BAN 유저")
+// void 실패_ALL_BANNED_USER_verifyUserForLent() {
// int userActiveLentCount = 0;
-// LocalDateTime future = LocalDateTime.now().plusDays(1);
+// User user = mock(User.class);
+// given(user.isUserRole(UserRole.USER)).willReturn(true);
+//
+// BanHistory mockBanHistory = mock(BanHistory.class);
+// given(mockBanHistory.getBanType()).willReturn(BanType.ALL);
+// List mockBanHistoryList = new ArrayList<>();
+// mockBanHistoryList.add(mockBanHistory);
+//
+// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
+// userActiveLentCount, mockBanHistoryList);
+//
+// assertEquals(LentPolicyStatus.ALL_BANNED_USER, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 공유사물함 BAN된 유저")
+// void 실패_SHARE_BANNED_USER_verifyUserForLent() {
+// int userActiveLentCount = 0;
+// User user = mock(User.class);
+// given(user.isUserRole(UserRole.USER)).willReturn(true);
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
+//
+// BanHistory banHistory = mock(BanHistory.class);
+// given(banHistory.getBanType()).willReturn(BanType.SHARE);
+// List userActiveBanList = new ArrayList<>();
+// userActiveBanList.add(banHistory);
+//
+// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, cabinet,
+// userActiveLentCount, userActiveBanList);
+//
+// assertEquals(LentPolicyStatus.SHARE_BANNED_USER, result);
+// }
+//
+// @Test
+// @Disabled
+// @DisplayName("성공: 공유사물함 BAN - 공유사물함 이외 대여")
+// void 성공_SHAREBANNED_LENT_OTHER_verifyUserForLent() {
+// int userActiveLentCount = 0;
+// User user = mock(User.class);
+// given(user.isUserRole(UserRole.USER)).willReturn(true);
+//
+// BanHistory banHistory = mock(BanHistory.class);
+// given(banHistory.getBanType()).willReturn(BanType.SHARE);
+// List userActiveBanList = new ArrayList<>();
+// userActiveBanList.add(banHistory);
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.isLentType(LentType.SHARE)).willReturn(false);
+//
+// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, cabinet,
+// userActiveLentCount, userActiveBanList);
+//
+// assertEquals(LentPolicyStatus.FINE, result);
+// }
+//
//
+// @Test
+// @DisplayName("성공: 유저의 밴 기록 없음")
+// void 성공_NO_BANHISTORY_verifyUserForLent() {
+// int userActiveLentCount = 0;
// User user = mock(User.class);
// given(user.isUserRole(UserRole.USER)).willReturn(true);
-// given(user.getBlackholedAt()).willReturn(future);
//
// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
// userActiveLentCount, null);
//
// assertEquals(LentPolicyStatus.FINE, result);
// }
-
- @Test
- @DisplayName("실패: FULL캐비넷 대여시도")
- void 실패_FULL_verifyCabinetForLent() {
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.FULL);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
-
- assertEquals(LentPolicyStatus.FULL_CABINET, result);
- }
-
- @Test
- @DisplayName("실패: 고장 캐비넷 대여시도")
- void 실패_BROKEN_verifyCabinetForLent() {
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.BROKEN);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
-
- assertEquals(LentPolicyStatus.BROKEN_CABINET, result);
- }
-
- @Test
- @DisplayName("실패: 연체된 캐비넷 대여시도")
- void 실패_OVERDUE_verifyCabinetForLent() {
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.OVERDUE);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
-
- assertEquals(LentPolicyStatus.OVERDUE_CABINET, result);
- }
-
- @Test
- @DisplayName("성공: 동아리사물함 대여 - LentType.CLUB")
- void 성공_CLUB_verifyCabinetForLent() {
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.AVAILABLE);
- given(cabinet.isLentType(LentType.CLUB)).willReturn(true);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
-
- assertEquals(LentPolicyStatus.LENT_CLUB, result);
- }
-
- @Test
- @DisplayName("실패: 공유사물함 - 중간합류 AND 대여기록 NULL - INTERNAL_ERROR")
- void 실패_LIMITED_AVAILABLE_HISTORY_NULL_verifyCabinetForLent() {
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
- given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
- given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
- given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
-
- assertEquals(LentPolicyStatus.INTERNAL_ERROR, result);
- }
-
- @Test
- @DisplayName("실패: 공유사물함 - 중간합류 AND 대여기록 EMPTY - INTERNAL_ERROR")
- void 실패_LIMITED_AVAILABLE_HISTORY_EMPTY_verifyCabinetForLent() {
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
- given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
- given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
- given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
-
- List cabinetLentHistories = new ArrayList<>();
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, cabinetLentHistories,
- null);
-
- assertEquals(LentPolicyStatus.INTERNAL_ERROR, result);
- }
-
- @Test
- @DisplayName("실패: 공유사물함 - 만료기간 임박시점 대여시도 - IMMINENT_EXPIRATION")
- void 실패_LIMITED_AVAILABLE_IMMINENT_EXPIRATION_verifyCabinetForLent() {
- LocalDateTime currentTime = LocalDateTime.now();
-
- given(lentPolicy.getDaysForNearExpiration()).willReturn(5);
-
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
- given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
- given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
- given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
- // 잔여 : 1일 (입구컷 기준일자 5일)
- LentHistory lentHistory = mock(LentHistory.class);
- given(lentHistory.getExpiredAt()).willReturn(currentTime.plusDays(1));
- List cabinetLentHistories = new ArrayList<>();
- cabinetLentHistories.add(lentHistory);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, cabinetLentHistories,
- currentTime);
-
- assertEquals(LentPolicyStatus.IMMINENT_EXPIRATION, result);
- }
-
- @Test
- @DisplayName("성공: 공유사물함 - 만료기간 여유")
- void 성공_LIMITED_AVAILABLE_JOIN_verifyCabinetForLent() {
- LocalDateTime currentTime = LocalDateTime.now();
-
- given(lentPolicy.getDaysForNearExpiration()).willReturn(5);
-
- // 공유사물함 중간합류
- Cabinet cabinet = mock(Cabinet.class);
- given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
- given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
- given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
- given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
- // 잔여 : 현재일자 + 5일 = 6일 (입구컷 기준일자 5일)
- LentHistory lentHistory = mock(LentHistory.class);
- given(lentHistory.getExpiredAt()).willReturn(currentTime.plusDays(6));
- List cabinetLentHistories = new ArrayList<>();
- cabinetLentHistories.add(lentHistory);
-
- LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, cabinetLentHistories,
- currentTime);
-
- assertEquals(LentPolicyStatus.FINE, result);
- }
-
- @Test
- @Disabled
- @DisplayName("생략 - 개인사물함 대여 쿨타임")
- void getDaysForLentTermPrivate() {
- }
-
- @Test
- @Disabled
- @DisplayName("생략 - 공유사물함 대여 쿨타임")
- void getDaysForLentTermShare() {
- }
-
- @Test
- @DisplayName("성공: 만료기간 임박날짜 계산")
- void getDaysForNearExpiration() {
- given(cabinetProperties.getPenaltyDayShare()).willReturn(3);
- given(cabinetProperties.getPenaltyDayPadding()).willReturn(2);
-
- assertEquals(5, lentPolicy.getDaysForNearExpiration());
- }
-}
\ No newline at end of file
+//
+// /**
+// * @See {@link LentPolicyImpl#verifyUserForLent(User, Cabinet, int, List)}
+// *
+// * 설계 상의 문제로 테스트 코드 비활성화 처리 해두었습니다.
+// */
+//// @Test
+//// @DisplayName("성공: 유저 미래 블랙홀 예정")
+//// void 성공_BLACKHOLE_IS_FUTURE_verifyUserForLent() {
+//// int userActiveLentCount = 0;
+//// LocalDateTime future = LocalDateTime.now().plusDays(1);
+////
+//// User user = mock(User.class);
+//// given(user.isUserRole(UserRole.USER)).willReturn(true);
+//// given(user.getBlackholedAt()).willReturn(future);
+////
+//// LentPolicyStatus result = lentPolicy.verifyUserForLent(user, null,
+//// userActiveLentCount, null);
+////
+//// assertEquals(LentPolicyStatus.FINE, result);
+//// }
+// @Test
+// @DisplayName("실패: FULL캐비넷 대여시도")
+// void 실패_FULL_verifyCabinetForLent() {
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.FULL);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
+//
+// assertEquals(LentPolicyStatus.FULL_CABINET, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 고장 캐비넷 대여시도")
+// void 실패_BROKEN_verifyCabinetForLent() {
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.BROKEN);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
+//
+// assertEquals(LentPolicyStatus.BROKEN_CABINET, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 연체된 캐비넷 대여시도")
+// void 실패_OVERDUE_verifyCabinetForLent() {
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.OVERDUE);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
+//
+// assertEquals(LentPolicyStatus.OVERDUE_CABINET, result);
+// }
+//
+// @Test
+// @DisplayName("성공: 동아리사물함 대여 - LentType.CLUB")
+// void 성공_CLUB_verifyCabinetForLent() {
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.AVAILABLE);
+// given(cabinet.isLentType(LentType.CLUB)).willReturn(true);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
+//
+// assertEquals(LentPolicyStatus.LENT_CLUB, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 공유사물함 - 중간합류 AND 대여기록 NULL - INTERNAL_ERROR")
+// void 실패_LIMITED_AVAILABLE_HISTORY_NULL_verifyCabinetForLent() {
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
+// given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
+// given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
+// given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, null, null);
+//
+// assertEquals(LentPolicyStatus.INTERNAL_ERROR, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 공유사물함 - 중간합류 AND 대여기록 EMPTY - INTERNAL_ERROR")
+// void 실패_LIMITED_AVAILABLE_HISTORY_EMPTY_verifyCabinetForLent() {
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
+// given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
+// given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
+// given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
+//
+// List cabinetLentHistories = new ArrayList<>();
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, cabinetLentHistories,
+// null);
+//
+// assertEquals(LentPolicyStatus.INTERNAL_ERROR, result);
+// }
+//
+// @Test
+// @DisplayName("실패: 공유사물함 - 만료기간 임박시점 대여시도 - IMMINENT_EXPIRATION")
+// void 실패_LIMITED_AVAILABLE_IMMINENT_EXPIRATION_verifyCabinetForLent() {
+// LocalDateTime currentTime = LocalDateTime.now();
+//
+// given(lentPolicy.getDaysForNearExpiration()).willReturn(5);
+//
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
+// given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
+// given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
+// given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
+// // 잔여 : 1일 (입구컷 기준일자 5일)
+// LentHistory lentHistory = mock(LentHistory.class);
+// given(lentHistory.getExpiredAt()).willReturn(currentTime.plusDays(1));
+// List cabinetLentHistories = new ArrayList<>();
+// cabinetLentHistories.add(lentHistory);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, cabinetLentHistories,
+// currentTime);
+//
+// assertEquals(LentPolicyStatus.IMMINENT_EXPIRATION, result);
+// }
+//
+// @Test
+// @DisplayName("성공: 공유사물함 - 만료기간 여유")
+// void 성공_LIMITED_AVAILABLE_JOIN_verifyCabinetForLent() {
+// LocalDateTime currentTime = LocalDateTime.now();
+//
+// given(lentPolicy.getDaysForNearExpiration()).willReturn(5);
+//
+// // 공유사물함 중간합류
+// Cabinet cabinet = mock(Cabinet.class);
+// given(cabinet.getStatus()).willReturn(CabinetStatus.LIMITED_AVAILABLE);
+// given(cabinet.isLentType(LentType.CLUB)).willReturn(false);
+// given(cabinet.isLentType(LentType.SHARE)).willReturn(true);
+// given(cabinet.isStatus(CabinetStatus.LIMITED_AVAILABLE)).willReturn(true);
+// // 잔여 : 현재일자 + 5일 = 6일 (입구컷 기준일자 5일)
+// LentHistory lentHistory = mock(LentHistory.class);
+// given(lentHistory.getExpiredAt()).willReturn(currentTime.plusDays(6));
+// List cabinetLentHistories = new ArrayList<>();
+// cabinetLentHistories.add(lentHistory);
+//
+// LentPolicyStatus result = lentPolicy.verifyCabinetForLent(cabinet, cabinetLentHistories,
+// currentTime);
+//
+// assertEquals(LentPolicyStatus.FINE, result);
+// }
+//
+// @Test
+// @Disabled
+// @DisplayName("생략 - 개인사물함 대여 쿨타임")
+// void getDaysForLentTermPrivate() {
+// }
+//
+// @Test
+// @Disabled
+// @DisplayName("생략 - 공유사물함 대여 쿨타임")
+// void getDaysForLentTermShare() {
+// }
+//
+// @Test
+// @DisplayName("성공: 만료기간 임박날짜 계산")
+// void getDaysForNearExpiration() {
+// given(cabinetProperties.getPenaltyDayShare()).willReturn(3);
+// given(cabinetProperties.getPenaltyDayPadding()).willReturn(2);
+//
+// assertEquals(5, lentPolicy.getDaysForNearExpiration());
+// }
+//}
diff --git a/backend/src/test/java/org/ftclub/cabinet/lent/service/LentServiceImplTest.java b/backend/src/test/java/org/ftclub/cabinet/lent/service/LentServiceImplTest.java
index 704e560a3..c0c5545bd 100644
--- a/backend/src/test/java/org/ftclub/cabinet/lent/service/LentServiceImplTest.java
+++ b/backend/src/test/java/org/ftclub/cabinet/lent/service/LentServiceImplTest.java
@@ -1,5 +1,13 @@
package org.ftclub.cabinet.lent.service;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import org.ftclub.cabinet.cabinet.domain.Cabinet;
import org.ftclub.cabinet.cabinet.domain.CabinetStatus;
import org.ftclub.cabinet.exception.ExceptionStatus;
@@ -11,19 +19,17 @@
import org.ftclub.cabinet.user.repository.BanHistoryRepository;
import org.ftclub.cabinet.user.repository.UserRepository;
import org.ftclub.cabinet.utils.DateUtil;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
import org.junit.platform.commons.annotation.Testable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import java.lang.reflect.Field;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-
@SpringBootTest
@Disabled
@Deprecated
@@ -307,4 +313,10 @@ void sharedCabinetProperStatus2() {
void startLentPublicCabinetMaxUserLimit() {
}
+
+// @Test
+// @DisplayName("공유사물함 반납 시 잔여 대여일 수 차감 테스트")
+// void endLentShareCabinet() {
+// lentService.endLentCabinet();
+// }
}
\ No newline at end of file
diff --git a/backend/src/test/java/org/ftclub/cabinet/redis/RedisRepositoryTest.java b/backend/src/test/java/org/ftclub/cabinet/redis/RedisRepositoryTest.java
new file mode 100644
index 000000000..a79205f35
--- /dev/null
+++ b/backend/src/test/java/org/ftclub/cabinet/redis/RedisRepositoryTest.java
@@ -0,0 +1,34 @@
+package org.ftclub.cabinet.redis;
+
+import org.ftclub.cabinet.lent.repository.LentRedis;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class RedisRepositoryTest {
+
+// @Autowired
+// private RedisTemplate valueRedisTemplate;
+//
+// @Autowired
+// private RedisTemplate shadowKeyRedisTemplate;
+
+ @Autowired
+ private LentRedis lentRedis;
+
+ @Test
+ void test() {
+ Long cabinetId = 16L;
+
+ lentRedis.setShadowKey(cabinetId);
+ lentRedis.saveUserInRedis(16L, 1234L, 1000, false);
+ lentRedis.saveUserInRedis(16L, 5678L, 1000, true);
+
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ System.out.println("interrupted");
+ }
+ }
+}
diff --git a/backend/src/test/java/org/ftclub/cabinet/user/controller/UserControllerTest.java b/backend/src/test/java/org/ftclub/cabinet/user/controller/UserControllerTest.java
index 2fdd5cfc3..2393505f1 100644
--- a/backend/src/test/java/org/ftclub/cabinet/user/controller/UserControllerTest.java
+++ b/backend/src/test/java/org/ftclub/cabinet/user/controller/UserControllerTest.java
@@ -1,5 +1,12 @@
package org.ftclub.cabinet.user.controller;
+import static org.ftclub.testutils.TestUtils.mockRequest;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.time.LocalDateTime;
+import javax.servlet.http.Cookie;
+import javax.transaction.Transactional;
import org.ftclub.cabinet.config.JwtProperties;
import org.ftclub.cabinet.dto.MyProfileResponseDto;
import org.ftclub.cabinet.utils.DateUtil;
@@ -12,14 +19,6 @@
import org.springframework.http.HttpMethod;
import org.springframework.test.web.servlet.MockMvc;
-import javax.servlet.http.Cookie;
-import javax.transaction.Transactional;
-import java.time.LocalDateTime;
-
-import static org.ftclub.testutils.TestUtils.mockRequest;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
@SpringBootTest
@AutoConfigureMockMvc
@Transactional
diff --git a/backend/src/test/resources/schema.sql b/backend/src/test/resources/schema.sql
index 156bb1a8b..12e6b8baa 100644
--- a/backend/src/test/resources/schema.sql
+++ b/backend/src/test/resources/schema.sql
@@ -170,6 +170,7 @@ CREATE TABLE `user` (
`email` varchar(255) DEFAULT NULL,
`name` varchar(32) NOT NULL,
`role` varchar(32) NOT NULL,
+ `is_extensible` tinyint(1) DEFAULT 0 NOT NULL,
PRIMARY KEY (`user_id`),
UNIQUE KEY `UK_gj2fy3dcix7ph7k8684gka40c` (`name`),
UNIQUE KEY `UK_ob8kqyqqgmefl0aco34akdtpe` (`email`)
diff --git a/config b/config
index 499029fd1..8aa75939c 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit 499029fd15b4237ce1575038f139f20228c6b186
+Subproject commit 8aa75939c1d9910c0bc2dba75b23635d77fd4116
diff --git a/frontend/src/api/axios/axios.custom.ts b/frontend/src/api/axios/axios.custom.ts
index cf1920842..d2bbad2ec 100644
--- a/frontend/src/api/axios/axios.custom.ts
+++ b/frontend/src/api/axios/axios.custom.ts
@@ -132,6 +132,16 @@ export const axiosMyLentLog = async (page: number): Promise => {
}
};
+const axiosExtendLentPeriodURL = "/v4/lent/cabinets/extend";
+export const axiosExtendLentPeriod = async (): Promise => {
+ try {
+ const response = await instance.patch(axiosExtendLentPeriodURL);
+ return response;
+ } catch (error) {
+ throw error;
+ }
+};
+
// Admin API
const axiosAdminAuthLoginURL = "/v4/admin/auth/login";
export const axiosAdminAuthLogin = async (
@@ -445,3 +455,32 @@ export const axiosLentClubUser = async (
throw error;
}
};
+
+const axiosLentShareIdURL = "/v4/lent/cabinets/share/";
+export const axiosLentShareId = async (
+ cabinetId: number | null,
+ shareCode: string
+): Promise => {
+ if (cabinetId === null) return;
+ try {
+ const response = await instance.post(`${axiosLentShareIdURL}${cabinetId}`, {
+ shareCode,
+ });
+ return response;
+ } catch (error) {
+ throw error;
+ }
+};
+
+const axiosCancelURL = "/v4/lent/cabinets/share/cancel/";
+export const axiosCancel = async (cabinetId: number | null): Promise => {
+ if (cabinetId === null) {
+ return;
+ }
+ try {
+ const response = await instance.patch(`${axiosCancelURL}${cabinetId}`);
+ return response;
+ } catch (error) {
+ throw error;
+ }
+};
diff --git a/frontend/src/assets/css/homePage.css b/frontend/src/assets/css/homePage.css
index 309dcc43b..e71b6c4bf 100644
--- a/frontend/src/assets/css/homePage.css
+++ b/frontend/src/assets/css/homePage.css
@@ -1,7 +1,7 @@
-@media screen and (max-width: 1300px) {
+@media screen and (max-width: 1100px) {
#infoWrap > .titleContainer {
width: 90%;
- max-width: 600px;
+ max-width: 800px;
}
#infoWrap .section {
@@ -10,6 +10,8 @@
}
#infoWrap .article {
width: 100%;
+ align-items: center;
+ margin-right: 0px;
}
}
diff --git a/frontend/src/assets/data/ManualContent.ts b/frontend/src/assets/data/ManualContent.ts
new file mode 100644
index 000000000..be50b8b08
--- /dev/null
+++ b/frontend/src/assets/data/ManualContent.ts
@@ -0,0 +1,113 @@
+import ContentStatus from "@/types/enum/content.status.enum";
+
+interface ContentStatusData {
+ contentTitle: string;
+ imagePath: string;
+ background: string;
+ rentalPeriod?: string;
+ capacity?: string;
+ contentText: string;
+ pointColor: string;
+}
+
+export const manualContentData: Record = {
+ [ContentStatus.PRIVATE]: {
+ contentTitle: "개인 사물함",
+ imagePath: "/src/assets/images/privateIcon.svg",
+ background: "linear-gradient(to bottom, #A17BF3, #8337E5)",
+ rentalPeriod: `${import.meta.env.VITE_PRIVATE_LENT_PERIOD}일`,
+ capacity: "1인",
+ contentText: `◦ 이용 방법1인 이 1개의 사물함을 사용합니다.${
+ import.meta.env.VITE_PRIVATE_LENT_PERIOD
+ }일 간 대여할 수 있습니다.제곱 수만큼 페널티가 부과됩니다.
+ `,
+ pointColor: "#8ffac7",
+ },
+ [ContentStatus.SHARE]: {
+ contentTitle: "공유 사물함",
+ imagePath: "/src/assets/images/shareIcon.svg",
+ background: "linear-gradient(to bottom, #7EBFFB, #406EE4)",
+ rentalPeriod: "20일 * N명",
+ capacity: "2~4인",
+ contentText: `◦ 이용 방법최대 ${
+ import.meta.env.VITE_SHARE_MAX_USER
+ }인 이 사용합니다. 대여한 인원수 * ${
+ import.meta.env.VITE_SHARE_LENT_PERIOD
+ }일 간 대여할 수 있습니다.잔여 기간의 인원수 / 1 만큼 대여 기간이 감소됩니다.
+ 제곱 수만큼 페널티가 부과됩니다.새로운 기수 가 들어올 때 갱신됩니다.
+
+ 슬랙 캐비닛 채널
+
+ 로 문의주세요.
+ 오픈예정 상태가 됩니다.반납일 기준 다음 날 오후 1시(13시) 사용가능 상태가 됩니다.
+ 슬랙 캐비닛 채널 에서 확인하세요.`,
+ pointColor: "#6f07f6",
+ },
+ [ContentStatus.IN_SESSION]: {
+ contentTitle: "대기중",
+ imagePath: "/src/assets/images/clock.svg",
+ background: "#9F72FE",
+ contentText: `공유 사물함 대여시 10분 간의 대기 시간이 발생합니다.공유 인원(2인~4인) 이 형성되지 않으면 공유 사물함 대여는 취소 됩니다.4명 의 공유 인원이 형성되면 즉시 대여가 완료됩니다.초대 코드 를 사용하여 공유 사물함에 입장할 수 있습니다.3번 이상 잘못 입력하면 입장이 제한 됩니다.120시간 이상일 시 연장권이 부여됩니다.매달 2일 지급됩니다.1달(31일) 연장됩니다.해당 월의 마지막 날 까지 사용 가능합니다.`,
+ pointColor: "#9747FF",
+ },
+};
diff --git a/frontend/src/assets/data/maps.ts b/frontend/src/assets/data/maps.ts
index 7487ec26a..0e67342ae 100644
--- a/frontend/src/assets/data/maps.ts
+++ b/frontend/src/assets/data/maps.ts
@@ -12,6 +12,9 @@ export enum additionalModalType {
MODAL_ADMIN_CLUB_EDIT = "MODAL_ADMIN_CLUB_EDIT",
MODAL_ADMIN_CLUB_DELETE = "MODAL_ADMIN_CLUB_DELETE",
MODAL_OVERDUE_PENALTY = "MODAL_OVERDUE_PENALTY",
+ MODAL_USE_EXTENSION = "MODAL_USE_EXTENSION",
+ MODAL_OWN_EXTENSION = "MODAL_OWN_EXTENSION",
+ MODAL_CANCEL = "MODAL_CANCEL",
}
export const cabinetIconSrcMap = {
@@ -27,6 +30,8 @@ export const cabinetLabelColorMap = {
[CabinetStatus.OVERDUE]: "var(--white)",
[CabinetStatus.BROKEN]: "var(--white)",
[CabinetStatus.BANNED]: "var(--white)",
+ [CabinetStatus.IN_SESSION]: "var(--white)",
+ [CabinetStatus.PENDING]: "var(--main-color)",
MINE: "var(--black)",
};
@@ -37,6 +42,8 @@ export const cabinetStatusColorMap = {
[CabinetStatus.OVERDUE]: "var(--expired)",
[CabinetStatus.BROKEN]: "var(--broken)",
[CabinetStatus.BANNED]: "var(--banned)",
+ [CabinetStatus.IN_SESSION]: "var(--session)",
+ [CabinetStatus.PENDING]: "var(--pending)",
MINE: "var(--mine)",
};
@@ -131,6 +138,26 @@ export const modalPropsMap = {
title: "패널티 안내",
confirmMessage: "오늘 하루동안 보지않기",
},
+ MODAL_INVITATION_CODE: {
+ type: "confirm",
+ title: "초대 코드",
+ confirmMessage: "대여하기",
+ },
+ MODAL_USE_EXTENSION: {
+ type: "confirm",
+ title: "연장권 사용",
+ confirmMessage: "연장하기",
+ },
+ MODAL_OWN_EXTENSION: {
+ type: "confirm",
+ title: "연장권 정보",
+ confirmMessage: "",
+ },
+ MODAL_CANCEL: {
+ type: "confirm",
+ title: "대기열 취소하기",
+ confirmMessage: "네, 취소할게요",
+ },
};
export const cabinetFilterMap = {
@@ -140,6 +167,8 @@ export const cabinetFilterMap = {
[CabinetStatus.OVERDUE]: "brightness(100)",
[CabinetStatus.BROKEN]: "brightness(100)",
[CabinetStatus.BANNED]: "brightness(100)",
+ [CabinetStatus.IN_SESSION]: "brightness(100)",
+ [CabinetStatus.PENDING]: "none",
};
export const cabinetStatusLabelMap = {
@@ -149,6 +178,8 @@ export const cabinetStatusLabelMap = {
[CabinetStatus.OVERDUE]: "사용 가능",
[CabinetStatus.BANNED]: "사용 불가",
[CabinetStatus.BROKEN]: "사용 불가",
+ [CabinetStatus.IN_SESSION]: "대기중",
+ [CabinetStatus.PENDING]: "오픈 예정",
};
export const cabinetTypeLabelMap = {
diff --git a/frontend/src/assets/images/clock.svg b/frontend/src/assets/images/clock.svg
new file mode 100644
index 000000000..1adebbdd6
--- /dev/null
+++ b/frontend/src/assets/images/clock.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/frontend/src/assets/images/extensionTicket.svg b/frontend/src/assets/images/extensionTicket.svg
new file mode 100644
index 000000000..602284375
--- /dev/null
+++ b/frontend/src/assets/images/extensionTicket.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/frontend/src/assets/images/extensionTicketGray.svg b/frontend/src/assets/images/extensionTicketGray.svg
new file mode 100644
index 000000000..524de2eb0
--- /dev/null
+++ b/frontend/src/assets/images/extensionTicketGray.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/frontend/src/assets/images/manualPeople.svg b/frontend/src/assets/images/manualPeople.svg
new file mode 100644
index 000000000..317e69d7b
--- /dev/null
+++ b/frontend/src/assets/images/manualPeople.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/frontend/src/assets/images/map.svg b/frontend/src/assets/images/map.svg
index 1d932a0ae..383e1bad9 100644
--- a/frontend/src/assets/images/map.svg
+++ b/frontend/src/assets/images/map.svg
@@ -1,5 +1,5 @@
-
diff --git a/frontend/src/assets/images/moveButton.svg b/frontend/src/assets/images/moveButton.svg
new file mode 100644
index 000000000..16c1e9b6e
--- /dev/null
+++ b/frontend/src/assets/images/moveButton.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/frontend/src/assets/images/myCabinetIcon.svg b/frontend/src/assets/images/myCabinetIcon.svg
index a5d948ac8..6b5d6d9a1 100644
--- a/frontend/src/assets/images/myCabinetIcon.svg
+++ b/frontend/src/assets/images/myCabinetIcon.svg
@@ -1,5 +1,5 @@
-
diff --git a/frontend/src/assets/images/searchWhite.svg b/frontend/src/assets/images/searchWhite.svg
index 5597e4b56..1ac0b2008 100644
--- a/frontend/src/assets/images/searchWhite.svg
+++ b/frontend/src/assets/images/searchWhite.svg
@@ -1,4 +1,4 @@
-
diff --git a/frontend/src/assets/images/select.svg b/frontend/src/assets/images/select.svg
index 33cc4f3e5..5da3508ff 100644
--- a/frontend/src/assets/images/select.svg
+++ b/frontend/src/assets/images/select.svg
@@ -1,3 +1,3 @@
-
diff --git a/frontend/src/assets/images/subtract.svg b/frontend/src/assets/images/subtract.svg
new file mode 100644
index 000000000..1634b4567
--- /dev/null
+++ b/frontend/src/assets/images/subtract.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/frontend/src/components/CabinetInfoArea/AdminCabinetInfoArea.tsx b/frontend/src/components/CabinetInfoArea/AdminCabinetInfoArea.tsx
index 572644827..204bee3d4 100644
--- a/frontend/src/components/CabinetInfoArea/AdminCabinetInfoArea.tsx
+++ b/frontend/src/components/CabinetInfoArea/AdminCabinetInfoArea.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { useRecoilValue } from "recoil";
-import styled, { css } from "styled-components";
+import styled, { css, keyframes } from "styled-components";
import {
currentFloorNumberState,
currentSectionNameState,
@@ -270,6 +270,25 @@ const CabinetRectangleStyled = styled.div<{
? cabinetLabelColorMap["MINE"]
: cabinetLabelColorMap[props.cabinetStatus]};
text-align: center;
+ ${({ cabinetStatus }) =>
+ cabinetStatus === "PENDING" &&
+ css`
+ border: 2px solid var(--main-color);
+ `}
+ ${({ cabinetStatus }) =>
+ cabinetStatus === "IN_SESSION" &&
+ css`
+ animation: ${Animation} 2.5s infinite;
+ `}
+`;
+
+const Animation = keyframes`
+ 0%, 100% {
+ background-color: var(--main-color);
+ }
+ 50% {
+ background-color: #d9d9d9;
+ }
`;
const CabinetInfoButtonsContainerStyled = styled.div`
diff --git a/frontend/src/components/CabinetInfoArea/CabinetInfoArea.container.tsx b/frontend/src/components/CabinetInfoArea/CabinetInfoArea.container.tsx
index 02df2ba0d..7891009b5 100644
--- a/frontend/src/components/CabinetInfoArea/CabinetInfoArea.container.tsx
+++ b/frontend/src/components/CabinetInfoArea/CabinetInfoArea.container.tsx
@@ -1,6 +1,10 @@
import { useState } from "react";
-import { useRecoilValue } from "recoil";
-import { myCabinetInfoState, targetCabinetInfoState } from "@/recoil/atoms";
+import { useRecoilState, useRecoilValue } from "recoil";
+import {
+ myCabinetInfoState,
+ targetCabinetInfoState,
+ userState,
+} from "@/recoil/atoms";
import AdminCabinetInfoArea from "@/components/CabinetInfoArea/AdminCabinetInfoArea";
import CabinetInfoArea from "@/components/CabinetInfoArea/CabinetInfoArea";
import AdminLentLog from "@/components/LentLog/AdminLentLog";
@@ -9,6 +13,7 @@ import {
CabinetPreviewInfo,
MyCabinetInfoResponseDto,
} from "@/types/dto/cabinet.dto";
+import { UserDto } from "@/types/dto/user.dto";
import CabinetStatus from "@/types/enum/cabinet.status.enum";
import CabinetType from "@/types/enum/cabinet.type.enum";
import useMenu from "@/hooks/useMenu";
@@ -37,6 +42,8 @@ export interface IMultiSelectTargetInfo {
OVERDUE: number;
FULL: number;
BROKEN: number;
+ IN_SESSION: number;
+ PENDING: number;
};
}
@@ -46,6 +53,9 @@ export interface ICurrentModalStateInfo {
returnModal: boolean;
memoModal: boolean;
passwordCheckModal: boolean;
+ invitationCodeModal: boolean;
+ extendModal: boolean;
+ cancelModal: boolean;
}
export interface IAdminCurrentModalStateInfo {
@@ -59,6 +69,8 @@ interface ICount {
FULL: number;
OVERDUE: number;
BROKEN: number;
+ IN_SESSION: number;
+ PENDING: number;
}
export type TModalState =
@@ -66,7 +78,10 @@ export type TModalState =
| "unavailableModal"
| "returnModal"
| "memoModal"
- | "passwordCheckModal";
+ | "passwordCheckModal"
+ | "invitationCodeModal"
+ | "extendModal"
+ | "cancelModal";
export type TAdminModalState = "returnModal" | "statusModal" | "clubLentModal";
@@ -92,6 +107,7 @@ const getCabinetUserList = (selectedCabinetInfo: CabinetInfo): string => {
// 동아리 사물함인 경우 cabinet_title에 있는 동아리 이름 반환
const { lentType, title, maxUser, lents } = selectedCabinetInfo;
if (lentType === "CLUB" && title) return title;
+ else if (maxUser === 0) return lents[0].name;
// 그 외에는 유저리스트 반환
const userNameList = new Array(maxUser)
@@ -138,11 +154,14 @@ const getDetailMessageColor = (selectedCabinetInfo: CabinetInfo): string => {
};
const CabinetInfoAreaContainer = (): JSX.Element => {
- const targetCabinetInfo = useRecoilValue(targetCabinetInfoState);
- const myCabinetInfo =
- useRecoilValue(myCabinetInfoState);
- const { closeCabinet, toggleLent } = useMenu();
+ const [targetCabinetInfo, setTargetCabinetInfo] = useRecoilState(
+ targetCabinetInfoState
+ );
+ const [myCabinetInfo, setMyLentInfo] =
+ useRecoilState(myCabinetInfoState);
+ const myInfo = useRecoilValue(userState);
const { isMultiSelect, targetCabinetInfoList } = useMultiSelect();
+ const { closeCabinet, toggleLent } = useMenu();
const { isSameStatus, isSameType } = useMultiSelect();
const isAdmin = document.location.pathname.indexOf("/admin") > -1;
const [userModal, setUserModal] = useState({
@@ -151,6 +170,9 @@ const CabinetInfoAreaContainer = (): JSX.Element => {
returnModal: false,
memoModal: false,
passwordCheckModal: false,
+ invitationCodeModal: false,
+ extendModal: false,
+ cancelModal: false,
});
const [adminModal, setAdminModal] = useState({
returnModal: false,
@@ -185,7 +207,14 @@ const CabinetInfoAreaContainer = (): JSX.Element => {
else result[cabinet.status]++;
return result;
},
- { AVAILABLE: 0, FULL: 0, OVERDUE: 0, BROKEN: 0 }
+ {
+ AVAILABLE: 0,
+ FULL: 0,
+ OVERDUE: 0,
+ BROKEN: 0,
+ IN_SESSION: 0,
+ PENDING: 0,
+ }
);
const multiSelectInfo: IMultiSelectTargetInfo | null = isMultiSelect
@@ -204,6 +233,18 @@ const CabinetInfoAreaContainer = (): JSX.Element => {
targetCabinetInfo.lents.length === 1
) {
modalName = "passwordCheckModal";
+ } else if (
+ modalName === "lentModal" &&
+ cabinetViewData?.status == "IN_SESSION" &&
+ cabinetViewData.lentsLength >= 1
+ ) {
+ modalName = "invitationCodeModal";
+ } else if (
+ modalName === "extendModal" &&
+ cabinetViewData?.lentsLength &&
+ cabinetViewData.lentsLength >= 1
+ ) {
+ modalName = "extendModal";
}
setUserModal({
...userModal,
@@ -271,14 +312,22 @@ const CabinetInfoAreaContainer = (): JSX.Element => {
selectedCabinetInfo={cabinetViewData}
closeCabinet={closeCabinet}
expireDate={setExpireDate(cabinetViewData?.expireDate)}
- isMine={myCabinetInfo?.cabinetId === cabinetViewData?.cabinetId}
+ isMine={
+ myCabinetInfo?.cabinetId === cabinetViewData?.cabinetId &&
+ myCabinetInfo?.cabinetId !== 0 &&
+ cabinetViewData?.status !== "AVAILABLE"
+ }
isAvailable={
- cabinetViewData?.status === "AVAILABLE" ||
- cabinetViewData?.status === "LIMITED_AVAILABLE"
+ (cabinetViewData?.status === "AVAILABLE" ||
+ cabinetViewData?.status === "LIMITED_AVAILABLE" ||
+ cabinetViewData?.status === "IN_SESSION") &&
+ !myCabinetInfo.cabinetId
}
+ isExtensible={myInfo.extensible}
userModal={userModal}
openModal={openModal}
closeModal={closeModal}
+ previousUserName={myCabinetInfo.previousUserName}
/>
);
};
diff --git a/frontend/src/components/CabinetInfoArea/CabinetInfoArea.tsx b/frontend/src/components/CabinetInfoArea/CabinetInfoArea.tsx
index 4b816f165..f130e184d 100644
--- a/frontend/src/components/CabinetInfoArea/CabinetInfoArea.tsx
+++ b/frontend/src/components/CabinetInfoArea/CabinetInfoArea.tsx
@@ -1,5 +1,6 @@
import React from "react";
-import styled, { css } from "styled-components";
+import { useState } from "react";
+import styled, { css, keyframes } from "styled-components";
import {
ICurrentModalStateInfo,
ISelectedCabinetInfo,
@@ -17,9 +18,14 @@ import {
cabinetLabelColorMap,
cabinetStatusColorMap,
} from "@/assets/data/maps";
+import alertImg from "@/assets/images/cautionSign.svg";
import cabiLogo from "@/assets/images/logo.svg";
import CabinetStatus from "@/types/enum/cabinet.status.enum";
import CabinetType from "@/types/enum/cabinet.type.enum";
+import CancelModal from "../Modals/CancelModal/CancelModal";
+import ExtendModal from "../Modals/ExtendModal/ExtendModal";
+import InvitationCodeModalContainer from "../Modals/InvitationCodeModal/InvitationCodeModal.container";
+import CountTimeContainer from "./CountTime/CountTime.container";
const CabinetInfoArea: React.FC<{
selectedCabinetInfo: ISelectedCabinetInfo | null;
@@ -27,19 +33,28 @@ const CabinetInfoArea: React.FC<{
expireDate: string | null;
isMine: boolean;
isAvailable: boolean;
+ isExtensible: boolean;
userModal: ICurrentModalStateInfo;
openModal: (modalName: TModalState) => void;
closeModal: (modalName: TModalState) => void;
+ previousUserName: string | null;
}> = ({
selectedCabinetInfo,
closeCabinet,
expireDate,
isMine,
isAvailable,
+ isExtensible,
userModal,
openModal,
closeModal,
+ previousUserName,
}) => {
+ const [showPreviousUser, setShowPreviousUser] = useState(false);
+
+ const handleLinkTextClick = () => {
+ setShowPreviousUser(!showPreviousUser);
+ };
return selectedCabinetInfo === null ? (
- {selectedCabinetInfo!.floor + "F - " + selectedCabinetInfo!.section}
+ {selectedCabinetInfo!.floor !== 0
+ ? selectedCabinetInfo!.floor + "F - " + selectedCabinetInfo!.section
+ : "-"}
- {selectedCabinetInfo!.visibleNum}
+ {selectedCabinetInfo!.visibleNum !== 0
+ ? selectedCabinetInfo!.visibleNum
+ : "-"}
{isMine ? (
- <>
- {
- openModal("returnModal");
- }}
- text="반납"
- theme="fill"
- />
- openModal("memoModal")}
- text="메모관리"
- theme="line"
- />
- {
+ openModal("cancelModal");
+ }}
+ text="대기열 취소"
+ theme="fill"
+ />
+ {
+ openModal("returnModal");
+ }}
+ text="반납"
+ theme="fill"
+ />
+ openModal("memoModal")}
+ text="메모관리"
+ theme="line"
+ />
+
+ {showPreviousUser ? (
+ previousUserName
+ ) : (
+ <>
+
+ 이전
+
+ )}
+
+
+ )
) : (
<>
- openModal("lentModal")}
- text="대여"
- theme="fill"
- disabled={!isAvailable || selectedCabinetInfo.lentType === "CLUB"}
- />
-
+ openModal(
+ selectedCabinetInfo.status == "IN_SESSION"
+ ? "invitationCodeModal"
+ : "lentModal"
+ )
+ }
+ text="대여"
+ theme="fill"
+ disabled={
+ !isAvailable || selectedCabinetInfo.lentType === "CLUB"
+ }
+ />
+ {
+ openModal("extendModal");
+ }}
+ text={isExtensible ? "연장권 보유중" : "연장권 미보유"}
+ theme={isExtensible ? "line" : "grayLine"}
+ iconSrc={
+ isExtensible
+ ? "/src/assets/images/extensionTicket.svg"
+ : "/src/assets/images/extensionTicketGray.svg"
+ }
+ iconAlt="연장권 아이콘"
+ disabled={!isExtensible}
+ />
+ 매일 13:00 오픈됩니다
+ )}
)}
@@ -105,8 +204,44 @@ const CabinetInfoArea: React.FC<{
{selectedCabinetInfo!.detailMessage}
- {expireDate}
+ {selectedCabinetInfo!.cabinetId === 0 ? "" : expireDate}
+
+ {isMine &&
+ isExtensible &&
+ selectedCabinetInfo.status !== "IN_SESSION" && (
+ {
+ openModal("extendModal");
+ }}
+ text={"연장권 사용하기"}
+ theme="line"
+ iconSrc="/src/assets/images/extensionTicket.svg"
+ iconAlt="연장권 아이콘"
+ disabled={
+ selectedCabinetInfo.lentsLength <= 1 &&
+ selectedCabinetInfo.lentType === "SHARE"
+ }
+ />
+ )}
+ {isMine &&
+ isExtensible &&
+ selectedCabinetInfo.lentsLength <= 1 &&
+ selectedCabinetInfo.lentType === "SHARE" &&
+ selectedCabinetInfo.status !== "IN_SESSION" && (
+
+
+ )}
+
{userModal.unavailableModal && (
closeModal("passwordCheckModal")}
/>
)}
+ {userModal.invitationCodeModal && (
+ closeModal("invitationCodeModal")}
+ cabinetId={selectedCabinetInfo?.cabinetId}
+ />
+ )}
+ {userModal.cancelModal && (
+ closeModal("cancelModal")}
+ />
+ )}
+ {userModal.extendModal && (
+ closeModal("extendModal")}
+ cabinetId={selectedCabinetInfo?.cabinetId}
+ />
+ )}
);
};
@@ -154,6 +307,39 @@ const CabinetDetailAreaStyled = styled.div`
align-items: center;
`;
+const LinkTextStyled = styled.div`
+ position: absolute;
+ bottom: 3%;
+ right: 7%;
+ font-size: 0.875rem;
+ font-weight: 400;
+ line-height: 0.875rem;
+ color: var(--gray-color);
+ :hover {
+ cursor: pointer;
+ }
+`;
+
+const HoverTextStyled = styled.div`
+ width: 50px;
+ display: none;
+ position: absolute;
+ bottom: 35px;
+ right: -10px;
+ color: var(--gray-color);
+ text-align: center;
+ line-height: 1.2;
+`;
+
+const ImageStyled = styled.img`
+ width: 30px;
+ height: 30px;
+
+ &:hover + ${HoverTextStyled} {
+ display: block;
+ }
+`;
+
const CabiLogoStyled = styled.img`
width: 35px;
height: 35px;
@@ -190,28 +376,129 @@ const CabinetRectangleStyled = styled.div<{
border-radius: 10px;
margin-top: 15px;
margin-bottom: 3vh;
- background-color: ${(props) => cabinetStatusColorMap[props.cabinetStatus]};
- ${(props) =>
- props.isMine &&
+ background-color: ${({ cabinetStatus, isMine }) =>
+ isMine && cabinetStatus !== "IN_SESSION"
+ ? "var(--mine)"
+ : cabinetStatusColorMap[cabinetStatus]};
+
+ ${({ cabinetStatus, isMine }) =>
+ cabinetStatus === "IN_SESSION" &&
css`
- background-color: var(--mine);
- `};
+ animation: ${isMine ? Animation2 : Animation} 2.5s infinite;
+ `}
+
font-size: 32px;
color: ${(props) =>
props.isMine
? cabinetLabelColorMap["MINE"]
: cabinetLabelColorMap[props.cabinetStatus]};
text-align: center;
+ ${({ cabinetStatus }) =>
+ cabinetStatus === "PENDING" &&
+ css`
+ border: 2px solid var(--main-color);
+ `}
+`;
+
+const Animation = keyframes`
+ 0%, 100% {
+ background-color: var(--main-color);
+ }
+ 50% {
+ background-color: #d6c5fa;
+ }
+`;
+
+const Animation2 = keyframes`
+ 0%, 100% {
+ background-color: var(--mine);
+ }
+ 50% {
+ background-color: #eeeeee;
+ }
+`;
+
+export const DetailStyled = styled.p`
+ margin-top: 20px;
+ letter-spacing: -0.02rem;
+ line-height: 1.5rem;
+ font-size: 14px;
+ font-weight: 300;
+ white-space: break-spaces;
+`;
+
+const ButtonWrapperStyled = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+`;
+
+const ButtonContainerStyled = styled.button`
+ max-width: 400px;
+ width: 110%;
+ height: 80px;
+ padding: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+ margin-bottom: 15px;
+ &:disabled {
+ opacity: 0.3;
+ cursor: not-allowed;
+ }
+ &:last-child {
+ margin-bottom: 0;
+ }
+ background: var(--white);
+ color: var(--main-color);
+ border: 1px solid var(--main-color);
+ @media (max-height: 745px) {
+ margin-bottom: 8px;
+ }
+`;
+
+const HoverBox = styled.div<{
+ canUseExtendTicket?: boolean;
+}>`
+ position: absolute;
+ top: 50%;
+ width: 270px;
+ height: 80px;
+ padding: 10px;
+ background-color: rgba(73, 73, 73, 0.99);
+ border-radius: 10px;
+ box-shadow: 4px 4px 20px 0px rgba(0, 0, 0, 0.5);
+ font-size: 14px;
+ text-align: center;
+ color: white;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
+ opacity: ${(props) => (props.canUseExtendTicket ? "0" : "1")};
`;
-const CabinetInfoButtonsContainerStyled = styled.div`
+const AlertImgStyled = styled.img`
+ width: 20px;
+ height: 20px;
+ filter: invert(99%) sepia(100%) saturate(3%) hue-rotate(32deg)
+ brightness(104%) contrast(100%);
+`;
+
+const CabinetInfoButtonsContainerStyled = styled.div<{
+ canUseExtendTicket?: boolean;
+}>`
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
- max-height: 210px;
+ max-height: 320px;
margin: 3vh 0;
width: 100%;
+ &:hover ${HoverBox} {
+ opacity: ${(props) => (props.canUseExtendTicket ? "0" : "1")};
+ }
`;
const CabinetLentDateInfoStyled = styled.div<{ textColor: string }>`
@@ -223,4 +510,21 @@ const CabinetLentDateInfoStyled = styled.div<{ textColor: string }>`
text-align: center;
`;
+const WarningMessageStyled = styled.p`
+ color: red;
+ font-size: 1rem;
+ margin-top: 8px;
+ text-align: center;
+ font-weight: 700;
+ line-height: 26px;
+`;
+
+const PendingMessageStyled = styled.p`
+ font-size: 1rem;
+ margin-top: 8px;
+ text-align: center;
+ font-weight: 700;
+ line-height: 26px;
+`;
+
export default CabinetInfoArea;
diff --git a/frontend/src/components/CabinetInfoArea/CountTime/CodeAndTime.tsx b/frontend/src/components/CabinetInfoArea/CountTime/CodeAndTime.tsx
new file mode 100644
index 000000000..a1f748624
--- /dev/null
+++ b/frontend/src/components/CabinetInfoArea/CountTime/CodeAndTime.tsx
@@ -0,0 +1,146 @@
+import { useState } from "react";
+import { useRecoilValue } from "recoil";
+import styled from "styled-components";
+import { myCabinetInfoState } from "@/recoil/atoms";
+import alertImg from "@/assets/images/cautionSign.svg";
+import clockImg from "@/assets/images/clock.svg";
+import ticketImg from "@/assets/images/subtract.svg";
+import { MyCabinetInfoResponseDto } from "@/types/dto/cabinet.dto";
+
+interface CountTimeProps {
+ minutes: string;
+ seconds: string;
+ isTimeOver: boolean;
+}
+
+const CodeAndTime = ({ minutes, seconds, isTimeOver }: CountTimeProps) => {
+ const myCabinetInfo =
+ useRecoilValue(myCabinetInfoState);
+ const code = myCabinetInfo.shareCode + "";
+ const [copySuccess, setCopySuccess] = useState(false);
+
+ const handleCopyClick = () => {
+ navigator.clipboard.writeText(code).then(() => {
+ setCopySuccess(true);
+ setTimeout(() => {
+ setCopySuccess(false);
+ }, 2000);
+ });
+ };
+
+ return (
+
+
+ {copySuccess ? "복사 완료" : `초대코드 | ${code}`}
+
+
+
+
+ {isTimeOver ? (
+ TIME OVER
+ ) : (
+ {`${minutes}:${seconds}`}
+ )}
+
+
+
+
+ );
+};
+
+const HoverBox = styled.div`
+ opacity: 0;
+ position: absolute;
+ top: -165%;
+ width: 270px;
+ height: 70px;
+ padding: 10px;
+ background-color: rgba(73, 73, 73, 0.99);
+ border-radius: 10px;
+ box-shadow: 4px 4px 20px 0px rgba(0, 0, 0, 0.5);
+ font-size: 12px;
+ color: white;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: center;
+`;
+
+const CodeAndTimeStyled = styled.div`
+ max-width: 240px;
+ width: 100%;
+ height: 145px;
+ padding: 0;
+ display: flex;
+ justify-content: space-evenly;
+ align-items: center;
+ flex-direction: column;
+ border-radius: 10px;
+ margin-bottom: 15px;
+ background: var(--white);
+ color: var(--main-color);
+ border: 1px solid var(--main-color);
+ position: relative;
+ &:hover ${HoverBox} {
+ opacity: 1;
+ }
+`;
+
+const CodeStyled = styled.div<{ copySuccess: boolean }>`
+ width: 185px;
+ height: 48px;
+ background-image: url(${ticketImg});
+ color: white;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 14px;
+ letter-spacing: 3.5px;
+ cursor: pointer;
+ user-select: none;
+`;
+
+const TimeStyled = styled.div`
+ display: flex;
+ justify-content: center;
+ align-items: center;
+`;
+
+const ClockStyled = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ font-size: 10px;
+`;
+
+const ClockImgStyled = styled.img`
+ width: 15px;
+ height: 15px;
+ margin-bottom: 3px;
+`;
+
+const CountDownStyled = styled.div`
+ font-size: 28px;
+ font-weight: bold;
+ margin-left: 15px;
+ letter-spacing: 4px;
+`;
+
+const CountEndStyled = styled.div`
+ font-size: 24px;
+ font-weight: bold;
+ margin-left: 15px;
+`;
+
+const AlertImgStyled = styled.img`
+ width: 28px;
+ height: 28px;
+ filter: invert(99%) sepia(100%) saturate(3%) hue-rotate(32deg)
+ brightness(104%) contrast(100%);
+`;
+
+export default CodeAndTime;
diff --git a/frontend/src/components/CabinetInfoArea/CountTime/CountTime.container.tsx b/frontend/src/components/CabinetInfoArea/CountTime/CountTime.container.tsx
new file mode 100644
index 000000000..69ccc81c9
--- /dev/null
+++ b/frontend/src/components/CabinetInfoArea/CountTime/CountTime.container.tsx
@@ -0,0 +1,107 @@
+import { useEffect, useRef, useState } from "react";
+import { useRecoilState } from "recoil";
+import {
+ myCabinetInfoState,
+ targetCabinetInfoState,
+ userState,
+} from "@/recoil/atoms";
+import CodeAndTime from "@/components/CabinetInfoArea/CountTime/CodeAndTime";
+import CountTime from "@/components/CabinetInfoArea/CountTime/CountTime";
+import { MyCabinetInfoResponseDto } from "@/types/dto/cabinet.dto";
+import { axiosCabinetById, axiosMyLentInfo } from "@/api/axios/axios.custom";
+
+const returnCountTime = (countDown: number) => {
+ const minutes = Math.floor((countDown % (1000 * 60 * 60)) / (1000 * 60))
+ .toString()
+ .padStart(2, "0");
+ const seconds = Math.floor((countDown % (1000 * 60)) / 1000)
+ .toString()
+ .padStart(2, "0");
+ return [minutes, seconds];
+};
+
+const CountTimeContainer = ({ isMine }: { isMine: boolean }) => {
+ const calculateCountDown = (targetDate: Date | undefined) => {
+ if (!targetDate) return 0;
+ if (typeof targetDate === "string") {
+ targetDate = new Date(targetDate);
+ }
+ const currentTime = new Date().getTime();
+ const targetTime = targetDate.getTime();
+ if (targetTime <= currentTime) return 0;
+ return targetTime - currentTime + 2000;
+ };
+
+ const [targetCabinetInfo, setTargetCabinetInfo] = useRecoilState(
+ targetCabinetInfoState
+ );
+ const lastUpdatedTime = useRef(Date.now());
+ const initCountDown = calculateCountDown(targetCabinetInfo.sessionExpiredAt);
+ const [countDown, setCountDown] = useState(initCountDown);
+ const [myCabinetInfo, setMyLentInfo] =
+ useRecoilState(myCabinetInfoState);
+ const [timeOver, setTimeOver] = useState(false);
+ const [myInfo, setMyInfo] = useRecoilState(userState);
+
+ const checkTimeOver = async () => {
+ if (!timeOver && countDown <= 0) {
+ setTimeOver(true);
+ try {
+ const { data } = await axiosCabinetById(targetCabinetInfo.cabinetId);
+ setTargetCabinetInfo(data);
+ const { data: myLentInfo } = await axiosMyLentInfo();
+ setMyLentInfo(myLentInfo);
+ if (myLentInfo.status == "FULL")
+ setMyInfo({ ...myInfo, cabinetId: targetCabinetInfo.cabinetId });
+ } catch (error) {
+ console.error("Error fetching data:", error);
+ }
+ }
+ };
+
+ useEffect(() => {
+ const updateCountDown = () => {
+ const currentTime = Date.now();
+ const timeElapsed = currentTime - lastUpdatedTime.current;
+ lastUpdatedTime.current = currentTime;
+
+ setCountDown((prevCountDown) => {
+ if (prevCountDown > 0) {
+ return Math.max(prevCountDown - timeElapsed, 0);
+ } else {
+ return 0;
+ }
+ });
+
+ requestAnimationFrame(updateCountDown);
+ };
+
+ updateCountDown();
+
+ return () => {
+ lastUpdatedTime.current = Date.now();
+ };
+ }, []);
+
+ useEffect(() => {
+ checkTimeOver();
+ }, [countDown]);
+
+ const [minutes, seconds] = returnCountTime(countDown);
+
+ return (
+ <>
+ {isMine ? (
+
+
+
+ {isTimeOver ? (
+ TIME OVER
+ ) : (
+ {`${minutes}:${seconds}`}
+ )}
+
+ );
+};
+
+const CountTimeStyled = styled.div`
+ max-width: 240px;
+ width: 100%;
+ height: 80px;
+ padding: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+ margin-bottom: 15px;
+ background: var(--white);
+ color: var(--main-color);
+ border: 1px solid var(--main-color);
+`;
+
+const ClockStyled = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ font-size: 10px;
+`;
+
+const ClockImgStyled = styled.img`
+ width: 15px;
+ height: 15px;
+ margin-bottom: 3px;
+`;
+
+const CountDownStyled = styled.div`
+ font-size: 28px;
+ font-weight: bold;
+ margin-left: 15px;
+ letter-spacing: 4px;
+`;
+
+const CountEndStyled = styled.div`
+ font-size: 24px;
+ font-weight: bold;
+ margin-left: 15px;
+`;
+
+export default CountTime;
diff --git a/frontend/src/components/CabinetList/CabinetListItem/AdminCabinetListItem.tsx b/frontend/src/components/CabinetList/CabinetListItem/AdminCabinetListItem.tsx
index ba99c295b..3d47bf5f1 100644
--- a/frontend/src/components/CabinetList/CabinetListItem/AdminCabinetListItem.tsx
+++ b/frontend/src/components/CabinetList/CabinetListItem/AdminCabinetListItem.tsx
@@ -1,5 +1,5 @@
import { useRecoilState, useSetRecoilState } from "recoil";
-import styled, { css } from "styled-components";
+import styled, { css, keyframes } from "styled-components";
import {
currentCabinetIdState,
selectedTypeOnSearchState,
@@ -11,6 +11,7 @@ import {
cabinetLabelColorMap,
cabinetStatusColorMap,
} from "@/assets/data/maps";
+import clockIcon from "@/assets/images/clock.svg";
import { CabinetInfo, CabinetPreviewInfo } from "@/types/dto/cabinet.dto";
import CabinetStatus from "@/types/enum/cabinet.status.enum";
import CabinetType from "@/types/enum/cabinet.type.enum";
@@ -35,8 +36,12 @@ const AdminCabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
let cabinetLabelText = "";
- if (props.status !== "BANNED" && props.status !== "BROKEN") {
- //사용불가가 아닌 모든 경우
+ if (
+ props.status !== "BANNED" &&
+ props.status !== "BROKEN" &&
+ props.status != "IN_SESSION" &&
+ props.status != "PENDING"
+ ) {
if (props.lentType === "PRIVATE") cabinetLabelText = props.name;
else if (props.lentType === "SHARE") {
cabinetLabelText =
@@ -46,10 +51,10 @@ const AdminCabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
} else if (props.lentType === "CLUB")
cabinetLabelText = props.title ? props.title : "동아리";
} else {
- //사용불가인 경우
- cabinetLabelText = "사용불가";
+ if (props.status == "IN_SESSION") cabinetLabelText = "대기중";
+ else if (props.status == "PENDING") cabinetLabelText = "오픈예정";
+ else cabinetLabelText = "사용불가";
}
-
const selectCabinetOnClick = (cabinetId: number) => {
if (currentCabinetId === cabinetId) {
closeCabinet();
@@ -109,7 +114,12 @@ const AdminCabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
status={props.status}
isMine={false}
>
- {cabinetLabelText}
+
+ {props.status === "IN_SESSION" && (
+
);
@@ -124,11 +134,6 @@ const CabinetListItemStyled = styled.div<{
}>`
position: relative;
background-color: ${(props) => cabinetStatusColorMap[props.status]};
- ${(props) =>
- props.isMine &&
- css`
- background-color: var(--mine);
- `}
width: 80px;
height: 80px;
margin: 5px;
@@ -160,6 +165,28 @@ const CabinetListItemStyled = styled.div<{
box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.25),
0px 4px 4px rgba(0, 0, 0, 0.25);
`}
+ ${({ status }) =>
+ status === "IN_SESSION" &&
+ css`
+ animation: ${Animation} 2.5s infinite;
+ `}
+ ${({ status }) =>
+ status === "PENDING" &&
+ css`
+ border: 2px solid var(--main-color);
+ `}
+ .cabinetLabelTextWrap {
+ display: flex;
+ align-items: center;
+ }
+ .clockIconStyled {
+ width: 16px;
+ height: 16px;
+ background-image: url(${clockIcon});
+ filter: brightness(100);
+ margin-right: 4px;
+ display: ${(props) => (props.status === "IN_SESSION" ? "block" : "none")};
+ }
@media (hover: hover) and (pointer: fine) {
&:hover {
opacity: 0.9;
@@ -168,6 +195,15 @@ const CabinetListItemStyled = styled.div<{
}
`;
+const Animation = keyframes`
+ 0%, 100% {
+ background-color: var(--main-color);
+ }
+ 50% {
+ background-color: #d9d9d9;
+ }
+`;
+
const CabinetIconNumberWrapperStyled = styled.div`
display: flex;
justify-content: space-between;
@@ -181,11 +217,6 @@ const CabinetLabelStyled = styled.p<{
line-height: 1.25rem;
letter-spacing: -0.02rem;
color: ${(props) => cabinetLabelColorMap[props.status]};
- ${(props) =>
- props.isMine &&
- css`
- color: var(--black);
- `}
`;
const CabinetNumberStyled = styled.p<{
@@ -194,10 +225,10 @@ const CabinetNumberStyled = styled.p<{
}>`
font-size: 0.875rem;
color: ${(props) => cabinetLabelColorMap[props.status]};
- ${(props) =>
- props.isMine &&
+ ${({ status }) =>
+ status === "PENDING" &&
css`
- color: var(--black);
+ color: black;
`}
`;
@@ -211,11 +242,6 @@ const CabinetIconContainerStyled = styled.div<{
background-image: url(${(props) => cabinetIconSrcMap[props.lentType]});
background-size: contain;
filter: ${(props) => cabinetFilterMap[props.status]};
- ${(props) =>
- props.isMine &&
- css`
- filter: none;
- `};
`;
export default AdminCabinetListItem;
diff --git a/frontend/src/components/CabinetList/CabinetListItem/CabinetListItem.tsx b/frontend/src/components/CabinetList/CabinetListItem/CabinetListItem.tsx
index 720221402..5faab88a1 100644
--- a/frontend/src/components/CabinetList/CabinetListItem/CabinetListItem.tsx
+++ b/frontend/src/components/CabinetList/CabinetListItem/CabinetListItem.tsx
@@ -1,10 +1,10 @@
import { useState } from "react";
import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
-import styled, { css } from "styled-components";
+import styled, { css, keyframes } from "styled-components";
import {
currentCabinetIdState,
+ myCabinetInfoState,
targetCabinetInfoState,
- userState,
} from "@/recoil/atoms";
import UnavailableModal from "@/components/Modals/UnavailableModal/UnavailableModal";
import {
@@ -13,15 +13,20 @@ import {
cabinetLabelColorMap,
cabinetStatusColorMap,
} from "@/assets/data/maps";
-import { CabinetInfo, CabinetPreviewInfo } from "@/types/dto/cabinet.dto";
-import { UserDto } from "@/types/dto/user.dto";
+import clockIcon from "@/assets/images/clock.svg";
+import {
+ CabinetInfo,
+ CabinetPreviewInfo,
+ MyCabinetInfoResponseDto,
+} from "@/types/dto/cabinet.dto";
import CabinetStatus from "@/types/enum/cabinet.status.enum";
import CabinetType from "@/types/enum/cabinet.type.enum";
import { axiosCabinetById } from "@/api/axios/axios.custom";
import useMenu from "@/hooks/useMenu";
const CabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
- const MY_INFO = useRecoilValue(userState);
+ const myCabinetInfo =
+ useRecoilValue(myCabinetInfoState);
const [currentCabinetId, setCurrentCabinetId] = useRecoilState(
currentCabinetIdState
);
@@ -31,12 +36,19 @@ const CabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
const [showUnavailableModal, setShowUnavailableModal] =
useState(false);
const { openCabinet, closeCabinet } = useMenu();
- const isMine = MY_INFO ? MY_INFO.cabinetId === props.cabinetId : false;
+ const isMine = myCabinetInfo
+ ? myCabinetInfo.cabinetId === props.cabinetId &&
+ props.status !== "AVAILABLE"
+ : false;
let cabinetLabelText = "";
- if (props.status !== "BANNED" && props.status !== "BROKEN") {
- //사용불가가 아닌 모든 경우
+ if (
+ props.status !== "BANNED" &&
+ props.status !== "BROKEN" &&
+ props.status != "IN_SESSION" &&
+ props.status != "PENDING"
+ ) {
if (props.lentType === "PRIVATE") cabinetLabelText = props.name;
else if (props.lentType === "SHARE") {
cabinetLabelText =
@@ -46,8 +58,9 @@ const CabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
} else if (props.lentType === "CLUB")
cabinetLabelText = props.title ? props.title : "동아리";
} else {
- //사용불가인 경우
- cabinetLabelText = "사용불가";
+ if (props.status === "IN_SESSION") cabinetLabelText = "대기중";
+ else if (props.status === "PENDING") cabinetLabelText = "오픈예정";
+ else cabinetLabelText = "사용불가";
}
const handleCloseUnavailableModal = (e: { stopPropagation: () => void }) => {
@@ -110,7 +123,12 @@ const CabinetListItem = (props: CabinetPreviewInfo): JSX.Element => {
status={props.status}
isMine={isMine}
>
- {cabinetLabelText}
+
+ {props.status === "IN_SESSION" && (
+
{showUnavailableModal && (
`
position: relative;
- background-color: ${(props) => cabinetStatusColorMap[props.status]};
- ${(props) =>
- props.isMine &&
+ background-color: ${({ status, isMine }) =>
+ isMine && status !== "IN_SESSION"
+ ? "var(--mine)"
+ : cabinetStatusColorMap[status]};
+
+ ${({ status, isMine }) =>
+ status === "IN_SESSION" &&
css`
- background-color: var(--mine);
+ animation: ${isMine ? Animation2 : Animation} 2.5s infinite;
`}
+
width: 80px;
height: 80px;
margin: 5px;
@@ -144,6 +167,7 @@ const CabinetListItemStyled = styled.div<{
padding: 8px 8px 14px;
transition: transform 0.2s, opacity 0.2s;
cursor: pointer;
+
${({ isSelected }) =>
isSelected &&
css`
@@ -152,6 +176,30 @@ const CabinetListItemStyled = styled.div<{
box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.25),
0px 4px 4px rgba(0, 0, 0, 0.25);
`}
+
+ ${({ status }) =>
+ status === "PENDING" &&
+ css`
+ border: 2px solid var(--main-color);
+ `}
+
+ .cabinetLabelTextWrap {
+ display: flex;
+ align-items: center;
+ }
+
+ .clockIconStyled {
+ width: 16px;
+ height: 16px;
+ background-image: url(${clockIcon});
+ filter: ${(props) =>
+ props.status === "IN_SESSION" && !props.isMine
+ ? "brightness(100)"
+ : "brightness(0)"};
+ margin-right: 4px;
+ display: ${(props) => (props.status === "IN_SESSION" ? "block" : "none")};
+ }
+
@media (hover: hover) and (pointer: fine) {
&:hover {
opacity: 0.9;
@@ -160,6 +208,24 @@ const CabinetListItemStyled = styled.div<{
}
`;
+const Animation = keyframes`
+ 0%, 100% {
+ background-color: var(--main-color);
+ }
+ 50% {
+ background-color: #d6c5fa;
+ }
+`;
+
+const Animation2 = keyframes`
+ 0%, 100% {
+ background-color: var(--mine);
+ }
+ 50% {
+ background-color: #eeeeee;
+ }
+`;
+
const CabinetIconNumberWrapperStyled = styled.div`
display: flex;
justify-content: space-between;
@@ -191,6 +257,11 @@ const CabinetNumberStyled = styled.p<{
css`
color: var(--black);
`}
+ ${({ status }) =>
+ status === "PENDING" &&
+ css`
+ color: black;
+ `}
`;
const CabinetIconContainerStyled = styled.div<{
diff --git a/frontend/src/components/Common/Button.tsx b/frontend/src/components/Common/Button.tsx
index c2a7fadae..7e2a7a437 100644
--- a/frontend/src/components/Common/Button.tsx
+++ b/frontend/src/components/Common/Button.tsx
@@ -6,6 +6,8 @@ interface ButtonInterface {
text: string;
theme: string;
disabled?: boolean;
+ iconSrc?: string;
+ iconAlt?: string;
}
const Button = (props: ButtonInterface) => {
@@ -15,6 +17,9 @@ const Button = (props: ButtonInterface) => {
theme={props.theme}
disabled={props.disabled}
>
+ {props.iconSrc && (
+
+ {contentStatus === ContentStatus.EXTENSION && (
+
+ {contentStatus === ContentStatus.IN_SESSION && (
+ {contentData.contentTitle}
+
+
+ );
+};
+
+const MaunalContentBoxStyled = styled.div<{
+ background: string;
+ contentStatus: ContentStatus;
+}>`
+ position: relative;
+ width: 280px;
+ height: 280px;
+ border-radius: 40px;
+ background: ${(props) => props.background};
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ font-size: 28px;
+ color: white;
+ padding: 25px;
+ font-weight: bold;
+ cursor: pointer;
+ .clockImg {
+ width: 35px;
+ height: 35px;
+ filter: brightness(100);
+ margin-right: 10px;
+ margin-top: 160px;
+ }
+
+ .contentImg {
+ width: 80px;
+ height: 80px;
+ filter: brightness(
+ ${(props) => (props.contentStatus === ContentStatus.EXTENSION ? 0 : 100)}
+ );
+ }
+
+ .peopleImg {
+ width: 210px;
+ height: 500px;
+ z-index: 1;
+ position: absolute;
+ right: 100px;
+ bottom: 30px;
+ }
+
+ ${({ contentStatus }) =>
+ contentStatus === ContentStatus.PENDING &&
+ css`
+ border: 5px solid var(--main-color);
+ color: var(--main-color);
+ `}
+
+ ${({ contentStatus }) =>
+ contentStatus === ContentStatus.IN_SESSION &&
+ css`
+ animation: ${Animation} 3s infinite;
+ `}
+
+ ${({ contentStatus }) =>
+ contentStatus === ContentStatus.EXTENSION &&
+ css`
+ width: 900px;
+ color: black;
+ @media screen and (max-width: 1000px) {
+ width: 280px;
+ .peopleImg {
+ display: none;
+ }
+ font-size: 21px;
+ }
+ `}
+
+ p {
+ margin-top: 80px;
+ ${({ contentStatus }) =>
+ (contentStatus === ContentStatus.PENDING ||
+ contentStatus === ContentStatus.IN_SESSION) &&
+ css`
+ margin-top: 160px;
+ `}
+ }
+
+ .moveButton {
+ width: 50px;
+ height: 16px;
+ position: absolute;
+ right: 35px;
+ bottom: 35px;
+ filter: brightness(
+ ${(props) =>
+ props.contentStatus === ContentStatus.PENDING
+ ? "none"
+ : props.contentStatus === ContentStatus.EXTENSION
+ ? "0"
+ : "100"}
+ );
+ cursor: pointer;
+ }
+
+ :hover {
+ transition: all 0.3s ease-in-out;
+ box-shadow: 10px 10px 25px 0 rgba(0, 0, 0, 0.2);
+ p {
+ transition: all 0.3s ease-in-out;
+ margin-top: 75px;
+ ${({ contentStatus }) =>
+ (contentStatus === ContentStatus.PENDING ||
+ contentStatus === ContentStatus.IN_SESSION) &&
+ css`
+ margin-top: 155px;
+ `}
+ }
+ .clockImg {
+ transition: all 0.3s ease-in-out;
+ margin-top: 155px;
+ }
+ }
+`;
+
+const Animation = keyframes`
+ 0%, 100% {
+ background-color: var(--main-color);
+ }
+ 50% {
+ background-color: #eeeeee;
+ }
+`;
+
+const ContentTextStyeld = styled.div`
+ display: flex;
+ align-items: center;
+`;
+
+export default MaunalContentBox;
diff --git a/frontend/src/components/Home/ServiceManual.tsx b/frontend/src/components/Home/ServiceManual.tsx
index 840c4f0d7..c8a9c1f47 100644
--- a/frontend/src/components/Home/ServiceManual.tsx
+++ b/frontend/src/components/Home/ServiceManual.tsx
@@ -1,94 +1,104 @@
+import { useState } from "react";
import styled from "styled-components";
+import MaunalContentBox from "@/components/Home/ManualContentBox";
+import ManualModal from "@/components/Modals/ManualModal/ManualModal";
+import ContentStatus from "@/types/enum/content.status.enum";
const ServiceManual = ({
lentStartHandler,
}: {
lentStartHandler: React.MouseEventHandler;
}) => {
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const [selectedContent, setSelectedContent] = useState(
+ ContentStatus.PRIVATE
+ );
+
+ const openModal = (contentStatus: ContentStatus) => {
+ setSelectedContent(contentStatus);
+ setIsModalOpen(true);
+ };
+
+ const closeModal = () => {
+ setIsModalOpen(false);
+ };
+
return (
-
-
-
42Cabi 이용 안내서
- 캐비닛 대여 전 알아둘 3가지
-
-
-
-
-
개인 사물함
-
- 1인 이 1개의 사물함을 사용합니다.
-
- {import.meta.env.VITE_PRIVATE_LENT_PERIOD}일간
- {" "}
- 대여할 수 있습니다.
- 일 수만큼 페널티
- 가 부과됩니다.
-
-
-
-
-
-
공유 사물함
-
- 1개의 사물함을 최대{" "}
- {import.meta.env.VITE_SHARE_MAX_USER}인 이 사용합니다.
- {import.meta.env.VITE_SHARE_LENT_PERIOD}일간 대여할 수
- 있습니다.
-
- {import.meta.env.VITE_SHARE_EARLY_RETURN_PERIOD}시간
- {" "}
- 내 반납 시,
- 불가능 합니다.
- 일 수만큼 페널티
- 가 부과됩니다.
-
-
-
-
-
-
동아리 사물함
-
- 모집 기간에만 대여할 수 있습니다.
-
- 슬랙 캐비닛 채널
-
- 로 문의주세요.
-
-
-
+
+
+
+ 가능성의 확장
+
+
+ openModal(ContentStatus.PRIVATE)}
+ >
+
+ openModal(ContentStatus.SHARE)}
+ >
+
+ openModal(ContentStatus.CLUB)}
+ >
+
+
+
+ 공정한 대여를 위한
+
+
+ openModal(ContentStatus.PENDING)}
+ >
+ new
+
+ openModal(ContentStatus.IN_SESSION)}
+ >
+ new
+
+
+
+ 사물함을 더 오래
+
+
+ openModal(ContentStatus.EXTENSION)}
+ >
+
+
+
+
시작하기
+
);
};
@@ -98,17 +108,20 @@ const WrapperStyled = styled.div`
flex-direction: column;
justify-content: center;
align-items: center;
- padding: 70px 0;
+ padding: 60px 0;
`;
const TitleContainerStyled = styled.div`
- width: 600px;
+ width: 80%;
+ max-width: 1000px;
display: flex;
flex-direction: column;
justify-content: center;
- align-items: center;
- padding-bottom: 70px;
- border-bottom: 2px solid var(--main-color);
+ align-items: flex-start;
+ border-bottom: 2px solid #d9d9d9;
+ margin-bottom: 70px;
+ color: var(--main-color);
+ font-weight: 700;
.logo {
width: 35px;
height: 35px;
@@ -120,39 +133,39 @@ const TitleContainerStyled = styled.div`
margin-bottom: 20px;
}
.title > span {
- font-weight: 700;
+ color: black;
}
+`;
+
+const WrapSectionStyled = styled.div`
+ width: 80%;
+ max-width: 1000px;
.subtitle {
- font-size: 1.5rem;
- color: var(--lightpurple-color);
+ font-size: 2.5rem;
+ line-height: 1.4;
+ text-align: left;
+ font-weight: bold;
}
`;
const InfoSectionStyled = styled.section`
display: flex;
- justify-content: space-between;
- margin-top: 40px;
- width: 90%;
+ margin: 40px 0 60px 0;
+ width: 100%;
max-width: 1500px;
.article {
- width: 100%;
display: flex;
flex-direction: column;
align-items: center;
- margin-bottom: 70px;
- }
- .article > div {
- width: 58px;
- height: 58px;
- display: flex;
- justify-content: center;
- align-items: center;
- background-color: rgba(113, 46, 255, 0.1);
- border-radius: 50%;
- }
- .article > div > img {
- width: 24px;
- height: 24px;
+ margin: 10px 40px 60px 0;
+ :hover {
+ transition: all 0.3s ease-in-out;
+ margin-top: 6px;
+ .redColor {
+ transition: all 0.3s ease-in-out;
+ font-weight: 700;
+ }
+ }
}
.article > h3 {
min-width: 200px;
@@ -168,16 +181,12 @@ const InfoSectionStyled = styled.section`
text-align: center;
}
.redColor {
- color: var(--expired);
+ color: #ef8172;
+ margin-top: 15px;
}
.article > p > span {
font-weight: 700;
}
`;
-const AtagStyled = styled.a`
- text-decoration: underline;
- font-weight: 700;
-`;
-
export default ServiceManual;
diff --git a/frontend/src/components/LeftNav/CabinetColorTable/CabinetColorTable.tsx b/frontend/src/components/LeftNav/CabinetColorTable/CabinetColorTable.tsx
index d3545d491..71f612f58 100644
--- a/frontend/src/components/LeftNav/CabinetColorTable/CabinetColorTable.tsx
+++ b/frontend/src/components/LeftNav/CabinetColorTable/CabinetColorTable.tsx
@@ -1,4 +1,4 @@
-import styled from "styled-components";
+import styled, { css } from "styled-components";
interface ColorTableItemContainerProps {
color: string;
@@ -22,6 +22,7 @@ const CabinetColorTable = () => {
(currentBuildingNameState);
const setCurrentMapFloor = useSetRecoilState(currentMapFloorState);
- const myInfo = useRecoilValue(userState);
+ const myCabinetInfo =
+ useRecoilValue(myCabinetInfoState);
const resetCurrentFloor = useResetRecoilState(currentFloorNumberState);
const resetCurrentSection = useResetRecoilState(currentSectionNameState);
const resetBuilding = useResetRecoilState(currentBuildingNameState);
@@ -69,7 +73,13 @@ const LeftMainNavContainer = ({ isAdmin }: { isAdmin?: boolean }) => {
.catch((error) => {
console.error(error);
});
- }, [currentBuilding, currentFloor, myInfo.cabinetId, numberOfAdminWork]);
+ }, [
+ currentBuilding,
+ currentFloor,
+ myCabinetInfo?.cabinetId,
+ numberOfAdminWork,
+ myCabinetInfo?.status,
+ ]);
const onClickFloorButton = (floor: number) => {
setCurrentFloor(floor);
diff --git a/frontend/src/components/Modals/CancelModal/CancelModal.tsx b/frontend/src/components/Modals/CancelModal/CancelModal.tsx
new file mode 100644
index 000000000..acc17c632
--- /dev/null
+++ b/frontend/src/components/Modals/CancelModal/CancelModal.tsx
@@ -0,0 +1,105 @@
+import React, { useState } from "react";
+import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
+import {
+ currentCabinetIdState,
+ isCurrentSectionRenderState,
+ myCabinetInfoState,
+ targetCabinetInfoState,
+ userState,
+} from "@/recoil/atoms";
+import Modal, { IModalContents } from "@/components/Modals/Modal";
+import ModalPortal from "@/components/Modals/ModalPortal";
+import {
+ FailResponseModal,
+ SuccessResponseModal,
+} from "@/components/Modals/ResponseModal/ResponseModal";
+import { additionalModalType, modalPropsMap } from "@/assets/data/maps";
+import checkIcon from "@/assets/images/checkIcon.svg";
+import { MyCabinetInfoResponseDto } from "@/types/dto/cabinet.dto";
+import {
+ axiosCabinetById,
+ axiosCancel,
+ axiosMyLentInfo,
+} from "@/api/axios/axios.custom";
+
+const CancelModal: React.FC<{
+ lentType: string;
+ closeModal: React.MouseEventHandler;
+}> = (props) => {
+ const [showResponseModal, setShowResponseModal] = useState(false);
+ const [hasErrorOnResponse, setHasErrorOnResponse] = useState(false);
+ const [modalTitle, setModalTitle] = useState("");
+ const [isLoading, setIsLoading] = useState(false);
+ const currentCabinetId = useRecoilValue(currentCabinetIdState);
+ const [myInfo, setMyInfo] = useRecoilState(userState);
+ const [myLentInfo, setMyLentInfo] =
+ useRecoilState(myCabinetInfoState);
+ const setTargetCabinetInfo = useSetRecoilState(targetCabinetInfoState);
+ const setIsCurrentSectionRender = useSetRecoilState(
+ isCurrentSectionRenderState
+ );
+ const cancelDetail = `제한 시간 내 2명 이상이 되면 대여가 완료됩니다.
+대기 취소 하시겠습니까?`;
+ const tryCancelRequest = async (e: React.MouseEvent) => {
+ setIsLoading(true);
+ try {
+ await axiosCancel(currentCabinetId);
+ //userCabinetId 세팅
+ setMyInfo({ ...myInfo, cabinetId: null });
+ setIsCurrentSectionRender(true);
+ setModalTitle("취소되었습니다");
+ // 캐비닛 상세정보 바꾸는 곳
+ try {
+ const { data } = await axiosCabinetById(currentCabinetId);
+ setTargetCabinetInfo(data);
+ } catch (error) {
+ throw error;
+ }
+ //userLentInfo 세팅
+ try {
+ const { data: myLentInfo } = await axiosMyLentInfo();
+ setMyLentInfo(myLentInfo);
+ } catch (error) {
+ throw error;
+ }
+ } catch (error: any) {
+ setHasErrorOnResponse(true);
+ setModalTitle(error.response.data.message);
+ } finally {
+ setIsLoading(false);
+ setShowResponseModal(true);
+ }
+ };
+
+ const returnModalContents: IModalContents = {
+ type: "hasProceedBtn",
+ icon: checkIcon,
+ title: modalPropsMap[additionalModalType.MODAL_CANCEL].title,
+ detail: cancelDetail,
+ proceedBtnText:
+ modalPropsMap[additionalModalType.MODAL_CANCEL].confirmMessage,
+ onClickProceed: tryCancelRequest,
+ closeModal: props.closeModal,
+ isLoading: isLoading,
+ };
+
+ return (
+
+ {!showResponseModal &&
+ );
+};
+
+export default CancelModal;
diff --git a/frontend/src/components/Modals/ExtendModal/ExtendModal.tsx b/frontend/src/components/Modals/ExtendModal/ExtendModal.tsx
new file mode 100644
index 000000000..a0127fe84
--- /dev/null
+++ b/frontend/src/components/Modals/ExtendModal/ExtendModal.tsx
@@ -0,0 +1,139 @@
+import React, { useState } from "react";
+import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
+import {
+ currentCabinetIdState,
+ isCurrentSectionRenderState,
+ myCabinetInfoState,
+ targetCabinetInfoState,
+ userState,
+} from "@/recoil/atoms";
+import Modal, { IModalContents } from "@/components/Modals/Modal";
+import ModalPortal from "@/components/Modals/ModalPortal";
+import {
+ FailResponseModal,
+ SuccessResponseModal,
+} from "@/components/Modals/ResponseModal/ResponseModal";
+import { additionalModalType, modalPropsMap } from "@/assets/data/maps";
+import checkIcon from "@/assets/images/checkIcon.svg";
+import { MyCabinetInfoResponseDto } from "@/types/dto/cabinet.dto";
+import {
+ axiosCabinetById,
+ axiosExtendLentPeriod,
+ axiosMyLentInfo, // axiosExtend, // TODO: 연장권 api 생성 후 연결해야 함
+} from "@/api/axios/axios.custom";
+import {
+ getExtendedDateString,
+ getLastDayofMonthString,
+} from "@/utils/dateUtils";
+
+const ExtendModal: React.FC<{
+ onClose: () => void;
+ cabinetId: Number;
+}> = (props) => {
+ const [showResponseModal, setShowResponseModal] = useState(false);
+ const [hasErrorOnResponse, setHasErrorOnResponse] = useState(false);
+ const [modalTitle, setModalTitle] = useState("");
+ const currentCabinetId = useRecoilValue(currentCabinetIdState);
+ const [myInfo, setMyInfo] = useRecoilState(userState);
+ const [myLentInfo, setMyLentInfo] =
+ useRecoilState(myCabinetInfoState);
+ const setTargetCabinetInfo = useSetRecoilState(targetCabinetInfoState);
+ const setIsCurrentSectionRender = useSetRecoilState(
+ isCurrentSectionRenderState
+ );
+ const formattedExtendedDate = getExtendedDateString(
+ myLentInfo.lents ? myLentInfo.lents[0].expiredAt : undefined
+ );
+ const extendDetail = `사물함 연장권 사용 시,
+ 대여 기간이 ${formattedExtendedDate} 23:59 으로
+ 연장됩니다.
+ 연장권 사용은 취소할 수 없습니다.
+ 연장권을 사용하시겠습니까?`;
+ const extendInfoDetail = `사물함을 대여하시면 연장권 사용이 가능합니다.
+연장권은 ${getLastDayofMonthString(
+ null
+ )} 23:59 이후 만료됩니다.`;
+ const getModalTitle = (cabinetId: number | null) => {
+ return cabinetId === null
+ ? modalPropsMap[additionalModalType.MODAL_OWN_EXTENSION].title
+ : modalPropsMap[additionalModalType.MODAL_USE_EXTENSION].title;
+ };
+ const getModalDetail = (cabinetId: number | null) => {
+ return cabinetId === null ? extendInfoDetail : extendDetail;
+ };
+ const getModalProceedBtnText = (cabinetId: number | null) => {
+ return cabinetId === null
+ ? modalPropsMap[additionalModalType.MODAL_OWN_EXTENSION].confirmMessage
+ : modalPropsMap[additionalModalType.MODAL_USE_EXTENSION].confirmMessage;
+ };
+ const tryExtendRequest = async (e: React.MouseEvent) => {
+ if (currentCabinetId === 0 || myInfo.cabinetId === null) {
+ setHasErrorOnResponse(true);
+ setModalTitle("현재 대여중인 사물함이 없습니다.");
+ setShowResponseModal(true);
+ return;
+ }
+ try {
+ await axiosExtendLentPeriod();
+ setMyInfo({
+ ...myInfo,
+ cabinetId: currentCabinetId,
+ extensible: false,
+ });
+ setIsCurrentSectionRender(true);
+ setModalTitle("연장되었습니다");
+ try {
+ const { data } = await axiosCabinetById(currentCabinetId);
+ setTargetCabinetInfo(data);
+ } catch (error) {
+ throw error;
+ }
+ try {
+ const { data: myLentInfo } = await axiosMyLentInfo();
+ setMyLentInfo(myLentInfo);
+ } catch (error) {
+ throw error;
+ }
+ } catch (error: any) {
+ setHasErrorOnResponse(true);
+ setModalTitle(error.response.data.message);
+ } finally {
+ setShowResponseModal(true);
+ }
+ };
+
+ const extendModalContents: IModalContents = {
+ type: myInfo.cabinetId === null ? "penaltyBtn" : "hasProceedBtn",
+ icon: checkIcon,
+ title: getModalTitle(myInfo.cabinetId),
+ detail: getModalDetail(myInfo.cabinetId),
+ proceedBtnText: getModalProceedBtnText(myInfo.cabinetId),
+ onClickProceed:
+ myInfo.cabinetId === null
+ ? async (e: React.MouseEvent) => {
+ props.onClose();
+ }
+ : tryExtendRequest,
+ closeModal: props.onClose,
+ };
+
+ return (
+
+ {!showResponseModal &&
+ );
+};
+
+export default ExtendModal;
diff --git a/frontend/src/components/Modals/InvitationCodeModal/InvitationCodeModal.container.tsx b/frontend/src/components/Modals/InvitationCodeModal/InvitationCodeModal.container.tsx
new file mode 100644
index 000000000..69741a59e
--- /dev/null
+++ b/frontend/src/components/Modals/InvitationCodeModal/InvitationCodeModal.container.tsx
@@ -0,0 +1,148 @@
+import React, { useState } from "react";
+import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
+import {
+ currentCabinetIdState,
+ isCurrentSectionRenderState,
+ myCabinetInfoState,
+ targetCabinetInfoState,
+} from "@/recoil/atoms";
+import { IModalContents } from "@/components/Modals/Modal";
+import ModalPortal from "@/components/Modals/ModalPortal";
+import PasswordContainer from "@/components/Modals/PasswordCheckModal/PasswordContainer";
+import {
+ FailResponseModal,
+ SuccessResponseModal,
+} from "@/components/Modals/ResponseModal/ResponseModal";
+import { modalPropsMap } from "@/assets/data/maps";
+import checkIcon from "@/assets/images/checkIcon.svg";
+import { MyCabinetInfoResponseDto } from "@/types/dto/cabinet.dto";
+import {
+ axiosCabinetById,
+ axiosLentShareId,
+ axiosMyLentInfo,
+} from "@/api/axios/axios.custom";
+import PasswordCheckModal from "../PasswordCheckModal/PasswordCheckModal";
+
+const InvitationCodeModalContainer: React.FC<{
+ onClose: () => void;
+ cabinetId: Number;
+}> = (props) => {
+ const [showResponseModal, setShowResponseModal] = useState(false);
+ const [hasErrorOnResponse, setHasErrorOnResponse] = useState(false);
+ const currentCabinetId = useRecoilValue(currentCabinetIdState);
+ const [modalTitle, setModalTitle] = useState("");
+ const [code, setCode] = useState("");
+ const setTargetCabinetInfo = useSetRecoilState(targetCabinetInfoState);
+ const setIsCurrentSectionRender = useSetRecoilState(
+ isCurrentSectionRenderState
+ );
+ const setMyLentInfo =
+ useSetRecoilState(myCabinetInfoState);
+
+ const loadSharedWrongCodeCounts = () => {
+ const savedData = localStorage.getItem("wrongCodeCounts");
+ if (savedData) {
+ try {
+ const { data, expirationTime } = JSON.parse(savedData);
+ const ExpirationTime = new Date(expirationTime);
+ if (ExpirationTime > new Date()) {
+ return data;
+ } else {
+ localStorage.removeItem("wrongCodeCounts");
+ }
+ } catch (error) {
+ console.error("WrongCodeCounts:", error);
+ }
+ }
+ return {};
+ };
+
+ const saveSharedWrongCodeCounts = (data: any) => {
+ const expirationTime = new Date(
+ new Date().getTime() + 10 * 60 * 1000
+ ).toString();
+ const dataToSave = JSON.stringify({ data, expirationTime });
+ localStorage.setItem("wrongCodeCounts", dataToSave);
+ };
+
+ const [sharedWrongCodeCounts] = useState(loadSharedWrongCodeCounts);
+
+ const onChange = (e: React.ChangeEvent) => {
+ const regex = /^[0-9]{0,4}$/;
+ if (!regex.test(e.target.value)) {
+ e.target.value = code;
+ return;
+ }
+ setCode(e.target.value);
+ };
+
+ const updatedCounts = {
+ ...sharedWrongCodeCounts,
+ [String(props.cabinetId)]:
+ (sharedWrongCodeCounts[String(props.cabinetId)] || 0) + 1,
+ };
+
+ const tryLentRequest = async () => {
+ try {
+ await axiosLentShareId(currentCabinetId, code);
+ setIsCurrentSectionRender(true);
+ setModalTitle("공유 사물함 대기열에 입장하였습니다");
+
+ // 병렬적으로 cabinet 과 lent info 불러오기
+ const [cabinetData, myLentData] = await Promise.all([
+ axiosCabinetById(currentCabinetId),
+ axiosMyLentInfo(),
+ ]);
+
+ setTargetCabinetInfo(cabinetData.data);
+ setMyLentInfo(myLentData.data);
+ } catch (error: any) {
+ const errorMessage = error.response.data.message;
+ setModalTitle(errorMessage);
+ setHasErrorOnResponse(true);
+ saveSharedWrongCodeCounts(updatedCounts);
+ } finally {
+ setShowResponseModal(true);
+ }
+ };
+
+ const InvititaionCodeModalContents: IModalContents = {
+ type: "hasProceedBtn",
+ icon: checkIcon,
+ title: modalPropsMap["MODAL_INVITATION_CODE"].title,
+ detail: `공유 사물함 입장을 위한
+ 초대 코드를 입력해 주세요.
+ 3번 이상 일치하지 않을 시 입장이 제한됩니다.`,
+ proceedBtnText: modalPropsMap["MODAL_INVITATION_CODE"].confirmMessage,
+ onClickProceed: tryLentRequest,
+ renderAdditionalComponent: () => (
+
+ {!showResponseModal && (
+
+ );
+};
+
+export default InvitationCodeModalContainer;
diff --git a/frontend/src/components/Modals/LentModal/LentModal.tsx b/frontend/src/components/Modals/LentModal/LentModal.tsx
index d79e996a6..555ada46e 100644
--- a/frontend/src/components/Modals/LentModal/LentModal.tsx
+++ b/frontend/src/components/Modals/LentModal/LentModal.tsx
@@ -20,6 +20,7 @@ import CabinetStatus from "@/types/enum/cabinet.status.enum";
import {
axiosCabinetById,
axiosLentId,
+ axiosLentShareId,
axiosMyLentInfo,
} from "@/api/axios/axios.custom";
import { getExpireDateString } from "@/utils/dateUtils";
@@ -46,28 +47,27 @@ const LentModal: React.FC<{
const formattedExpireDate = getExpireDateString(props.lentType);
const privateLentDetail = `대여기간은 ${formattedExpireDate} 23:59 까지 입니다.
귀중품 분실 및 메모 내용의 유출에 책임지지 않습니다.`;
- const shareLentDetail = `${
- targetCabinetInfo.lents.length > 0 &&
- targetCabinetInfo.lents[0].expiredAt !== null
- ? `대여기간은 ${formattedExpireDate} 23:59 까지 입니다.`
- : ""
- }
-대여 후 ${
- import.meta.env.VITE_SHARE_EARLY_RETURN_PERIOD
- }시간 이내 취소(반납) 시,
-${
- import.meta.env.VITE_SHARE_EARLY_RETURN_PENALTY
-}시간의 대여 불가 패널티가 적용됩니다.
-“메모 내용”은 공유 인원끼리 공유됩니다.
-귀중품 분실 및 메모 내용의 유출에 책임지지 않습니다.`;
+ const shareLentDetail = `대여 후 ${
+ 10
+ // import.meta.env.VITE_SHARE_LENT_COUNTDOWN // TODO: .env 에 등록하기
+ }분 이내에
+ 공유 인원 (2인~4인) 이 충족되지 않으면,
+ 공유 사물함의 대여가 취소됩니다.
+ “메모 내용”은 공유 인원끼리 공유됩니다.
+ 귀중품 분실 및 메모 내용의 유출에 책임지지 않습니다.`;
const tryLentRequest = async (e: React.MouseEvent) => {
setIsLoading(true);
try {
- await axiosLentId(currentCabinetId);
+ if (props.lentType == "SHARE")
+ await axiosLentShareId(currentCabinetId, "0");
+ else await axiosLentId(currentCabinetId);
//userCabinetId 세팅
- setMyInfo({ ...myInfo, cabinetId: currentCabinetId });
+ if (props.lentType != "SHARE")
+ setMyInfo({ ...myInfo, cabinetId: currentCabinetId });
setIsCurrentSectionRender(true);
- setModalTitle("대여가 완료되었습니다");
+ if (props.lentType == "SHARE")
+ setModalTitle("공유 사물함 대기열에 입장하였습니다");
+ else setModalTitle("대여가 완료되었습니다");
// 캐비닛 상세정보 바꾸는 곳
try {
const { data } = await axiosCabinetById(currentCabinetId);
diff --git a/frontend/src/components/Modals/ManualModal/ManualModal.tsx b/frontend/src/components/Modals/ManualModal/ManualModal.tsx
new file mode 100644
index 000000000..05faa5717
--- /dev/null
+++ b/frontend/src/components/Modals/ManualModal/ManualModal.tsx
@@ -0,0 +1,266 @@
+import React from "react";
+import { useState } from "react";
+import styled, { css, keyframes } from "styled-components";
+import { manualContentData } from "@/assets/data/ManualContent";
+import ContentStatus from "@/types/enum/content.status.enum";
+
+interface ModalProps {
+ isOpen: boolean;
+ contentStatus: ContentStatus;
+ onClose: () => void;
+}
+
+const ManualModal: React.FC = ({
+ isOpen,
+ contentStatus,
+ onClose,
+}) => {
+ if (!isOpen) return null;
+ const [modalIsOpen, setModalIsOpen] = useState(isOpen);
+ const contentData = manualContentData[contentStatus];
+
+ const isCabinetType =
+ contentStatus === ContentStatus.PRIVATE ||
+ contentStatus === ContentStatus.SHARE ||
+ contentStatus === ContentStatus.CLUB;
+
+ const handleModalClick = (e: React.MouseEvent) => {
+ if (e.target === e.currentTarget) {
+ setModalIsOpen(false);
+ setTimeout(() => {
+ onClose();
+ }, 400);
+ }
+ };
+
+ const closeModal = () => {
+ setModalIsOpen(false);
+ setTimeout(() => {
+ onClose();
+ }, 400);
+ };
+
+ return (
+
+
+
+
+
+
+
+
+ 대여기간
+ {contentData.rentalPeriod}
+
+
+ 사용인원
+ {contentData.capacity}
+
+
+ )}
+
+ {contentData.contentTitle}
+
+
+
+
+
+
+ );
+};
+
+const ModalOverlay = styled.div`
+ position: fixed;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 9999;
+`;
+
+const OpenModalAni = keyframes`
+ from {
+ transform: translateY(100%) scale(0.8);
+ opacity: 0;
+ }
+ to {
+ transform: translateY(0) scale(1);
+ opacity: 1;
+ }
+`;
+
+const CloseModalAni = keyframes`
+ from {
+ transform: translateY(0);
+ }
+ to {
+ transform: translateY(100%);
+ }
+`;
+
+const ModalWrapper = styled.div<{
+ background: string;
+ contentStatus: ContentStatus;
+ isOpen: boolean;
+}>`
+ animation: ${(props) => (props.isOpen ? OpenModalAni : CloseModalAni)} 0.4s
+ ease-in-out;
+ transform-origin: center;
+ position: fixed;
+ bottom: 0;
+ max-width: 1000px;
+ width: 70%;
+ height: 75%;
+ background: ${(props) => props.background};
+ padding: 40px 50px;
+ border-radius: 40px 40px 0 0;
+ border: ${(props) =>
+ props.contentStatus === ContentStatus.PENDING
+ ? "6px solid #9747FF"
+ : "none"};
+ border-bottom: none;
+ @media screen and (max-width: 650px) {
+ width: 100%;
+ overflow-y: auto;
+ }
+`;
+
+const ModalContent = styled.div<{
+ contentStatus: ContentStatus;
+}>`
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ color: ${(props) =>
+ props.contentStatus === ContentStatus.PENDING
+ ? "var(--main-color)"
+ : props.contentStatus === ContentStatus.EXTENSION
+ ? "black"
+ : "white"};
+ font-size: 40px;
+ font-weight: bold;
+ align-items: flex-start;
+ .contentImg {
+ width: 80px;
+ height: 80px;
+ filter: ${(props) =>
+ props.contentStatus === ContentStatus.EXTENSION
+ ? "brightness(0)"
+ : "brightness(100)"};
+ background-color: ${(props) =>
+ props.contentStatus === ContentStatus.PENDING
+ ? "var(--main-color)"
+ : "none"};
+ border-radius: ${(props) =>
+ props.contentStatus === ContentStatus.PENDING ? "50px" : "0px"};
+ }
+ @media screen and (max-width: 650px) {
+ font-size: 25px;
+ .contentImg {
+ width: 60px;
+ height: 60px;
+ margin-top: 10px;
+ }
+ }
+`;
+
+const CloseButton = styled.div<{
+ contentStatus: ContentStatus;
+}>`
+ width: 60px;
+ height: 15px;
+ cursor: pointer;
+ margin-bottom: 40px;
+ align-self: flex-end;
+ img {
+ filter: ${(props) =>
+ props.contentStatus === ContentStatus.EXTENSION
+ ? "brightness(0)"
+ : props.contentStatus === ContentStatus.PENDING
+ ? "none"
+ : "brightness(100)"};
+ transform: scaleX(-1);
+ }
+`;
+
+const BasicInfo = styled.div`
+ width: 100%;
+ margin-bottom: 30px;
+ display: flex;
+ justify-content: space-between;
+`;
+
+const BoxInfoWrap = styled.div`
+ display: flex;
+`;
+
+const BoxInfo1 = styled.div`
+ width: 100px;
+ height: 80px;
+ border: 1px solid white;
+ border-radius: 15px;
+ font-size: 14px;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ flex-direction: column;
+ align-self: flex-end;
+ strong {
+ margin-top: 10px;
+ }
+`;
+
+const BoxInfo2 = styled.div`
+ width: 80px;
+ height: 80px;
+ border: 1px solid white;
+ border-radius: 15px;
+ font-size: 14px;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ flex-direction: column;
+ margin-left: 10px;
+ strong {
+ margin-top: 10px;
+ }
+`;
+
+const ManualContentStyeld = styled.div<{
+ color: string;
+}>`
+ margin: 40px 0 0 10px;
+ font-size: 20px;
+ line-height: 1.9;
+ font-weight: 350;
+ strong {
+ color: ${(props) => props.color};
+ }
+ a {
+ font-weight: bold;
+ color: ${(props) => props.color};
+ }
+ @media screen and (max-width: 650px) {
+ line-height: 1.4;
+ font-size: 16px;
+ }
+`;
+
+export default ManualModal;
diff --git a/frontend/src/components/Modals/Modal.tsx b/frontend/src/components/Modals/Modal.tsx
index 56b52f72a..5f8e3c50c 100644
--- a/frontend/src/components/Modals/Modal.tsx
+++ b/frontend/src/components/Modals/Modal.tsx
@@ -89,7 +89,7 @@ const Modal: React.FC<{ modalContents: IModalContents }> = (props) => {
/>
)}
- {type === "panaltyBtn" && (
+ {type === "penaltyBtn" && (
{
diff --git a/frontend/src/components/Modals/OverduePenaltyModal/OverduePenaltyModal.tsx b/frontend/src/components/Modals/OverduePenaltyModal/OverduePenaltyModal.tsx
index 856e51858..2551273b9 100644
--- a/frontend/src/components/Modals/OverduePenaltyModal/OverduePenaltyModal.tsx
+++ b/frontend/src/components/Modals/OverduePenaltyModal/OverduePenaltyModal.tsx
@@ -47,7 +47,7 @@ const OverduePenaltyModal: React.FC<{
}, []);
const modalContents: IModalContents = {
- type: "panaltyBtn",
+ type: "penaltyBtn",
icon: errorIcon,
title: modalPropsMap[additionalModalType.MODAL_OVERDUE_PENALTY].title,
detail: penaltyDateDetail,
diff --git a/frontend/src/components/Modals/PasswordCheckModal/PasswordCheckModal.tsx b/frontend/src/components/Modals/PasswordCheckModal/PasswordCheckModal.tsx
index 51fa1c175..0a76b3d60 100644
--- a/frontend/src/components/Modals/PasswordCheckModal/PasswordCheckModal.tsx
+++ b/frontend/src/components/Modals/PasswordCheckModal/PasswordCheckModal.tsx
@@ -165,7 +165,7 @@ const ButtonWrapperStyled = styled.div`
display: flex;
flex-direction: column;
align-items: center;
- margin-top: 30px;
+ margin-top: 20px;
`;
export default PasswordCheckModal;
diff --git a/frontend/src/components/Modals/ReturnModal/ReturnModal.tsx b/frontend/src/components/Modals/ReturnModal/ReturnModal.tsx
index 162a52581..9eebbaf85 100644
--- a/frontend/src/components/Modals/ReturnModal/ReturnModal.tsx
+++ b/frontend/src/components/Modals/ReturnModal/ReturnModal.tsx
@@ -21,7 +21,10 @@ import {
axiosMyLentInfo,
axiosReturn,
} from "@/api/axios/axios.custom";
-import { getExpireDateString } from "@/utils/dateUtils";
+import {
+ getExpireDateString,
+ getShortenedExpireDateString,
+} from "@/utils/dateUtils";
const ReturnModal: React.FC<{
lentType: string;
@@ -44,12 +47,21 @@ const ReturnModal: React.FC<{
"myCabinet",
myLentInfo.lents ? myLentInfo.lents[0].expiredAt : undefined
);
+ const shortenedExpireDateString = getShortenedExpireDateString(
+ myLentInfo.lentType,
+ myLentInfo.lents ? myLentInfo.lents.length : 0,
+ myLentInfo.lents ? myLentInfo.lents[0].expiredAt : undefined
+ );
const returnDetail = `${
myLentInfo && myLentInfo.lents[0].expiredAt === null
? ""
+ : myLentInfo.lentType === "SHARE" && myLentInfo.lents.length > 1
+ ? `대여기간 이내 취소(반납) 시,
+대여 기간이 ${shortenedExpireDateString} 23:59 으로
+변경되는 패널티가 발생합니다.`
: `대여기간은 ${formattedExpireDate} 23:59 까지 입니다.`
}
-지금 반납 하시겠습니까?`;
+ 지금 반납 하시겠습니까?`;
const tryReturnRequest = async (e: React.MouseEvent) => {
setIsLoading(true);
try {
diff --git a/frontend/src/components/Modals/StatusModal/StatusModal.tsx b/frontend/src/components/Modals/StatusModal/StatusModal.tsx
index 39b7f5fce..613728b22 100644
--- a/frontend/src/components/Modals/StatusModal/StatusModal.tsx
+++ b/frontend/src/components/Modals/StatusModal/StatusModal.tsx
@@ -47,6 +47,8 @@ const TYPE_OPTIONS = [
const STATUS_OPTIONS = [
{ name: "사용 가능", value: CabinetStatus.AVAILABLE },
{ name: "사용 불가", value: CabinetStatus.BROKEN },
+ { name: "오픈 예정", value: CabinetStatus.PENDING },
+ { name: "대기중", value: CabinetStatus.IN_SESSION },
];
const StatusModal = ({
diff --git a/frontend/src/components/Modals/UnavailableModal/UnavailableModal.tsx b/frontend/src/components/Modals/UnavailableModal/UnavailableModal.tsx
index 2678e5f2b..6808c2c9e 100644
--- a/frontend/src/components/Modals/UnavailableModal/UnavailableModal.tsx
+++ b/frontend/src/components/Modals/UnavailableModal/UnavailableModal.tsx
@@ -13,7 +13,7 @@ const UnavailableModal: React.FC<{
const modalContents: IModalContents = {
type: "noBtn",
icon: errorIcon,
- title: modalPropsMap[props.status].title,
+ title: modalPropsMap[additionalModalType.MODAL_OVERDUE_PENALTY].title,
closeModal: props.closeModal,
};
diff --git a/frontend/src/components/TopNav/SearchBar/SearchBar.tsx b/frontend/src/components/TopNav/SearchBar/SearchBar.tsx
index 4ff4aa443..3c0f046b9 100644
--- a/frontend/src/components/TopNav/SearchBar/SearchBar.tsx
+++ b/frontend/src/components/TopNav/SearchBar/SearchBar.tsx
@@ -206,14 +206,14 @@ const SearchBarStyled = styled.div`
const SearchBarInputStyled = styled.input`
width: 300px;
height: 40px;
- border: 1px solid var(--white);
+ border: 1px solid #7b7b7b;
border-radius: 10px;
text-align: left;
padding: 0 20px;
- color: var(--white);
+ color: #7b7b7b;
background-color: rgba(255, 255, 255, 0.2);
&::placeholder {
- color: var(--white);
+ color: #7b7b7b;
}
`;
diff --git a/frontend/src/components/TopNav/TopNav.tsx b/frontend/src/components/TopNav/TopNav.tsx
index 28b6fc308..46033e80b 100644
--- a/frontend/src/components/TopNav/TopNav.tsx
+++ b/frontend/src/components/TopNav/TopNav.tsx
@@ -96,9 +96,10 @@ const TopNavContainerStyled = styled.nav`
display: flex;
justify-content: space-between;
align-items: center;
- background-color: var(--main-color);
+ background-color: white;
+ border-bottom: 1px solid #bcbcbc;
padding: 0 28px;
- color: var(--white);
+ color: var(--gray-color);
z-index: 10;
`;
diff --git a/frontend/src/components/TopNav/TopNavButtonGroup/TopNavButtonGroup.tsx b/frontend/src/components/TopNav/TopNavButtonGroup/TopNavButtonGroup.tsx
index c9243af63..09303d52c 100644
--- a/frontend/src/components/TopNav/TopNavButtonGroup/TopNavButtonGroup.tsx
+++ b/frontend/src/components/TopNav/TopNavButtonGroup/TopNavButtonGroup.tsx
@@ -3,17 +3,43 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
import styled from "styled-components";
import {
currentCabinetIdState,
+ myCabinetInfoState,
targetCabinetInfoState,
userState,
} from "@/recoil/atoms";
import TopNavButton from "@/components/TopNav/TopNavButtonGroup/TopNavButton/TopNavButton";
import { CabinetInfo } from "@/types/dto/cabinet.dto";
+import { LentDto } from "@/types/dto/lent.dto";
+import { UserDto } from "@/types/dto/user.dto";
+import CabinetStatus from "@/types/enum/cabinet.status.enum";
+import CabinetType from "@/types/enum/cabinet.type.enum";
import {
axiosCabinetById,
axiosDeleteCurrentBanLog,
} from "@/api/axios/axios.custom";
import useMenu from "@/hooks/useMenu";
+const getDefaultCabinetInfo = (myInfo: UserDto): CabinetInfo => ({
+ building: "",
+ floor: 0,
+ cabinetId: 0,
+ visibleNum: 0,
+ lentType: CabinetType.PRIVATE,
+ title: null,
+ maxUser: 0,
+ status: CabinetStatus.AVAILABLE,
+ section: "",
+ lents: [
+ {
+ userId: myInfo.userId,
+ name: myInfo.name,
+ lentHistoryId: 0,
+ startedAt: new Date(),
+ expiredAt: new Date(),
+ },
+ ] as LentDto[],
+ statusNote: "",
+});
const TopNavButtonGroup = ({ isAdmin }: { isAdmin?: boolean }) => {
const { toggleCabinet, toggleMap, openCabinet, closeAll } = useMenu();
const [currentCabinetId, setCurrentCabinetId] = useRecoilState(
@@ -22,43 +48,74 @@ const TopNavButtonGroup = ({ isAdmin }: { isAdmin?: boolean }) => {
const setTargetCabinetInfo = useSetRecoilState(
targetCabinetInfoState
);
- const myInfo = useRecoilValue(userState);
+ const [myInfo, setMyInfo] = useRecoilState(userState);
+ const [myCabinetInfo, setMyCabinetInfo] = useRecoilState(myCabinetInfoState);
const { pathname } = useLocation();
const navigator = useNavigate();
-
+ const defaultCabinetInfo = getDefaultCabinetInfo(myInfo);
+ const resetCabinetInfo = () => {
+ setMyCabinetInfo({
+ ...defaultCabinetInfo,
+ memo: "",
+ shareCode: 0,
+ previousUserName: "",
+ });
+ setTargetCabinetInfo(defaultCabinetInfo);
+ setCurrentCabinetId(0);
+ };
async function setTargetCabinetInfoToMyCabinet() {
- setCurrentCabinetId(myInfo.cabinetId);
+ if (myInfo.cabinetId === null && !myCabinetInfo?.cabinetId) {
+ resetCabinetInfo();
+ } else setCurrentCabinetId(myInfo.cabinetId);
+ setMyInfo((prev) => ({ ...prev, cabinetId: null }));
try {
- const { data } = await axiosCabinetById(myInfo.cabinetId);
- setTargetCabinetInfo(data);
+ if (!myCabinetInfo?.cabinetId) return;
+ const { data } = await axiosCabinetById(myCabinetInfo.cabinetId);
+ if (data.lents.length === 0 && myInfo.cabinetId !== null) {
+ resetCabinetInfo();
+ setMyInfo((prev) => ({ ...prev, cabinetId: null }));
+ } else {
+ setMyCabinetInfo((prev) => ({
+ ...data,
+ memo: "",
+ shareCode: prev.shareCode,
+ previousUserName: prev.previousUserName,
+ }));
+ const doesNameExist = data.lents.some(
+ (lent: LentDto) => lent.name === myInfo.name
+ );
+ if (doesNameExist) {
+ setTargetCabinetInfo(data);
+ setCurrentCabinetId(data.cabinetId);
+ setMyInfo((prev) => ({ ...prev, cabinetId: data.cabinetId }));
+ } else resetCabinetInfo();
+ }
} catch (error) {
console.log(error);
}
}
-
const clickMyCabinet = () => {
- if (myInfo.cabinetId === null) return;
- if (currentCabinetId !== myInfo.cabinetId) {
+ if (myInfo.cabinetId === null && !myCabinetInfo?.cabinetId) {
+ setTargetCabinetInfoToMyCabinet();
+ toggleCabinet();
+ } else if (currentCabinetId !== myInfo.cabinetId) {
setTargetCabinetInfoToMyCabinet();
openCabinet();
} else {
toggleCabinet();
}
};
-
const searchBarOn = () => {
document.getElementById("searchBar")!.classList.add("on");
document.getElementById("topNavLogo")!.classList.add("pushOut");
document.getElementById("topNavButtonGroup")!.classList.add("pushOut");
document.getElementById("topNavWrap")!.classList.add("pushOut");
};
-
const clickSearchButton = () => {
if (!pathname.includes("search")) navigator("search");
closeAll();
searchBarOn();
};
-
return (
{import.meta.env.VITE_UNBAN === "true" && (
@@ -79,11 +136,12 @@ const TopNavButtonGroup = ({ isAdmin }: { isAdmin?: boolean }) => {
disable={true}
/>
)}
-
);
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 6f559bcd4..937f91ad4 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -15,9 +15,11 @@
--mine: #47ffa7;
--expired: #ff4e4e;
--available: var(--main-color);
- --full: #d9d9d9;
+ --full: #eeeeee;
--broken: #3c3c3c;
--banned: #3c3c3c;
+ --session: #eeeeee;
+ --pending: #eeeeee;
/* font variable */
--main-font: "Noto Sans KR", sans-serif;
diff --git a/frontend/src/pages/Layout.tsx b/frontend/src/pages/Layout.tsx
index 369d06252..8fd118462 100644
--- a/frontend/src/pages/Layout.tsx
+++ b/frontend/src/pages/Layout.tsx
@@ -123,7 +123,7 @@ const WrapperStyled = styled.div`
const MainStyled = styled.main`
width: 100%;
height: 100%;
- overflow-y: scroll;
+ overflow-y: auto;
user-select: none;
`;
diff --git a/frontend/src/pages/MainPage.tsx b/frontend/src/pages/MainPage.tsx
index d80f5ff47..1e1fa4290 100644
--- a/frontend/src/pages/MainPage.tsx
+++ b/frontend/src/pages/MainPage.tsx
@@ -1,11 +1,38 @@
-import { useEffect, useRef } from "react";
-import { useRecoilState, useRecoilValue, useResetRecoilState } from "recoil";
+import { useEffect, useRef, useState } from "react";
+import {
+ useRecoilState,
+ useRecoilValue,
+ useResetRecoilState,
+ useSetRecoilState,
+} from "recoil";
import styled from "styled-components";
-import { currentSectionNameState } from "@/recoil/atoms";
-import { currentCabinetIdState, targetCabinetInfoState } from "@/recoil/atoms";
+import {
+ currentBuildingNameState,
+ currentCabinetIdState,
+ currentFloorCabinetState,
+ currentFloorNumberState,
+ currentSectionNameState,
+ myCabinetInfoState,
+ targetCabinetInfoState,
+ userState,
+} from "@/recoil/atoms";
import { currentFloorSectionState } from "@/recoil/selectors";
import CabinetListContainer from "@/components/CabinetList/CabinetList.container";
+import LoadingAnimation from "@/components/Common/LoadingAnimation";
import SectionPaginationContainer from "@/components/SectionPagination/SectionPagination.container";
+import {
+ CabinetBuildingFloorDto,
+ CabinetInfoByBuildingFloorDto,
+ CabinetPreviewInfo,
+ MyCabinetInfoResponseDto,
+} from "@/types/dto/cabinet.dto";
+import { UserDto, UserInfo } from "@/types/dto/user.dto";
+import {
+ axiosCabinetByBuildingFloor,
+ axiosCabinetById,
+ axiosMyInfo,
+ axiosMyLentInfo,
+} from "@/api/axios/axios.custom";
import useMenu from "@/hooks/useMenu";
const MainPage = () => {
@@ -36,6 +63,72 @@ const MainPage = () => {
const currentSectionIndex = sectionList.findIndex(
(sectionName) => sectionName === currentSectionName
);
+ const [isLoading, setIsLoading] = useState(false);
+ const currentBuilding = useRecoilValue(currentBuildingNameState);
+ const [currentFloor, setCurrentFloor] = useRecoilState(
+ currentFloorNumberState
+ );
+
+ const setCurrentFloorData = useSetRecoilState<
+ CabinetInfoByBuildingFloorDto[]
+ >(currentFloorCabinetState);
+ const setCurrentSection = useSetRecoilState(currentSectionNameState);
+ const [myInfo, setMyInfo] = useRecoilState(userState);
+ const [myCabinetInfo, setMyLentInfo] =
+ useRecoilState(myCabinetInfoState);
+
+ const [targetCabinetInfo, setTargetCabinetInfo] = useRecoilState(
+ targetCabinetInfoState
+ );
+ const [myInfoData, setMyInfoData] = useState(null);
+ const refreshCabinetList = async () => {
+ setIsLoading(true);
+ if (
+ myInfo.cabinetId !== myCabinetInfo.cabinetId &&
+ myCabinetInfo.cabinetId
+ ) {
+ try {
+ const { data: myLentInfo } = await axiosMyLentInfo();
+ setMyLentInfo(myLentInfo);
+ setMyInfo(myLentInfo.cabinetId);
+ } catch (error) {
+ throw error;
+ }
+ }
+ try {
+ await axiosCabinetByBuildingFloor(currentBuilding, currentFloor)
+ .then(async (response) => {
+ setCurrentFloorData(response.data);
+ let targetCabinet = null;
+ for (const cluster of response.data) {
+ targetCabinet = cluster.cabinets.find(
+ (cabinet: CabinetPreviewInfo) =>
+ cabinet.cabinetId === targetCabinetInfo?.cabinetId
+ );
+ if (targetCabinet) break;
+ }
+ if (
+ targetCabinet &&
+ (targetCabinet.userCount !== targetCabinetInfo.lents.length ||
+ targetCabinet.status !== targetCabinetInfo.status)
+ ) {
+ try {
+ let fullInfo = await axiosCabinetById(targetCabinet.cabinetId);
+ setTargetCabinetInfo(fullInfo.data);
+ } catch (error) {
+ console.log(error);
+ }
+ }
+ })
+ .catch((error) => {
+ console.error(error);
+ })
+ .finally(() => {});
+ } catch (error) {
+ console.log(error);
+ }
+ setIsLoading(false);
+ };
const swipeSection = (touchEndPosX: number, touchEndPosY: number) => {
const touchOffsetX = Math.round(touchEndPosX - touchStartPosX.current);
@@ -74,21 +167,35 @@ const MainPage = () => {
};
return (
- {
- touchStartPosX.current = e.changedTouches[0].screenX;
- touchStartPosY.current = e.changedTouches[0].screenY;
- }}
- onTouchEnd={(e: React.TouchEvent) => {
- swipeSection(e.changedTouches[0].screenX, e.changedTouches[0].screenY);
- }}
- >
-
-
-
+ <>
+ {isLoading && {
+ touchStartPosX.current = e.changedTouches[0].screenX;
+ touchStartPosY.current = e.changedTouches[0].screenY;
+ }}
+ onTouchEnd={(e: React.TouchEvent) => {
+ swipeSection(
+ e.changedTouches[0].screenX,
+ e.changedTouches[0].screenY
+ );
+ }}
+ >
+
+
+ 새로고침
+
+
+
+
);
};
@@ -107,4 +214,21 @@ const CabinetListWrapperStyled = styled.div`
padding-bottom: 30px;
`;
+const RefreshButtonStyled = styled.button`
+ max-width: 150px;
+ width: 100%;
+ height: 45px;
+ padding: 10px 40px 10px 40px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ font-size: 16px;
+ border-radius: 30px;
+ margin: 30px;
+ @media (max-height: 745px) {
+ margin-bottom: 8px;
+ }
+`;
+
export default MainPage;
diff --git a/frontend/src/recoil/atoms.ts b/frontend/src/recoil/atoms.ts
index 277c5ca77..dc1fa709b 100644
--- a/frontend/src/recoil/atoms.ts
+++ b/frontend/src/recoil/atoms.ts
@@ -10,8 +10,8 @@ import {
CabinetPreviewInfo,
MyCabinetInfoResponseDto,
} from "@/types/dto/cabinet.dto";
-import { UserDto, UserInfo } from "@/types/dto/user.dto";
import { ClubUserDto } from "@/types/dto/lent.dto";
+import { UserDto, UserInfo } from "@/types/dto/user.dto";
const { persistAtom } = recoilPersist();
@@ -21,6 +21,7 @@ export const userState = atom({
cabinetId: null,
userId: null,
name: "default",
+ extensible: false,
},
});
diff --git a/frontend/src/types/dto/cabinet.dto.ts b/frontend/src/types/dto/cabinet.dto.ts
index 141db7e07..e29e67987 100644
--- a/frontend/src/types/dto/cabinet.dto.ts
+++ b/frontend/src/types/dto/cabinet.dto.ts
@@ -6,6 +6,8 @@ import CabinetType from "@/types/enum/cabinet.type.enum";
// lentType을 LentType으로 변경 예정
export interface MyCabinetInfoResponseDto extends CabinetInfo {
memo: string; // 사물함 비밀번호와 관련된 메모
+ shareCode: number;
+ previousUserName: string;
}
export interface CabinetBuildingFloorDto {
@@ -33,6 +35,7 @@ export interface CabinetInfo {
section: string;
lents: LentDto[];
statusNote: string | null;
+ sessionExpiredAt?: Date;
}
export interface CabinetPreview {
diff --git a/frontend/src/types/dto/user.dto.ts b/frontend/src/types/dto/user.dto.ts
index 8998327a5..281dde5b9 100644
--- a/frontend/src/types/dto/user.dto.ts
+++ b/frontend/src/types/dto/user.dto.ts
@@ -6,6 +6,7 @@ export interface UserDto {
// TODO:
// mock 데이터와 충돌 생겨서 옵셔널 필드로 바꿨습니다. 추후 수정 필요합니다.
cabinetId: number | null; // 캐비닛 고유 ID
+ extensible: boolean;
}
export interface UserInfo {
diff --git a/frontend/src/types/enum/cabinet.status.enum.ts b/frontend/src/types/enum/cabinet.status.enum.ts
index 99a02e8cf..99526b82f 100644
--- a/frontend/src/types/enum/cabinet.status.enum.ts
+++ b/frontend/src/types/enum/cabinet.status.enum.ts
@@ -5,6 +5,8 @@ enum CabinetStatus {
OVERDUE = "OVERDUE",
BROKEN = "BROKEN",
BANNED = "BANNED",
+ IN_SESSION = "IN_SESSION",
+ PENDING = "PENDING",
}
export default CabinetStatus;
diff --git a/frontend/src/types/enum/content.status.enum.ts b/frontend/src/types/enum/content.status.enum.ts
new file mode 100644
index 000000000..cb348bd85
--- /dev/null
+++ b/frontend/src/types/enum/content.status.enum.ts
@@ -0,0 +1,10 @@
+export enum ContentStatus {
+ PRIVATE = "PRIVATE",
+ SHARE = "SHARE",
+ CLUB = "CLUB",
+ PENDING = "PENDING",
+ IN_SESSION = "IN_SESSION",
+ EXTENSION = "EXTENSION",
+}
+
+export default ContentStatus;
diff --git a/frontend/src/utils/dateUtils.ts b/frontend/src/utils/dateUtils.ts
index 81b509b43..1433798b6 100644
--- a/frontend/src/utils/dateUtils.ts
+++ b/frontend/src/utils/dateUtils.ts
@@ -1,3 +1,15 @@
+export const padTo2Digits = (num: number) => {
+ return num.toString().padStart(2, "0");
+};
+
+export const formatDate = (date: Date) => {
+ return [
+ date.getFullYear(),
+ padTo2Digits(date.getMonth() + 1),
+ padTo2Digits(date.getDate()),
+ ].join("/");
+};
+
export const getExpireDateString = (
lentType: string,
existExpireDate?: Date
@@ -8,23 +20,42 @@ export const getExpireDateString = (
? import.meta.env.VITE_SHARE_LENT_PERIOD
: import.meta.env.VITE_PRIVATE_LENT_PERIOD;
- if (!existExpireDate) {
+ if (!existExpireDate)
expireDate.setDate(expireDate.getDate() + parseInt(addDays));
- }
- const padTo2Digits = (num: number) => {
- return num.toString().padStart(2, "0");
- };
- const formatDate = (date: Date) => {
- return [
- date.getFullYear(),
- padTo2Digits(date.getMonth() + 1),
- padTo2Digits(date.getDate()),
- ].join("/");
- };
+ return formatDate(expireDate);
+};
+// 공유 사물함 반납 시 남은 대여일 수 차감 (원래 남은 대여일 수 * (남은 인원 / 원래 있던 인원))
+export const getShortenedExpireDateString = (
+ lentType: string,
+ currentNumUsers: number,
+ existExpireDate: Date | undefined
+) => {
+ if (lentType != "SHARE" || existExpireDate === undefined) return;
+ const dayInMilisec = 1000 * 60 * 60 * 24;
+ const expireDateInMilisec = new Date(existExpireDate).getTime();
+ let secondUntilExpire = expireDateInMilisec - new Date().getTime();
+ let daysUntilExpire = Math.ceil(secondUntilExpire / dayInMilisec) - 1;
+ let dateRemainig =
+ (daysUntilExpire * (currentNumUsers - 1)) / currentNumUsers;
+ let newExpireDate = new Date().getTime() + dateRemainig * dayInMilisec;
+ return formatDate(new Date(newExpireDate));
+};
+
+export const getExtendedDateString = (existExpireDate?: Date) => {
+ let expireDate = existExpireDate ? new Date(existExpireDate) : new Date();
+ expireDate.setDate(
+ expireDate.getDate() + parseInt(import.meta.env.VITE_EXTENDED_LENT_PERIOD)
+ );
return formatDate(expireDate);
};
+export const getLastDayofMonthString = (date: Date | null) => {
+ if (date === null) date = new Date();
+ let lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0);
+ return formatDate(lastDay);
+};
+
export const getTotalPage = (totalLength: number, size: number) => {
return Math.ceil(totalLength / size);
};
+ )}
+ {contentStatus !== ContentStatus.PENDING &&
+ contentStatus !== ContentStatus.IN_SESSION && (
+ 
+ )}
+ 
+
-
- 
- 
- 
-