main 작업 내용 dev로 동기화

.github/workflows/code_test_pipeline.yaml

@@ -0,0 +1,75 @@
+name: Code Test Pipeline
+on:
+  pull_request:
+    branches: ["dev", "main"]
+
+permissions:
+  contents: read
+  checks: write
+
+env:
+  DB_URL: ${{ secrets.DB_URL }}
+  DB_USERNAME: ${{ secrets.DB_USERNAME }}
+  DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+  SPRING_ACTIVE_PROFILE: ${{ vars.SPRING_ACTIVE_PROFILE }}
+  JWT_SECRET: ${{ secrets.JWT_SECRET }}
+  FCM_PROJECT_ID: ${{ secrets.FCM_PROJECT_ID }}
+  AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  formatting:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+      - name: Formatting Code with Google Java Style Guide
+        uses: axel-op/googlejavaformat-action@v3
+        with:
+          args: "--replace --aosp"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  unit-test:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    needs: [formatting]
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - name: Create firebase_admin_sdk_private_key.json from Secrets
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/src/main/resources/key
+          echo "${{ secrets.FIREBASE_ADMIN_SDK_PRIVATE_KEY }}" | base64 --decode > $GITHUB_WORKSPACE/src/main/resources/key/firebase_admin_sdk_private_key.json
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Test with Gradle
+        run: ./gradlew --info test
+
+      - name: Publish Test Report
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: "**/build/test-results/test/TEST-*.xml"

.gitignore

@@ -38,8 +38,7 @@ out/
 
 
 ###
-**/src/main/resources/application.properties
-**/src/main/resources/application.yml
-
-
 src/main/java/earlybird/earlybird/user/TestController.java
