Merge pull request #46 from devpalsPlus/Dev

Dev

Author: HeWillGoTillTheEnd

src/main/java/hs/kr/backend/devpals/domain/user/repository/AlarmRepository.java

@@ -20,10 +20,10 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, Long> {
     Optional<AlarmEntity> findByReceiverIdAndAlarmId(@Param("receiverId") Long receiverId, @Param("alarmId") Long alarmId);
 
     @Modifying
-    @Query("DELETE FROM AlarmEntity a WHERE a.createdAt < :threshold AND TYPE(a) <> ApplicantAlarmEntity")
+    @Query("DELETE FROM AlarmEntity a WHERE a.createdAt < :threshold")
     void deleteAllOlderThanExceptApplied(@Param("threshold") LocalDateTime threshold);
 
-    @Query("SELECT DISTINCT a.receiver.id FROM AlarmEntity a WHERE a.createdAt < :date AND TYPE(a) <> ApplicantAlarmEntity")
+    @Query("SELECT DISTINCT a.receiver.id FROM AlarmEntity a WHERE a.createdAt < :date")
     List<Long> findUserIdsWithAlarmsOlderThan(@Param("date") LocalDateTime date);
 
 }

src/main/java/hs/kr/backend/devpals/domain/user/service/UserAlarmService.java

@@ -98,8 +98,7 @@ public ResponseEntity<ApiResponse<String>> deleteAlarm(String token, Long alarmI
         Long userId = jwtTokenValidator.getUserId(token);
         AlarmEntity alarmEntity
                 = alarmRepository.findByReceiverIdAndAlarmId(userId, alarmId).orElseThrow(() -> new CustomException(ErrorException.ALARM_NOT_FOUND));
-        if(alarmEntity.getAlarmFilterIntValue().equals(AlarmFilter.APPLIED_PROJECTS.getValue()))
-            throw new CustomException(ErrorException.CAN_NOT_DELETE_ALARM);
+
         alarmRepository.delete(alarmEntity);
 
         refreshCacheUserAlarm(userId);

src/main/java/hs/kr/backend/devpals/global/common/enums/ReplierFilter.java

@@ -29,10 +29,6 @@ public enum ReplierFilter {
         this.value = value;
     }
 
-    @JsonValue
-    public String getDisplayName() {
-        return displayName;
-    }
     @JsonValue
     public Integer getValue() {
         return value;