refactor: add reason to day-off (#10)

src/main/java/app/teamwize/api/dayoff/controller/DayOffController.java

@@ -12,6 +12,7 @@
 import app.teamwize.api.dayoff.exception.DayOffNotFoundException;
 import app.teamwize.api.dayoff.exception.DayOffUpdateStatusFailedException;
 import app.teamwize.api.dayoff.service.DayOffService;
+import app.teamwize.api.user.exception.UserNotFoundException;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
@@ -29,7 +30,7 @@ public class DayOffController {
 
 
     @PostMapping
-    public DayOffResponse create(@RequestBody DayOffCreateRequest request) {
+    public DayOffResponse create(@RequestBody DayOffCreateRequest request) throws UserNotFoundException {
         var dayOff = dayOffService.createDayOff(securityService.getUserOrganizationId(), securityService.getUserId(), request);
         return dayOffMapper.toDayOffResponse(dayOff);
     }

src/main/java/app/teamwize/api/dayoff/domain/entity/DayOff.java

@@ -35,6 +35,8 @@ public class DayOff extends BaseAuditEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     private User user;
 
+    private String reason;
+
     @ManyToOne(fetch = FetchType.LAZY)
     private Organization organization;
 

src/main/java/app/teamwize/api/dayoff/domain/request/DayOffCreateRequest.java

@@ -6,6 +6,7 @@
 
 public record DayOffCreateRequest(
         DayOffType type,
+        String reason,
         LocalDateTime start,
         LocalDateTime end
 ) {

src/main/java/app/teamwize/api/dayoff/domain/response/DayOffResponse.java

@@ -14,5 +14,6 @@ public record DayOffResponse(
         LocalDateTime endAt,
         DayOffStatus status,
         DayOffType type,
+        String reason,
         UserCompactResponse user) {
 }

src/main/java/app/teamwize/api/dayoff/service/DayOffService.java

@@ -10,7 +10,8 @@
 import app.teamwize.api.dayoff.exception.DayOffUpdateStatusFailedException;
 import app.teamwize.api.dayoff.repository.DayOffRepository;
 import app.teamwize.api.organization.domain.entity.Organization;
-import app.teamwize.api.user.domain.entity.User;
+import app.teamwize.api.user.exception.UserNotFoundException;
+import app.teamwize.api.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -25,13 +26,16 @@
 public class DayOffService {
 
     private final DayOffRepository dayOffRepository;
+    private final UserService userService;
 
     @Transactional
-    public DayOff createDayOff(Long organizationId, Long userId, DayOffCreateRequest request) {
+    public DayOff createDayOff(Long organizationId, Long userId, DayOffCreateRequest request) throws UserNotFoundException {
+        var user = userService.getUser(organizationId,userId);
         var dayOff = new DayOff()
+                .setReason(request.reason())
                 .setStartAt(request.start())
                 .setEndAt(request.end())
-                .setUser(new User(userId))
+                .setUser(user)
                 .setOrganization(new Organization(organizationId))
                 .setStatus(DayOffStatus.PENDING)
                 .setType(request.type());

src/main/java/app/teamwize/api/user/domain/response/UserCompactResponse.java

@@ -21,6 +21,10 @@ public record UserCompactResponse(
         String lastName,
         @Nullable
         String phone,
+        @Nullable
+        String countryCode,
+        @Nullable
+        String timezone,
         @Nonnull
         TeamCompactResponse team) {
 }

src/main/resources/db/changelog/20240818-0933-add-reason-to-days-off-table.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet id="20240818-0933-add-reason-to-days-off-table" author="M.Karimi">
+        <addColumn tableName="days_off">
+            <column name="reason" type="VARCHAR" />
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -22,4 +22,7 @@ databaseChangeLog:
       relativeToChangelogFile: true
   - include:
       file: 20240815-2230-add-timezone-country-code-to-user-table.xml
+      relativeToChangelogFile: true
+  - include:
+      file: 20240818-0933-add-reason-to-days-off-table.xml
       relativeToChangelogFile: true