diff --git a/README.md b/README.md index 7bbf0f042..a82391a55 100644 --- a/README.md +++ b/README.md @@ -163,27 +163,7 @@
-| [πŸ‡dongglee](https://github.com/leedonggyu1848) | [πŸ‘ eunbikim](https://github.com/eunbi9n) | [πŸ₯” gyuwlee](https://github.com/gyutato) | [🐬huchoi](https://github.com/hunjin-choi) | [πŸ‘» hybae](https://github.com/HyeonsikBae) | -| ----------------------------------------------- | ----------------------------------------- | ---------------------------------------- | ------------------------------------------ | ------------------------------------------ | - -| [πŸ’ hyoon](https://github.com/kamg2218) | [🍏 hyospark](https://github.com/kyoshong) | [πŸ™‰ inshin](https://github.com/42inshin) | [πŸ§‘β€βœˆοΈ jaesjeon](https://github.com/Oris482) | [🐢 jiwchoi](https://github.com/jiwon-choi) | -| --------------------------------------- | ------------------------------------------ | ---------------------------------------- | ----------------------------------------- | ------------------------------------------- | - -| [🐯 joopark](https://github.com/joohongpark) | [πŸš€sanan](https://github.com/Ssuamje) | [🐻 seuan](https://github.com/aseungbo) | [πŸ€‘seycho](https://github.com/SeyoungCho) | [😺 sichoi](https://github.com/sichoi42) | -| -------------------------------------------- | ------------------------------------- | --------------------------------------- | ----------------------------------------- | ---------------------------------------- | - -| [🍎 skim](https://github.com/subin195-09) | [πŸͺ spark](https://github.com/Hyunja27) | [✏️yooh](https://github.com/oyhoyhk) | [πŸͺ€ yoyoo](https://github.com/Yoowatney) | [πŸŽ’ yubchoi](https://github.com/yubinquitous) | -| ----------------------------------------- | --------------------------------------- | ------------------------------------ | ---------------------------------------- | --------------------------------------------- | - -| [ πŸŒ‘ daewoole](https://github.com/LeeDaeWook) | [🐝 hyungnoh](https://github.com/YESHYUNGSEOK) | [πŸ»β€β„οΈ jpark2](https://github.com/Z1park) | [🎨 jusohn](https://github.com/junyoung2015) | [πŸ€“ seonghmo ](https://github.com/seong-hui) | [πŸš€ wchae](https://github.com/enaenen) | -| --------------------------------------------- | ---------------------------------------------- | -------------------------------------- | -------------------------------------------- | -------------------------------------------- | -------------------------------------- | - -| [ 🐢 surlee](https://github.com/Elineely) | [ 🐣 hyowchoi](https://github.com/chyo1/) | [ πŸ‘½ sohyupar](https://github.com/saewoo1) | [🦝 jimchoi](https://github.com/jimchoi9) | [ πŸ›Ό jeekim](https://github.com/jnkeniaem) | [🍾 miyu](https://github.com/Minkyu01) | [🧸 gykoh](https://github.com/gykoh42) | -| ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- | - -| [ 🐰 jihykim2](https://github.com/jihyunk03) | [⛄️ seonmiki](https://github.com/seonmiki) | [ 🎱 junsbae ](https://github.com/wet6123) | -| -------------------------------------------- | ------------------------------------------- | ------------------------------------------ | - +[🦝 jimchoi](https://github.com/jimchoi9) | | | | --------------------------------------------------------------------------------------------------------------------------------------------------------- | 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 8450a140c..421414f91 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 @@ -187,13 +187,7 @@ public void writeMemo(String memo) { @Override public boolean equals(final Object other) { - if (this == other) { - return true; - } - if (!(other instanceof Cabinet)) { - return false; - } - return this.id.equals(((Cabinet) other).id); + return true; } @Override diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java index 6d2b57f0c..63cb37af8 100644 --- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java +++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentRedisService.java @@ -1,21 +1,5 @@ package org.ftclub.cabinet.lent.service; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Comparator; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; -import lombok.RequiredArgsConstructor; -import org.ftclub.cabinet.config.CabinetProperties; -import org.ftclub.cabinet.exception.ExceptionStatus; -import org.ftclub.cabinet.lent.domain.LentHistory; -import org.ftclub.cabinet.lent.repository.LentRedis; -import org.ftclub.cabinet.lent.repository.LentRepository; -import org.ftclub.cabinet.log.LogLevel; -import org.ftclub.cabinet.log.Logging; -import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor diff --git a/config b/config index 99f396c81..f05053fff 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 99f396c81c299a69606848279d7beefb650453fb +Subproject commit f05053fff8f24d8fc3b535c6fcf9c7c98341e691 diff --git a/frontend/index.html b/frontend/index.html index c396ca30e..34ae5bf61 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -8,7 +8,7 @@ } /> } /> + λ©”λ‘±λ©”λ‘±πŸ‘… }> } /> } />