Dev -> Main 브랜치 merge

.github/workflows/deploy.yml

@@ -0,0 +1,75 @@
+name: CI/CD using github actions & docker
+
+on:
+  push:
+    branches: [ "dev" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      ## JDK setting - github actions에서 사용할 JDK 설정
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin' # https://github.com/actions/setup-java
+
+      ## gradle caching - 빌드 시간 향상
+      - 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-
+
+      ## gradlew 파일에 실행 권한을 부여
+      - name: Grant execute permission for gradlew
+        run:
+          chmod +x gradlew
+
+      ## yml 파일 생성
+      - name: make application.yml
+        if: contains(github.ref, 'dev')
+        run: |
+          cd ./src/main
+          mkdir -p resources
+          cd ./resources
+          touch ./application.yml
+          echo "${{ secrets.APPLICATION_YML }}" >> ./application.yml
+        shell: bash
+
+        # gradle build
+      - name: Build with Gradle
+        run: ./gradlew build -x test
+
+      ## docker build & push to production
+      - name: Docker build & push to prod
+        if: contains(github.ref, 'dev')
+        run: |
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
+
+      ## deploy to production
+      - name: Deploy to prod
+        uses: appleboy/ssh-action@v0.1.6
+        id: deploy-prod
+        if: contains(github.ref, 'dev')
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          script: |
+            sudo docker rm -f $(docker ps -qa)
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
+            sudo docker-compose down
+            sudo docker-compose up -d
+            sudo docker image prune -f

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+src/main/resources
+

Dockerfile

@@ -0,0 +1,4 @@
+FROM openjdk:17-jdk
+ARG JAR_FILE=./build/libs/*-SNAPSHOT.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT [ "java", "-jar", "/app.jar" ]

build.gradle

@@ -21,8 +21,14 @@ configurations {
 
 repositories {
 	mavenCentral()
+	maven { url 'https://jitpack.io' }
 }
 
+jar{
+	enabled=false
+}
+
+
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -35,10 +41,53 @@ dependencies {
 	// validation 관련 기능
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
-	// swagger
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+	// security 관련
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+
+  	//
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
+
+	// 이메일 인증 기능
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+	// JWT
+	implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+
+	// queryDSL
+	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+ 	// OAuth2
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+	implementation 'com.google.code.gson:gson'
+
+	// 구글 places api 관련
+	//implementation 'com.google.maps:google-maps-services:0.42.2'
+	// Jackson: JSON 응답을 파싱
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
+
+	// AWS S3
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+	// iamport 결제 관련
+	implementation group: 'com.github.iamport', name: 'iamport-rest-client-java', version: '0.2.22'
+	implementation group: 'com.squareup.retrofit2', name: 'adapter-rxjava2', version: '2.9.0'
+	//implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
+	implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.3'
+	implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.3.0'
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+// Querydsl 설정부
+clean {
+	delete file('src/main/generated')
+}

src/main/java/com/otakumap/OtakumapApplication.java

@@ -2,7 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableJpaAuditing
+@EnableAsync
+@EnableScheduling
 @SpringBootApplication
 public class OtakumapApplication {
 

src/main/java/com/otakumap/domain/animation/controller/AnimationController.java

@@ -0,0 +1,51 @@
+package com.otakumap.domain.animation.controller;
+
+import com.otakumap.domain.animation.dto.AnimationRequestDTO;
+import com.otakumap.domain.animation.dto.AnimationResponseDTO;
+import com.otakumap.domain.animation.converter.AnimationConverter;
+import com.otakumap.domain.animation.entity.Animation;
+import com.otakumap.domain.animation.service.AnimationCommandService;
+import com.otakumap.domain.animation.service.AnimationQueryService;
+import com.otakumap.global.apiPayload.ApiResponse;
+import com.otakumap.global.apiPayload.code.status.ErrorStatus;
+import com.otakumap.global.apiPayload.exception.handler.SearchHandler;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/animations")
+public class AnimationController {
+    private final AnimationQueryService animationQueryService;
+    private final AnimationCommandService animationCommandService;
+
+    @GetMapping("/search")
+    @Operation(summary = "애니메이션 검색", description = "키워드로 애니메이션 제목을 검색해서 조회합니다. 공백은 허용되지 않습니다.")
+    public ApiResponse<AnimationResponseDTO.AnimationResultListDTO> searchAnimation(
+            @RequestParam @NotBlank(message = "검색어를 입력해주세요")
+            @Pattern(regexp = "^[^\\s].*$", message = "첫 글자는 공백이 될 수 없습니다") String keyword) {
+        List<Animation> animationList = animationQueryService.searchAnimation(keyword);
+
+        if (animationList.isEmpty()) {
+            throw new SearchHandler(ErrorStatus.ANIMATION_NOT_FOUND);
+        }
+
+        return ApiResponse.onSuccess(AnimationConverter.animationResultListDTO(animationList));
+    }
+
+    @PostMapping
+    @Operation(summary = "애니메이션 등록", description = "원하는 애니메이션이 없을 경우, 사용자가 애니메이션을 직접 등록합니다.")
+    public ApiResponse<AnimationResponseDTO.AnimationCreationResponseDTO> createAnimation(
+            @RequestBody @Valid AnimationRequestDTO.AnimationCreationRequestDTO request) {
+        Animation animation = animationCommandService.createAnimation(request.getName());
+        return ApiResponse.onSuccess(AnimationConverter.toAnimationCreationResponseDTO(animation));
+    }
+}

src/main/java/com/otakumap/domain/animation/converter/AnimationConverter.java

@@ -0,0 +1,53 @@
+package com.otakumap.domain.animation.converter;
+
+import com.otakumap.domain.animation.dto.AnimationResponseDTO;
+import com.otakumap.domain.animation.entity.Animation;
+import com.otakumap.domain.hash_tag.dto.HashTagResponseDTO;
+import com.otakumap.domain.mapping.PlaceAnimation;
+
+import java.util.List;
+
+public class AnimationConverter {
+
+    public static AnimationResponseDTO.AnimationInfoDTO toAnimationInfoDTO(PlaceAnimation placeAnimation, Boolean isLiked,
+                                                                           List<HashTagResponseDTO.HashTagDTO> hashTags) {
+        return AnimationResponseDTO.AnimationInfoDTO.builder()
+                .animationId(placeAnimation.getAnimation().getId())
+                .animationName(placeAnimation.getAnimation().getName())
+                .isLiked(isLiked)
+                .hashTags(hashTags)
+                .build();
+    }
+
+    public static AnimationResponseDTO.AnimationResultDTO animationResultDTO(Animation animation) {
+        return AnimationResponseDTO.AnimationResultDTO.builder()
+                .animationId(animation.getId())
+                .name(animation.getName())
+                .build();
+    }
+
+    public static AnimationResponseDTO.AnimationResultListDTO animationResultListDTO(List<Animation> animations) {
+        List<AnimationResponseDTO.AnimationResultDTO> animationResultDTOs = animations.stream()
+                .map(AnimationConverter::animationResultDTO)
+                .toList();
+
+        return AnimationResponseDTO.AnimationResultListDTO.builder()
+                .animations(animationResultDTOs)
+                .listSize(animationResultDTOs.size())
+                .build();
+    }
+
+    public static AnimationResponseDTO.AnimationCreationResponseDTO toAnimationCreationResponseDTO(Animation animation) {
+        return AnimationResponseDTO.AnimationCreationResponseDTO.builder()
+                .animationId(animation.getId())
+                .name(animation.getName())
+                .createdAt(animation.getCreatedAt())
+                .build();
+    }
+
+    public static Animation toAnimation(String name) {
+        return Animation.builder()
+                .name(name)
+                .build();
+    }
+}

src/main/java/com/otakumap/domain/animation/dto/AnimationRequestDTO.java

@@ -0,0 +1,12 @@
+package com.otakumap.domain.animation.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+
+public class AnimationRequestDTO {
+    @Getter
+    public static class AnimationCreationRequestDTO {
+        @NotBlank
+        String name;
+    }
+}

src/main/java/com/otakumap/domain/animation/dto/AnimationResponseDTO.java

@@ -0,0 +1,51 @@
+package com.otakumap.domain.animation.dto;
+
+import com.otakumap.domain.hash_tag.dto.HashTagResponseDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class AnimationResponseDTO {
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AnimationInfoDTO {
+        private Long animationId;
+        private String animationName;
+        private Boolean isLiked;
+        private List<HashTagResponseDTO.HashTagDTO> hashTags;
+    }
+
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AnimationResultDTO {
+        Long animationId;
+        String name;
+    }
+
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AnimationResultListDTO {
+        List<AnimationResultDTO> animations;
+        Integer listSize;
+    }
+
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class AnimationCreationResponseDTO {
+        Long animationId;
+        String name;
+        LocalDateTime createdAt;
+    }
+}

src/main/java/com/otakumap/domain/animation/entity/Animation.java

@@ -0,0 +1,34 @@
+package com.otakumap.domain.animation.entity;
+
+import com.otakumap.domain.event_review.entity.EventReview;
+import com.otakumap.domain.mapping.AnimationHashtag;
+import com.otakumap.domain.place_review.entity.PlaceReview;
+import com.otakumap.global.common.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class Animation extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, length = 50)
+    private String name;
+
+    @OneToMany(mappedBy = "animation")
+    private List<EventReview> eventReviews = new ArrayList<>();
+
+    @OneToMany(mappedBy = "animation")
+    private List<PlaceReview> placeReviews = new ArrayList<>();
+
+    @OneToMany(mappedBy = "animation", cascade = CascadeType.ALL)
+    private List<AnimationHashtag> animationHashtags = new ArrayList<>();
+}

src/main/java/com/otakumap/domain/animation/repository/AnimationRepository.java

@@ -0,0 +1,13 @@
+package com.otakumap.domain.animation.repository;
+
+import com.otakumap.domain.animation.entity.Animation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface AnimationRepository extends JpaRepository<Animation, Long> {
+    @Query("SELECT a FROM Animation a WHERE REPLACE(LOWER(a.name), ' ', '') LIKE CONCAT('%', REPLACE(LOWER(:keyword), ' ', ''), '%')")
+    List<Animation> searchAnimationByKeyword(@Param("keyword") String keyword);
+}