release : 1.1.2 배포

Alarm-Module/src/main/java/com/pawith/alarmmodule/repository/AlarmBatchRepository.java

@@ -1,11 +1,9 @@
 package com.pawith.alarmmodule.repository;
 
 import com.pawith.alarmmodule.entity.Alarm;
+import com.pawith.commonmodule.domain.BatchInsertRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
-import java.util.Collection;
-
 @NoRepositoryBean
-public interface AlarmBatchRepository{
-    void saveAllBatch(Collection<Alarm> entities);
+public interface AlarmBatchRepository extends BatchInsertRepository<Alarm> {
 }

Alarm-Module/src/main/java/com/pawith/alarmmodule/repository/impl/AlarmBatchRepositoryImpl.java

@@ -15,7 +15,7 @@ public class AlarmBatchRepositoryImpl implements AlarmBatchRepository{
     private final JdbcTemplate jdbcTemplate;
 
     @Override
-    public void saveAllBatch(Collection<Alarm> entities) {
+    public void batchInsert(Collection<Alarm> entities) {
         final String insertSql = """
             INSERT INTO alarm (domain_id, message, alarm_category,is_read,alarm_user_id,created_at, updated_at)
             VALUES (?, ?, ?, ?, ?,now(),now())

Alarm-Module/src/main/java/com/pawith/alarmmodule/service/AlarmService.java

@@ -51,6 +51,6 @@ public void changeAllAlarmStatusToRead(){
     }
 
     public void saveAllAlarm(List<Alarm> alarms){
-        alarmBatchRepository.saveAllBatch(alarms);
+        alarmBatchRepository.batchInsert(alarms);
     }
 }

Common-Module/src/main/java/com/pawith/commonmodule/cache/DefaultCache.java

@@ -0,0 +1,63 @@
+package com.pawith.commonmodule.cache;
+
+import com.pawith.commonmodule.cache.operators.impl.ExpiredStorage;
+import lombok.RequiredArgsConstructor;
+import org.springframework.cache.Cache;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+@RequiredArgsConstructor
+public class DefaultCache extends ExpiredStorage<Object, Object> implements Cache {
+    private final String name;
+
+    public void setTimeToLive(long timeToLive, TimeUnit timeUnit) {
+        storage.setExpiration(timeToLive, timeUnit);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public Object getNativeCache() {
+        return storage;
+    }
+
+    @Override
+    public ValueWrapper get(Object key) {
+        Object value = storage.get(key);
+        return value == null ? null : () -> value;
+    }
+
+    @Override
+    public <T> T get(Object key, Class<T> type) {
+        return (T) storage.get(key);
+    }
+
+    @Override
+    public <T> T get(Object key, Callable<T> valueLoader) {
+        final Object value = storage.get(key);
+        try {
+            return value == null ? valueLoader.call() : (T) value;
+        } catch (Exception e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    @Override
+    public void put(Object key, Object value) {
+        storage.put(key, value);
+    }
+
+    @Override
+    public void evict(Object key) {
+        storage.remove(key);
+    }
+
+    @Override
+    public void clear() {
+        storage.clear();
+    }
+}

Common-Module/src/main/java/com/pawith/commonmodule/cache/DefaultCacheManger.java

@@ -0,0 +1,29 @@
+package com.pawith.commonmodule.cache;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+@RequiredArgsConstructor
+public class DefaultCacheManger implements CacheManager {
+    private static final Map<String, DefaultCache> caches = new ConcurrentHashMap<>();
+
+    public void setupTimeToLive(long timeToLive, TimeUnit timeUnit) {
+        caches.values().forEach(cache -> cache.setTimeToLive(timeToLive, timeUnit));
+    }
+
+    @Override
+    public Cache getCache(String name) {
+        return caches.computeIfAbsent(name, DefaultCache::new);
+    }
+
+    @Override
+    public Collection<String> getCacheNames() {
+        return caches.keySet();
+    }
+}

Common-Module/src/main/java/com/pawith/commonmodule/cache/config/CacheConfig.java

@@ -1,12 +1,18 @@
 package com.pawith.commonmodule.cache.config;
 
 import com.pawith.commonmodule.cache.CacheTemplate;
+import com.pawith.commonmodule.cache.DefaultCacheManger;
 import com.pawith.commonmodule.cache.DefaultCacheTemplate;
 import com.pawith.commonmodule.cache.operators.SetOperator;
 import com.pawith.commonmodule.cache.operators.ValueOperator;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.concurrent.TimeUnit;
+
+@EnableCaching
 @Configuration
 public class CacheConfig {
 
@@ -24,4 +30,11 @@ public SetOperator<?> setOperator() {
     public ValueOperator<?,?> valueOperator() {
         return cacheTemplate().opsForValue();
     }
+
+    @Bean
+    public CacheManager cacheManager() {
+        final DefaultCacheManger defaultCacheManger = new DefaultCacheManger();
+        defaultCacheManger.setupTimeToLive(10, TimeUnit.SECONDS);
+        return defaultCacheManger;
+    }
 }

Common-Module/src/main/java/com/pawith/commonmodule/cache/operators/ValueOperator.java

@@ -1,5 +1,6 @@
 package com.pawith.commonmodule.cache.operators;
 
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 public interface ValueOperator<K,V> {
@@ -10,6 +11,8 @@ public interface ValueOperator<K,V> {
 
     V get(K k);
 
+    Collection<K> getKeys();
+
     void remove(K k);
 
     boolean contains(K k);

Common-Module/src/main/java/com/pawith/commonmodule/cache/operators/impl/DefaultValueOperator.java

@@ -3,6 +3,7 @@
 import com.pawith.commonmodule.cache.operators.ValueOperator;
 import net.jodah.expiringmap.ExpirationPolicy;
 
+import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 
 public class DefaultValueOperator<K,V> extends ExpiredStorage<K,V> implements ValueOperator<K,V> {
@@ -21,6 +22,11 @@ public V get(K k) {
         return storage.get(k);
     }
 
+    @Override
+    public Collection<K> getKeys() {
+        return storage.keySet();
+    }
+
     @Override
     public void remove(K k) {
         storage.remove(k);

Common-Module/src/main/java/com/pawith/commonmodule/domain/BatchInsertRepository.java

@@ -0,0 +1,7 @@
+package com.pawith.commonmodule.domain;
+
+import java.util.Collection;
+
+public interface BatchInsertRepository<T> {
+    void batchInsert(Collection<T> entities);
+}

Common-Module/src/main/java/com/pawith/commonmodule/event/UserAccountDeleteEvent.java

@@ -1,10 +1,4 @@
 package com.pawith.commonmodule.event;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public class UserAccountDeleteEvent {
-    private final Long userId;
+public record UserAccountDeleteEvent(Long userId) {
 }

Common-Module/src/main/java/com/pawith/commonmodule/event/UserSignUpEvent.java

@@ -1,17 +1,10 @@
 package com.pawith.commonmodule.event;
 
 import com.pawith.commonmodule.enums.Provider;
-import lombok.*;
 
-@Getter
-public class UserSignUpEvent {
-    private String nickname;
-    private String email;
-    private Provider provider;
-
-    public UserSignUpEvent(String nickname, String email, Provider provider) {
-        this.nickname = nickname;
-        this.email = email;
-        this.provider = provider;
-    }
+public record UserSignUpEvent(
+    String nickname,
+    String email,
+    Provider provider
+) {
 }

Domain-Module/Auth-Module/Auth-Domain/src/main/java/com/pawith/authdomain/jwt/JWTProvider.java

@@ -52,18 +52,6 @@ public Token generateToken(final String email){
         return new Token(accessToken, refreshToken);
     }
 
-    /**
-     * refresh token을 이용하여 access token 재발급
-     *
-     * @throws InvalidTokenException : 잘못된 토큰 요청시 발생
-     * @throws ExpiredTokenException : 만료된 토큰 요청시 발생
-     */
-    public String reIssueAccessToken(final String refreshToken) {
-        validateToken(refreshToken, TokenType.REFRESH_TOKEN);
-        final String email = extractEmailFromToken(refreshToken, TokenType.REFRESH_TOKEN);
-        return generateAccessToken(email);
-    }
-
     public Token reIssueToken(final String refreshToken){
         validateToken(refreshToken, TokenType.REFRESH_TOKEN);
         final String email = extractEmailFromToken(refreshToken, TokenType.REFRESH_TOKEN);
@@ -75,18 +63,6 @@ public Token reIssueToken(final String refreshToken){
         return new Token(newAccessToken, newRefreshToken);
     }
 
-    /**
-     * refresh token을 이용하여 refresh token 재발급
-     *
-     * @throws InvalidTokenException : 잘못된 토큰 요청시 발생
-     * @TODO : RefreshToken 인증 범위 결정
-     */
-    public String reIssueRefreshToken(final String refreshToken) {
-        validateToken(refreshToken, TokenType.REFRESH_TOKEN);
-        final String email = extractEmailFromToken(refreshToken, TokenType.REFRESH_TOKEN);
-        return generateRefreshToken(email);
-    }
-
     public String extractEmailFromToken(String token, TokenType tokenType) {
         return initializeJwtParser(tokenType)
             .parseClaimsJws(token)

Domain-Module/Auth-Module/Auth-Domain/src/main/java/com/pawith/authdomain/jwt/TokenType.java

@@ -1,8 +1,6 @@
 package com.pawith.authdomain.jwt;
 
-import lombok.Getter;
 
-@Getter
 public enum TokenType {
     ACCESS_TOKEN,
     REFRESH_TOKEN

Domain-Module/Auth-Module/Auth-Domain/src/test/java/com/pawith/authdomain/jwt/JWTProviderTest.java

@@ -58,20 +58,6 @@ void generateRefreshTokenByEmail(){
         Assertions.assertThat(body.get(JWTConsts.TOKEN_TYPE)).isEqualTo(TokenType.REFRESH_TOKEN.toString());
     }
 
-    @Test
-    @DisplayName("refreshToken이 만료되었을 때, accessToken 재발급시 예외가 발생한다.")
-    @SneakyThrows
-    void reIssueAccessTokenWithExpiredRefreshToken(){
-        //given
-        final String randomEmail = FixtureMonkeyUtils.getConstructBasedFixtureMonkey().giveMeOne(String.class);
-        final String refreshToken = jwtProvider.generateRefreshToken(randomEmail);
-        Thread.sleep(JWTTestConsts.REFRESH_TOKEN_EXPIRED_TIME+1);
-        //when
-        //then
-        Assertions.assertThatCode(() -> jwtProvider.reIssueAccessToken(refreshToken))
-            .isInstanceOf(ExpiredTokenException.class);
-    }
-
     @Test
     @DisplayName("validateToken 메소드에 잘못된 token이 입력되면 InvalidTokenException 예외가 발생한다.")
     void validateTokenWithInvalidToken(){

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/dto/response/TodoNotificationInfoResponse.java

@@ -1,15 +1,19 @@
 package com.pawith.todoapplication.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import com.pawith.tododomain.entity.TodoNotification;
 
 import java.time.LocalTime;
+import java.util.Optional;
+import java.util.function.Supplier;
 
-@AllArgsConstructor
-@Getter
-public class TodoNotificationInfoResponse {
-    private Boolean isNotification;
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private LocalTime notificationTime;
+public record TodoNotificationInfoResponse(
+    Boolean isNotification,
+    @JsonInclude(JsonInclude.Include.NON_NULL) LocalTime notificationTime
+) {
+    public static TodoNotificationInfoResponse of(Supplier<Optional<TodoNotification>> todoNotificationSupplier) {
+        return todoNotificationSupplier.get()
+            .map(todoNotification -> new TodoNotificationInfoResponse(true, todoNotification.getNotificationTime()))
+            .orElse(new TodoNotificationInfoResponse(false, null));
+    }
 }

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/dto/response/TodoTeamInfoResponse.java

@@ -12,5 +12,5 @@ public class TodoTeamInfoResponse {
     private String teamProfileImageUrl;
     private String teamName;
     private Authority authority;
-    private Integer registerPeriod;
+    private Long registerPeriod;
 }

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/dto/response/ValidateResponse.java

@@ -0,0 +1,4 @@
+package com.pawith.todoapplication.dto.response;
+
+public record ValidateResponse(Boolean isNotValidate) {
+}

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/handler/IncompleteTodoCountNotificationHandler.java

@@ -56,7 +56,7 @@ private void cachingUserInfo(List<IncompleteTodoCountInfoDao> executionResult) {
             .map(IncompleteTodoCountInfoDao::getUserId)
             .filter(userId -> !valueOperator.contains(userId))
             .toList();
-        userQueryService.findUserMapByIds(userIds)
+        userQueryService.findMapWithUserIdKeyByIds(userIds)
             .forEach((userId, user) -> valueOperator.setWithExpire(userId, user.getNickname(), 1, TimeUnit.MINUTES));
     }
 }

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/handler/TodoCompletionCheckOnTodoHandler.java

@@ -26,8 +26,8 @@ public class TodoCompletionCheckOnTodoHandler {
     public void changeTodoStatus(TodoCompletionCheckEvent todoCompletionCheckEvent) throws InterruptedException {
         while(true) {
             try {
-                final List<Assign> assigns = assignQueryService.findAllAssignByTodoId(todoCompletionCheckEvent.getTodoId());
-                final Todo todo = todoQueryService.findTodoByTodoId(todoCompletionCheckEvent.getTodoId());
+                final List<Assign> assigns = assignQueryService.findAllAssignByTodoId(todoCompletionCheckEvent.todoId());
+                final Todo todo = todoQueryService.findTodoByTodoId(todoCompletionCheckEvent.todoId());
                 final boolean isAllCompleteTodo = assigns.stream().allMatch(Assign::isCompleted);
                 todo.updateCompletionStatus(isAllCompleteTodo);
                 break;

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/handler/UserAccountDeleteOnTodoHandler.java

@@ -27,7 +27,7 @@ public class UserAccountDeleteOnTodoHandler {
 
     @EventListener
     public void deleteUserInfo(UserAccountDeleteEvent userAccountDeleteEvent) {
-        final List<Register> registers = registerQueryService.findAllRegistersByUserId(userAccountDeleteEvent.getUserId());
+        final List<Register> registers = registerQueryService.findAllRegistersByUserId(userAccountDeleteEvent.userId());
         final List<Long> registerIds = registers.stream()
             .map(Register::getId)
             .collect(Collectors.toList());

Domain-Module/Todo-Module/Todo-Application/src/main/java/com/pawith/todoapplication/handler/event/TodoCompletionCheckEvent.java

@@ -1,10 +1,4 @@
 package com.pawith.todoapplication.handler.event;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public class TodoCompletionCheckEvent {
-    private final Long todoId;
+public record TodoCompletionCheckEvent(Long todoId) {
 }