develop -> main Merge

.github/pr-labeler.yml

@@ -0,0 +1,6 @@
+기능: feature/*
+버그: fix/*
+리팩터링: refactor/*
+문서: docs/*
+테스트: test/*
+인프라: infra/*

.github/workflows/pr-labeler.yml

@@ -0,0 +1,12 @@
+name: PR Labeler
+on:
+  pull_request:
+    types: [ opened ]
+
+jobs:
+  pr-labeler:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: TimonVS/pr-labeler-action@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -38,3 +38,6 @@ out/
 .DS_STORE
 
 application.yml
+*adminsdk.json
+
+logs

Dockerfile

@@ -0,0 +1,7 @@
+FROM amazoncorretto:17
+
+WORKDIR /app
+
+COPY ./build/libs/KOIN_API_V2.jar /app/app.jar
+
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]

build.gradle

@@ -21,15 +21,59 @@ repositories {
 }
 
 dependencies {
+    implementation group: 'org.json', name: 'json', version: '20231013'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    compileOnly 'org.projectlombok:lombok'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'com.mysql:mysql-connector-j'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
+
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
+
+    implementation 'org.jsoup:jsoup:1.15.3'
+    implementation 'com.amazonaws:aws-java-sdk:1.12.672'
+    implementation 'com.google.code.gson:gson:2.10.1'
+
+    // swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+
+    // security
+    implementation 'org.springframework.security:spring-security-crypto:6.2.2'
+
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'com.mysql:mysql-connector-j'
+    compileOnly 'org.projectlombok:lombok'
+
     annotationProcessor 'org.projectlombok:lombok'
+
+    testImplementation 'org.testcontainers:testcontainers:1.19.3'
+    testImplementation 'org.testcontainers:junit-jupiter:1.19.3'
+    testImplementation 'org.testcontainers:mysql'
     testImplementation 'io.rest-assured:rest-assured:5.3.2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    // presigned url
+    implementation platform('software.amazon.awssdk:bom:2.20.56')
+    implementation 'software.amazon.awssdk:s3'
+
+    // localstack
+    testImplementation 'org.testcontainers:localstack'
+
+    // flyway
+    implementation 'org.flywaydb:flyway-mysql'
+
+    // fcm
+    implementation 'com.google.firebase:firebase-admin:9.2.0'
+
+    // Actuator
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+    // slack Notification
+    implementation 'com.github.maricn:logback-slack-appender:1.4.0'
 }
 
 tasks.named('bootBuildImage') {

src/main/java/in/koreatech/koin/KoinApplication.java

@@ -2,8 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication
+@ConfigurationPropertiesScan
 public class KoinApplication {
 
     public static void main(String[] args) {

src/main/java/in/koreatech/koin/admin/land/controller/AdminLandApi.java

@@ -0,0 +1,31 @@
+package in.koreatech.koin.admin.land.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import in.koreatech.koin.admin.land.dto.AdminLandsResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = "(Admin) AdminLand: 복덕방", description = "관리자 권한으로 복덕방 정보를 관리한다")
+public interface AdminLandApi {
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "복덕방 목록 조회")
+    @GetMapping("/admin/lands")
+    ResponseEntity<AdminLandsResponse> getLands(
+        @RequestParam(name = "page", defaultValue = "1") Integer page,
+        @RequestParam(name = "limit", defaultValue = "10", required = false) Integer limit,
+        @RequestParam(name = "is_deleted", defaultValue = "false") Boolean isDeleted
+    );
+}

src/main/java/in/koreatech/koin/admin/land/controller/AdminLandController.java

@@ -0,0 +1,27 @@
+package in.koreatech.koin.admin.land.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import in.koreatech.koin.admin.land.dto.AdminLandsResponse;
+import in.koreatech.koin.admin.land.service.AdminLandService;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class AdminLandController implements AdminLandApi {
+
+    private final AdminLandService adminLandService;
+
+    @Override
+    @GetMapping("/admin/lands")
+    public ResponseEntity<AdminLandsResponse> getLands(
+        @RequestParam(name = "page", defaultValue = "1") Integer page,
+        @RequestParam(name = "limit", defaultValue = "10", required = false) Integer limit,
+        @RequestParam(name = "is_deleted", defaultValue = "false") Boolean isDeleted
+    ) {
+        return ResponseEntity.ok().body(adminLandService.getLands(page, limit, isDeleted));
+    }
+}

src/main/java/in/koreatech/koin/admin/land/dto/AdminLandResponse.java

@@ -0,0 +1,41 @@
+package in.koreatech.koin.admin.land.dto;
+
+import static com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import in.koreatech.koin.domain.land.model.Land;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@JsonNaming(value = SnakeCaseStrategy.class)
+public record AdminLandResponse(
+    @Schema(description = "고유 id", example = "1", requiredMode = REQUIRED)
+    Integer id,
+
+    @Schema(description = "이름", example = "금실타운", requiredMode = REQUIRED)
+    String name,
+
+    @Schema(description = "종류", example = "원룸")
+    String roomType,
+
+    @Schema(description = "월세", example = "200만원 (6개월)")
+    String monthlyFee,
+
+    @Schema(description = "전세", example = "3500")
+    String charterFee,
+
+    @Schema(description = "삭제(soft delete) 여부", example = "false", requiredMode = REQUIRED)
+    Boolean isDeleted
+) {
+    public static AdminLandResponse from(Land land) {
+        return new AdminLandResponse(
+            land.getId(),
+            land.getName(),
+            land.getRoomType(),
+            land.getMonthlyFee(),
+            land.getCharterFee(),
+            land.isDeleted()
+        );
+    }
+}

src/main/java/in/koreatech/koin/admin/land/dto/AdminLandsResponse.java

@@ -0,0 +1,46 @@
+package in.koreatech.koin.admin.land.dto;
+
+import static com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import in.koreatech.koin.domain.land.model.Land;
+import in.koreatech.koin.global.model.Criteria;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@JsonNaming(value = SnakeCaseStrategy.class)
+public record AdminLandsResponse(
+
+    @Schema(description = "조건에 해당하는 총 집의 수", example = "57", requiredMode = REQUIRED)
+    Long totalCount,
+
+    @Schema(description = "조건에 해당하는 집 중에 현재 페이지에서 조회된 수", example = "10", requiredMode = REQUIRED)
+    Integer currentCount,
+
+    @Schema(description = "조건에 해당하는 집들을 조회할 수 있는 최대 페이지", example = "6", requiredMode = REQUIRED)
+    Integer totalPage,
+
+    @Schema(description = "현재 페이지", example = "2", requiredMode = REQUIRED)
+    Integer currentPage,
+
+    @Schema(description = "집 정보 리스트", requiredMode = REQUIRED)
+    List<AdminLandResponse> lands
+) {
+    public static AdminLandsResponse of(Page<Land> pagedResult, Criteria criteria) {
+        return new AdminLandsResponse(
+            pagedResult.getTotalElements(),
+            pagedResult.getContent().size(),
+            pagedResult.getTotalPages(),
+            criteria.getPage() + 1,
+            pagedResult.getContent()
+                .stream()
+                .map(AdminLandResponse::from)
+                .toList()
+        );
+    }
+}

src/main/java/in/koreatech/koin/admin/land/repository/AdminLandRepository.java

@@ -0,0 +1,17 @@
+package in.koreatech.koin.admin.land.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.Repository;
+
+import in.koreatech.koin.domain.land.model.Land;
+
+public interface AdminLandRepository extends Repository<Land, Integer> {
+
+    Page<Land> findAllByIsDeleted(boolean isDeleted, Pageable pageable);
+
+    Integer countAllByIsDeleted(boolean isDeleted);
+
+    Land save(Land request);
+
+}

src/main/java/in/koreatech/koin/admin/land/service/AdminLandService.java

@@ -0,0 +1,35 @@
+package in.koreatech.koin.admin.land.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import in.koreatech.koin.admin.land.dto.AdminLandsResponse;
+import in.koreatech.koin.admin.land.repository.AdminLandRepository;
+import in.koreatech.koin.domain.land.model.Land;
+import in.koreatech.koin.global.model.Criteria;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AdminLandService {
+
+    private final AdminLandRepository adminLandRepository;
+
+    public AdminLandsResponse getLands(Integer page, Integer limit, Boolean isDeleted) {
+
+        // page > totalPage인 경우 totalPage로 조회하기 위해
+        Integer total = adminLandRepository.countAllByIsDeleted(isDeleted);
+
+        Criteria criteria = Criteria.of(page, limit, total);
+        PageRequest pageRequest = PageRequest.of(criteria.getPage(), criteria.getLimit(),
+            Sort.by(Sort.Direction.ASC, "id"));
+
+        Page<Land> result = adminLandRepository.findAllByIsDeleted(isDeleted, pageRequest);
+
+        return AdminLandsResponse.of(result, criteria);
+    }
+}

src/main/java/in/koreatech/koin/domain/activity/controller/ActivityApi.java

@@ -0,0 +1,29 @@
+package in.koreatech.koin.domain.activity.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import in.koreatech.koin.domain.activity.dto.ActivitiesResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = "(Normal) Activity", description = "BCSDLab 활동")
+public interface ActivityApi {
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200", description = "성공적으로 활동 목록을 조회함"),
+            @ApiResponse(responseCode = "404", description = "해당하는 활동이 없음", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "BCSD Lab 활동 조회")
+    @GetMapping("/activities")
+    ResponseEntity<ActivitiesResponse> getActivities(
+        @RequestParam(required = false) String year
+    );
+}

src/main/java/in/koreatech/koin/domain/activity/controller/ActivityController.java

@@ -0,0 +1,25 @@
+package in.koreatech.koin.domain.activity.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import in.koreatech.koin.domain.activity.dto.ActivitiesResponse;
+import in.koreatech.koin.domain.activity.service.ActivityService;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class ActivityController implements ActivityApi {
+
+    private final ActivityService activityService;
+
+    @GetMapping("/activities")
+    public ResponseEntity<ActivitiesResponse> getActivities(
+        @RequestParam(required = false) String year
+    ) {
+        ActivitiesResponse response = activityService.getActivities(year);
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/in/koreatech/koin/domain/activity/dto/ActivitiesResponse.java

@@ -0,0 +1,14 @@
+package in.koreatech.koin.domain.activity.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record ActivitiesResponse(
+    @JsonProperty("Activities")
+    List<ActivityResponse> activities
+) {
+    public ActivitiesResponse(List<ActivityResponse> activities) {
+        this.activities = activities;
+    }
+}