+src/main/resources/key/firebase_admin_sdk_private_key.json
+
+logs/*.log

build.gradle

@@ -27,19 +27,32 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation "org.springframework.retry:spring-retry"
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	testImplementation 'com.h2database:h2'
 
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
 	implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
 	implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
 
+	implementation 'com.google.firebase:firebase-admin:9.3.0'
+
+	testImplementation 'org.awaitility:awaitility:4.2.2'
+
+	implementation(platform("software.amazon.awssdk:bom:2.27.21"))
+	implementation("software.amazon.awssdk:sdk-core")
+	implementation("software.amazon.awssdk:eventbridge")
+	implementation("software.amazon.awssdk:dynamodb")
 }
 
 tasks.named('test') {

src/main/java/earlybird/earlybird/EarlybirdApplication.java

@@ -2,12 +2,15 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
+@EnableJpaAuditing
 @SpringBootApplication
 public class EarlybirdApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(EarlybirdApplication.class, args);
-	}
-
+    public static void main(String[] args) {
+        SpringApplication.run(EarlybirdApplication.class, args);
+    }
 }

src/main/java/earlybird/earlybird/appointment/controller/AppointmentController.java

@@ -0,0 +1,64 @@
+package earlybird.earlybird.appointment.controller;
+
+import earlybird.earlybird.appointment.controller.request.CreateAppointmentRequest;
+import earlybird.earlybird.appointment.controller.request.UpdateAppointmentRequest;
+import earlybird.earlybird.appointment.controller.response.CreateAppointmentResponse;
+import earlybird.earlybird.appointment.service.CreateAppointmentService;
+import earlybird.earlybird.appointment.service.DeleteAppointmentService;
+import earlybird.earlybird.appointment.service.UpdateAppointmentService;
+import earlybird.earlybird.appointment.service.request.CreateAppointmentServiceRequest;
+import earlybird.earlybird.appointment.service.request.DeleteAppointmentServiceRequest;
+import earlybird.earlybird.appointment.service.request.UpdateAppointmentServiceRequest;
+import earlybird.earlybird.appointment.service.response.CreateAppointmentServiceResponse;
+
+import jakarta.validation.Valid;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/appointments")
+@RestController
+public class AppointmentController {
+
+    private final CreateAppointmentService createAppointmentService;
+    private final UpdateAppointmentService updateAppointmentService;
+    private final DeleteAppointmentService deleteAppointmentService;
+
+    @PostMapping
+    public ResponseEntity<CreateAppointmentResponse> createAppointment(
+            @Valid @RequestBody CreateAppointmentRequest request) {
+
+        CreateAppointmentServiceRequest serviceRequest =
+                request.toCreateAppointmentServiceRequest();
+        CreateAppointmentServiceResponse serviceResponse =
+                createAppointmentService.create(serviceRequest);
+
+        return ResponseEntity.ok(CreateAppointmentResponse.from(serviceResponse));
+    }
+
+    @PatchMapping
+    public ResponseEntity<Void> updateAppointment(
+            @Valid @RequestBody UpdateAppointmentRequest request) {
+
+        UpdateAppointmentServiceRequest serviceRequest =
+                request.toUpdateAppointmentServiceRequest();
+        updateAppointmentService.update(serviceRequest);
+
+        return ResponseEntity.ok().build();
+    }
+
+    @DeleteMapping
+    public ResponseEntity<Void> deleteAppointment(
+            @RequestHeader("appointmentId") Long appointmentId,
+            @RequestHeader("clientId") String clientId) {
+
+        DeleteAppointmentServiceRequest serviceRequest =
+                new DeleteAppointmentServiceRequest(clientId, appointmentId);
+        deleteAppointmentService.delete(serviceRequest);
+
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/earlybird/earlybird/appointment/controller/request/CreateAppointmentRequest.java

@@ -0,0 +1,59 @@
+package earlybird.earlybird.appointment.controller.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import earlybird.earlybird.appointment.service.request.CreateAppointmentServiceRequest;
+import earlybird.earlybird.common.DayOfWeekUtil;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.DayOfWeek;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Getter
+public class CreateAppointmentRequest {
+    @NotBlank private String clientId;
+    @NotBlank private String deviceToken;
+    @NotBlank private String appointmentName;
+    @NotNull private Duration movingDuration;
+    @NotNull private Duration preparationDuration;
+
+    @NotNull
+    @JsonFormat(
+            shape = JsonFormat.Shape.STRING,
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "Asia/Seoul")
+    private LocalDateTime firstAppointmentTime;
+
+    // 월화수목금토일
+    @NotNull
+    @Size(min = 7, max = 7, message = "repeatDayOfWeek 의 길이는 7이어야 합니다.")
+    private List<Boolean> repeatDayOfWeekBoolList;
+
+    public CreateAppointmentServiceRequest toCreateAppointmentServiceRequest() {
+
+        List<DayOfWeek> repeatDayOfWeekList =
+                DayOfWeekUtil.convertBooleanListToDayOfWeekList(this.repeatDayOfWeekBoolList);
+
+        return CreateAppointmentServiceRequest.builder()
+                .clientId(this.clientId)
+                .deviceToken(this.deviceToken)
+                .appointmentName(this.appointmentName)
+                .firstAppointmentTime(this.firstAppointmentTime)
+                .preparationDuration(this.preparationDuration)
+                .movingDuration(this.movingDuration)
+                .repeatDayOfWeekList(repeatDayOfWeekList)
+                .build();
+    }
+}

src/main/java/earlybird/earlybird/appointment/controller/request/UpdateAppointmentRequest.java

@@ -0,0 +1,60 @@
+package earlybird.earlybird.appointment.controller.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import earlybird.earlybird.appointment.domain.AppointmentUpdateType;
+import earlybird.earlybird.appointment.service.request.UpdateAppointmentServiceRequest;
+import earlybird.earlybird.common.DayOfWeekUtil;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import lombok.Getter;
+
+import java.time.DayOfWeek;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+public class UpdateAppointmentRequest {
+
+    @NotNull private Long appointmentId;
+    @NotBlank private String clientId;
+    @NotBlank private String deviceToken;
+    @NotBlank private String appointmentName;
+    @NotNull private Duration movingDuration;
+    @NotNull private Duration preparationDuration;
+
+    @NotNull
+    @JsonFormat(
+            shape = JsonFormat.Shape.STRING,
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "Asia/Seoul")
+    private LocalDateTime firstAppointmentTime;
+
+    // 월화수목금토일
+    @NotNull
+    @Size(min = 7, max = 7, message = "repeatDayOfWeek 의 길이는 7이어야 합니다.")
+    private List<Boolean> repeatDayOfWeekBoolList;
+
+    @NotNull private AppointmentUpdateType updateType;
+
+    public UpdateAppointmentServiceRequest toUpdateAppointmentServiceRequest() {
+        List<DayOfWeek> repeatDayOfWeekList =
+                DayOfWeekUtil.convertBooleanListToDayOfWeekList(this.repeatDayOfWeekBoolList);
+
+        return UpdateAppointmentServiceRequest.builder()
+                .appointmentId(appointmentId)
+                .clientId(clientId)
+                .deviceToken(deviceToken)
+                .appointmentName(appointmentName)
+                .movingDuration(movingDuration)
+                .preparationDuration(preparationDuration)
+                .firstAppointmentTime(firstAppointmentTime)
+                .repeatDayOfWeekList(repeatDayOfWeekList)
+                .updateType(updateType)
+                .build();
+    }
+}

src/main/java/earlybird/earlybird/appointment/controller/response/CreateAppointmentResponse.java

@@ -0,0 +1,22 @@
+package earlybird.earlybird.appointment.controller.response;
+
+import earlybird.earlybird.appointment.service.response.CreateAppointmentServiceResponse;
+
+import lombok.*;
+
+@Getter
+public class CreateAppointmentResponse {
+    private final Long createdAppointmentId;
+
+    @Builder
+    private CreateAppointmentResponse(Long createdAppointmentId) {
+        this.createdAppointmentId = createdAppointmentId;
+    }
+
+    public static CreateAppointmentResponse from(
+            CreateAppointmentServiceResponse createAppointmentServiceResponse) {
+        return CreateAppointmentResponse.builder()
+                .createdAppointmentId(createAppointmentServiceResponse.getCreatedAppointmentId())
+                .build();
+    }
+}

src/main/java/earlybird/earlybird/appointment/controller/response/UpdateAppointmentResponse.java

@@ -0,0 +1,3 @@
+package earlybird.earlybird.appointment.controller.response;
+
+public class UpdateAppointmentResponse {}