Merge pull request #195 from FEBFES/feature/191/task-deadline

191 - task deadline
FEBFES · Jun 6, 2024 · ded3646 · ded3646
2 parents 4577312 + 404583f
commit ded3646
Show file tree

Hide file tree

Showing 22 changed files with 95 additions and 64 deletions.
diff --git a/src/main/java/com/febfes/fftmback/domain/dao/RefreshTokenEntity.java b/src/main/java/com/febfes/fftmback/domain/dao/RefreshTokenEntity.java
@@ -5,7 +5,7 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @Entity
 @Table(name = "refresh_token")
@@ -29,6 +29,6 @@ public class RefreshTokenEntity extends BaseEntity {
     private String token;
 
     @Column(name = "expiry_date", nullable = false)
-    private Date expiryDate;
+    private LocalDateTime expiryDate;
 
 }
diff --git a/src/main/java/com/febfes/fftmback/domain/dao/TaskEntity.java b/src/main/java/com/febfes/fftmback/domain/dao/TaskEntity.java
@@ -10,7 +10,7 @@
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.UpdateTimestamp;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 
 @Entity
@@ -55,7 +55,10 @@ public class TaskEntity extends OrderedEntity {
 
     @Column(name = "update_date")
     @UpdateTimestamp
-    private Date updateDate;
+    private LocalDateTime updateDate;
+
+    @Column(name = "deadline_date")
+    private LocalDateTime deadlineDate;
 
     @Override
     public String getColumnToFindOrder() {

diff --git a/src/main/java/com/febfes/fftmback/domain/dao/TaskView.java b/src/main/java/com/febfes/fftmback/domain/dao/TaskView.java
@@ -6,7 +6,7 @@
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @Entity
 @Table(name = "v_task")
@@ -51,5 +51,8 @@ public class TaskView extends OrderedView {
     private Long filesCounter;
 
     @Column(name = "\"updateDate\"")
-    private Date updateDate;
+    private LocalDateTime updateDate;
+
+    @Column(name = "\"deadlineDate\"")
+    private LocalDateTime deadlineDate;
 }
diff --git a/src/main/java/com/febfes/fftmback/domain/dao/abstracts/BaseEntity.java b/src/main/java/com/febfes/fftmback/domain/dao/abstracts/BaseEntity.java
@@ -5,7 +5,7 @@
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.CreationTimestamp;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @MappedSuperclass
 @SuperBuilder
@@ -22,5 +22,5 @@ public abstract class BaseEntity {
 
     @Column(name = "create_date", updatable = false)
     @CreationTimestamp
-    private Date createDate;
+    private LocalDateTime createDate;
 }
diff --git a/src/main/java/com/febfes/fftmback/domain/dao/abstracts/BaseView.java b/src/main/java/com/febfes/fftmback/domain/dao/abstracts/BaseView.java
@@ -5,7 +5,7 @@
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.CreationTimestamp;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @MappedSuperclass
 @SuperBuilder
@@ -23,5 +23,5 @@ public abstract class BaseView {
 
     @Column(name = "\"createDate\"", updatable = false)
     @CreationTimestamp
-    private Date createDate;
+    private LocalDateTime createDate;
 }
diff --git a/src/main/java/com/febfes/fftmback/domain/projection/ProjectForUserProjection.java b/src/main/java/com/febfes/fftmback/domain/projection/ProjectForUserProjection.java
@@ -1,6 +1,6 @@
 package com.febfes.fftmback.domain.projection;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public interface ProjectForUserProjection {
 
@@ -10,7 +10,7 @@ public interface ProjectForUserProjection {
 
     String getDescription();
 
-    Date getCreateDate();
+    LocalDateTime getCreateDate();
 
     Long getOwnerId();
 

diff --git a/src/main/java/com/febfes/fftmback/domain/projection/ProjectProjection.java b/src/main/java/com/febfes/fftmback/domain/projection/ProjectProjection.java
@@ -1,6 +1,6 @@
 package com.febfes.fftmback.domain.projection;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public interface ProjectProjection {
 
@@ -10,7 +10,7 @@ public interface ProjectProjection {
 
     String getDescription();
 
-    Date getCreateDate();
+    LocalDateTime getCreateDate();
 
     Long getOwnerId();
 

diff --git a/src/main/java/com/febfes/fftmback/dto/ColumnDto.java b/src/main/java/com/febfes/fftmback/dto/ColumnDto.java
@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @Builder
 public record ColumnDto(
@@ -15,7 +15,7 @@ public record ColumnDto(
         String name,
 
         @Schema(accessMode = Schema.AccessMode.READ_ONLY)
-        Date createDate,
+        LocalDateTime createDate,
 
         @Schema(description = "Column order on the board. Starts at 1")
         Integer order,

diff --git a/src/main/java/com/febfes/fftmback/dto/EditTaskDto.java b/src/main/java/com/febfes/fftmback/dto/EditTaskDto.java
@@ -3,19 +3,17 @@
 import com.febfes.fftmback.domain.common.TaskPriority;
 import jakarta.validation.constraints.NotBlank;
 
+import java.time.LocalDateTime;
+
 public record EditTaskDto(
 
         @NotBlank(message = "Invalid Name: Empty name")
         String name,
-
         String description,
-
         Long assigneeId,
-
         TaskPriority priority,
-
         String type,
-
-        Integer order
+        Integer order,
+        LocalDateTime deadlineDate
 ) {
 }
diff --git a/src/main/java/com/febfes/fftmback/dto/OneProjectDto.java b/src/main/java/com/febfes/fftmback/dto/OneProjectDto.java
@@ -1,13 +1,13 @@
 package com.febfes.fftmback.dto;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public record OneProjectDto(
         Long id,
         String name,
         String description,
-        Date createDate,
+        LocalDateTime createDate,
         Boolean isFavourite,
         List<MemberDto> members,
         RoleDto userRoleOnProject

diff --git a/src/main/java/com/febfes/fftmback/dto/ProjectDto.java b/src/main/java/com/febfes/fftmback/dto/ProjectDto.java
@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @Builder
 public record ProjectDto(
@@ -18,7 +18,7 @@ public record ProjectDto(
         String description,
 
         @Schema(accessMode = Schema.AccessMode.READ_ONLY)
-        Date createDate,
+        LocalDateTime createDate,
 
         @Schema(accessMode = Schema.AccessMode.READ_ONLY)
         Long ownerId,

diff --git a/src/main/java/com/febfes/fftmback/dto/TaskDto.java b/src/main/java/com/febfes/fftmback/dto/TaskDto.java
@@ -3,26 +3,26 @@
 import com.febfes.fftmback.domain.common.TaskPriority;
 import lombok.Builder;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Builder
 public record TaskDto(
 
-        Long id,
-        String name,
-        String description,
-        Date createDate,
-        Long projectId,
-        Long columnId,
-        TaskPriority priority,
-        String type,
-        Long filesCounter,
-        List<TaskFileDto> files,
-        UserDto owner,
-        UserDto assignee,
-
-        Date updateDate
+        Long id
+        , String name
+        , String description
+        , LocalDateTime createDate
+        , Long projectId
+        , Long columnId
+        , TaskPriority priority
+        , String type
+        , Long filesCounter
+        , List<TaskFileDto> files
+        , UserDto owner
+        , UserDto assignee
+        , LocalDateTime updateDate
+        , LocalDateTime deadlineDate
 ) {
 
 }
diff --git a/src/main/java/com/febfes/fftmback/dto/TaskFileDto.java b/src/main/java/com/febfes/fftmback/dto/TaskFileDto.java
@@ -1,12 +1,12 @@
 package com.febfes.fftmback.dto;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public record TaskFileDto(
 
         Long id,
 
-        Date createDate,
+        LocalDateTime createDate,
 
         Long userId,
 

diff --git a/src/main/java/com/febfes/fftmback/dto/TaskShortDto.java b/src/main/java/com/febfes/fftmback/dto/TaskShortDto.java
@@ -2,21 +2,22 @@
 
 import com.febfes.fftmback.domain.common.TaskPriority;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public record TaskShortDto(
         Long id,
         String name,
         String description,
         Long columnId,
         Long projectId,
-        Date createDate,
+        LocalDateTime createDate,
         TaskPriority priority,
         String type,
         Long filesCounter,
         UserDto owner,
         UserDto assignee,
-        Date updateDate,
-        Integer order
+        LocalDateTime updateDate,
+        Integer order,
+        LocalDateTime deadlineDate
 ) {
 }
diff --git a/src/main/java/com/febfes/fftmback/dto/error/ErrorDto.java b/src/main/java/com/febfes/fftmback/dto/error/ErrorDto.java
@@ -1,14 +1,14 @@
 package com.febfes.fftmback.dto.error;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.Map;
 
 public record ErrorDto(
 
         Integer statusCode,
         StatusError status,
         ErrorType errorType,
-        Date timestamp,
+        LocalDateTime timestamp,
         String message,
         Map<String, ?> error
 ) {

diff --git a/src/main/java/com/febfes/fftmback/exception/ControllerAdvisor.java b/src/main/java/com/febfes/fftmback/exception/ControllerAdvisor.java
@@ -4,7 +4,6 @@
 import com.febfes.fftmback.dto.error.ErrorDto;
 import com.febfes.fftmback.dto.error.ErrorType;
 import com.febfes.fftmback.dto.error.StatusError;
-import com.febfes.fftmback.util.DateUtils;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.RequiredArgsConstructor;
@@ -20,6 +19,7 @@
 import java.util.Map;
 
 import static com.febfes.fftmback.dto.error.AuthError.createBaseError;
+import static com.febfes.fftmback.util.DateUtils.getCurrentLocalDateTime;
 import static java.util.Objects.isNull;
 
 @RestControllerAdvice
@@ -62,7 +62,7 @@ public ErrorDto handleConstraintViolationException(
                 .orElse(Collections.emptyMap());
         log.error(LOG_MSG.formatted(ex.getClass().getSimpleName()), ex);
         return new ErrorDto(HttpStatus.UNPROCESSABLE_ENTITY.value(), StatusError.ARGUMENT_NOT_VALID,
-                errorType, DateUtils.getCurrentDate(), ex.getMessage(), errorMap);
+                errorType, getCurrentLocalDateTime(), ex.getMessage(), errorMap);
     }
 
     @ExceptionHandler({ExpiredJwtException.class, TokenExpiredException.class})
@@ -94,7 +94,7 @@ public ErrorDto handleBadCredentialsException(
         ErrorType errorType = ErrorType.AUTH;
         log.error(LOG_MSG.formatted(ex.getClass().getSimpleName()), ex);
         return new ErrorDto(HttpStatus.UNPROCESSABLE_ENTITY.value(), StatusError.BAD_CREDENTIALS,
-                errorType, DateUtils.getCurrentDate(), ex.getMessage(),
+                errorType, getCurrentLocalDateTime(), ex.getMessage(),
                 createBaseError(UserEntity.ENTITY_NAME, "password", null, errorType));
     }
 
@@ -126,7 +126,7 @@ private ErrorDto createExceptionResponseBody(
                 status.value(),
                 ex.getStatusError(),
                 ex.getErrorType(),
-                DateUtils.getCurrentDate(),
+                getCurrentLocalDateTime(),
                 ex.getMessage(),
                 ex.getBaseError()
         );
@@ -140,7 +140,7 @@ private ErrorDto createExceptionResponseBody(
                 status.value(),
                 StatusError.UNDEFINED,
                 ErrorType.UNDEFINED,
-                DateUtils.getCurrentDate(),
+                getCurrentLocalDateTime(),
                 ex.getMessage(),
                 null
         );

diff --git a/src/main/java/com/febfes/fftmback/service/impl/RefreshTokenServiceImpl.java b/src/main/java/com/febfes/fftmback/service/impl/RefreshTokenServiceImpl.java
@@ -17,6 +17,8 @@
 
 import java.util.UUID;
 
+import static com.febfes.fftmback.util.DateUtils.getCurrentLocalDateTimePlusSeconds;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -49,7 +51,7 @@ public RefreshTokenEntity getByUserId(Long userId) {
     @Override
     public RefreshTokenEntity updateRefreshToken(RefreshTokenEntity refreshToken) {
         refreshToken.setToken(UUID.randomUUID().toString());
-        refreshToken.setExpiryDate(DateUtils.getCurrentDatePlusSeconds(jwtRefreshExpirationDateInSeconds));
+        refreshToken.setExpiryDate(getCurrentLocalDateTimePlusSeconds(jwtRefreshExpirationDateInSeconds));
         RefreshTokenEntity updatedRefreshToken = refreshTokenRepository.save(refreshToken);
         log.info("Updated refresh token entity: {}", updatedRefreshToken);
         return updatedRefreshToken;
@@ -60,7 +62,7 @@ public RefreshTokenEntity createRefreshToken(Long userId) {
         RefreshTokenEntity refreshToken = refreshTokenRepository.save(
                 RefreshTokenEntity.builder()
                         .userEntity(userService.getUserById(userId))
-                        .expiryDate(DateUtils.getCurrentDatePlusSeconds(jwtRefreshExpirationDateInSeconds))
+                        .expiryDate(getCurrentLocalDateTimePlusSeconds(jwtRefreshExpirationDateInSeconds))
                         .token(UUID.randomUUID().toString())
                         .build()
         );

diff --git a/src/main/java/com/febfes/fftmback/service/impl/TaskServiceImpl.java b/src/main/java/com/febfes/fftmback/service/impl/TaskServiceImpl.java
@@ -105,6 +105,7 @@ public void updateTask(TaskEntity editTask) {
         task.setProjectId(editTask.getProjectId());
         task.setPriority(editTask.getPriority());
         task.setAssigneeId(editTask.getAssigneeId());
+        task.setDeadlineDate(editTask.getDeadlineDate());
         fillTaskType(task, editTask.getTaskType().getName(), editTask.getProjectId());
         taskRepository.save(task);
         orderService.editOrder(task, editTask.getEntityOrder());