Fix/#36 post

Dockerfile

@@ -0,0 +1,27 @@
+
+# 빌드 단계
+FROM eclipse-temurin:21-alpine AS builder
+WORKDIR /app
+
+# Gradle 이용 빌드 단계
+COPY gradlew .
+COPY gradle gradle
+COPY build.gradle settings.gradle ./
+COPY src src
+RUN chmod +x ./gradlew
+RUN ./gradlew clean build -x test
+
+# 실행 단계
+FROM eclipse-temurin:21-alpine AS runner
+WORKDIR /app
+COPY --from=builder /app/build/libs/*.jar HyetaekOn.jar
+RUN mkdir -p /app/logs
+
+# 환경 변수 선언 (기본값)
+ENV JAVA_OPTS=""
+
+# 포트 설정
+EXPOSE 8080
+
+# 실행 명령에서 JAVA_OPTS 사용
+CMD ["sh", "-c", "java $JAVA_OPTS -jar HyetaekOn.jar"]

docker-compose.yml

@@ -0,0 +1,59 @@
+  services:
+    app:
+      build:
+        context: .
+        dockerfile: Dockerfile
+      image: hyetaekon:latest
+      container_name: hyetaekon
+      ports:
+        - "8080:8080"
+      restart: always
+      env_file:
+        - ./.env
+      environment:
+        SPRING_PROFILES_ACTIVE: dev,s3Bucket
+        TZ: Asia/Seoul
+      volumes:
+        - ./logs:/app/logs # 로그 마운트
+      depends_on:
+        redis:
+          condition: service_healthy
+      networks:
+        - app-network
+
+    redis:
+      image: redis:latest
+      container_name: hyetaekon-redis
+      ports:
+        - "6379:6379"
+      volumes:
+        - redis-data:/data  # 데이터 지속성을 위한 볼륨 추가
+      command: redis-server --appendonly yes
+      healthcheck:
+        test: ["CMD", "redis-cli", "ping"]
+        interval: 30s
+        timeout: 10s
+        retries: 3
+        start_period: 10s
+      networks:
+        - app-network
+
+    nginx:
+      image: nginx:latest
+      container_name: hyetaekon-nginx
+      ports:
+        - "80:80"
+        - "443:443"
+      volumes:
+        - ./nginx/conf.d:/etc/nginx/conf.d
+        - ./nginx/ssl:/etc/nginx/ssl
+        - ./nginx/logs:/var/log/nginx
+      depends_on:
+        - app
+      networks:
+        - app-network
+
+
+  networks:
+    app-network:
+      name: hyetaekon-network

src/main/java/com/hyetaekon/hyetaekon/UserInterest/controller/UserInterestController.java

@@ -1,4 +1,57 @@
 package com.hyetaekon.hyetaekon.UserInterest.controller;
 
+import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsResponseDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsWithSelectionDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.InterestSelectionRequestDto;
+import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterestEnum;
+import com.hyetaekon.hyetaekon.UserInterest.service.UserInterestService;
+import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/interests")
+@RequiredArgsConstructor
 public class UserInterestController {
+
+    private final UserInterestService userInterestService;
+
+    // 선택할 키워드 목록 조회
+    @GetMapping
+    public ResponseEntity<CategorizedInterestsResponseDto> getAvailableInterests() {
+        // Enum에서 카테고리별 displayName 값 추출
+        Map<String, List<String>> categorizedInterests = Arrays.stream(UserInterestEnum.values())
+            .collect(Collectors.groupingBy(
+                UserInterestEnum::getCategory,
+                Collectors.mapping(UserInterestEnum::getDisplayName, Collectors.toList())
+            ));
+        return ResponseEntity.ok(new CategorizedInterestsResponseDto(categorizedInterests));
+    }
+
+    // 모든 관심사와 사용자 선택 여부 조회
+    @GetMapping("/me")
+    public ResponseEntity<CategorizedInterestsWithSelectionDto> getMyInterestsWithSelection(
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+        Long userId = userDetails.getId();
+        return ResponseEntity.ok(userInterestService.getUserInterestsWithSelection(userId));
+    }
+
+    // 선택한 관심사 저장
+    @PostMapping("/me")
+    public ResponseEntity<Void> saveInterests(
+        @AuthenticationPrincipal CustomUserDetails userDetails,
+        @RequestBody InterestSelectionRequestDto requestDto
+    ) {
+        Long userId = userDetails.getId();
+        userInterestService.saveUserInterests(userId, requestDto.getAllInterests());
+        return ResponseEntity.status(HttpStatus.OK).build();
+    }
 }

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/CategorizedInterestsResponseDto.java

@@ -0,0 +1,14 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public class CategorizedInterestsResponseDto {
+    private Map<String, List<String>> categorizedInterests;
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/CategorizedInterestsWithSelectionDto.java

@@ -0,0 +1,13 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public class CategorizedInterestsWithSelectionDto {
+    private Map<String, List<InterestItemDto>> categorizedInterests;
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/InterestItemDto.java

@@ -0,0 +1,11 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class InterestItemDto {
+    private String name;      // 관심사 이름
+    private boolean selected; // 선택 여부
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/InterestSelectionRequestDto.java

@@ -0,0 +1,21 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+public class InterestSelectionRequestDto {
+    private Map<String, List<String>> categorizedInterests;
+
+    public List<String> getAllInterests() {
+        if (categorizedInterests == null) {
+            return new ArrayList<>();
+        }
+        List<String> allInterests = new ArrayList<>();
+        categorizedInterests.values().forEach(allInterests::addAll);
+        return allInterests;
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/entity/UserInterest.java

@@ -1,13 +1,31 @@
 package com.hyetaekon.hyetaekon.UserInterest.entity;
 
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import com.hyetaekon.hyetaekon.user.entity.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Builder
 public class UserInterest {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
 
+    @Column(nullable = false)
+    private String interest;
+
+    @Override
+    public String toString() {
+        return "{user_id: " + user.getId() + ", keyword: " +  interest + "}";
+    }
 }

src/main/java/com/hyetaekon/hyetaekon/UserInterest/entity/UserInterestEnum.java

@@ -4,26 +4,37 @@
 
 @Getter
 public enum UserInterestEnum {
-    HOT_WATER_PROVIDED("온수 잘 나오는"),
-    HEALING("힐링"),
-    FRIENDLY("친절한"),
-    STAR_VIEWING("별 보기 좋은"),
-    COUPLE("커플"),
-    LOTS_OF_SHADE("그늘이 많은"),
-    FAMILY("가족"),
-    SWIMMING("물놀이 하기 좋은"),
-    OCEAN_VIEW("바다가 보이는"),
-    GOOD_FOR_KIDS("아이들 놀기 좋은"),
-    RELAXING("여유있는"),
-    CLEAN("깨끗한"),
-    EASY_CAR_PARKING("차대기 편한"),
-    FUN("재미있는"),
-    WIDE_SITE_SPACING("사이트 간격이 넓은");
+    // ServiceCategory 관련 관심사
+    CHILDCARE_EDUCATION("보육·교육", "관심주제"),
+    HOUSING_INDEPENDENCE("주거·자립", "관심주제"),
+    ADMINISTRATION_SAFETY("행정·안전", "관심주제"),
+    AGRICULTURE_FISHERY("농림축산어업", "관심주제"),
+    EMPLOYMENT_STARTUP("고용·창업", "관심주제"),
+    HEALTH_MEDICAL("보건·의료", "관심주제"),
+    CULTURE_ENVIRONMENT("문화·환경", "관심주제"),
+    LIFE_STABILITY("생활안정", "관심주제"),
+
+    // SpecialGroup 관련 관심사
+    IS_MULTI_CULTURAL("다문화가족", "가구형태"),
+    IS_NORTH_KOREAN_DEFECTOR("북한이탈주민", "가구형태"),
+    IS_SINGLE_PARENT_FAMILY("한부모가정/조손가정", "가구형태"),
+    IS_SINGLE_MEMBER_HOUSEHOLD("1인가구", "가구형태"),
+    IS_DISABLED("장애인", "가구형태"),
+    IS_NATIONAL_MERIT_RECIPIENT("국가보훈대상자", "가구형태"),
+    IS_CHRONIC_ILLNESS("질병/질환자", "가구형태"),
+
+    // FamilyType 관련 관심사
+    // IS_NOT_APPLICABLE("해당사항 없음", "가구상황"),
+    IS_MULTI_CHILDREN_FAMILY("다자녀가구", "가구상황"),
+    IS_NON_HOUSING_HOUSEHOLD("무주택세대", "가구상황"),
+    IS_NEW_RESIDENCE("신규전입", "가구상황"),
+    IS_EXTENDED_FAMILY("확대가족", "가구상황");
 
     private final String displayName;
+    private final String category;
 
-    UserInterestEnum(String displayName) {
+    UserInterestEnum(String displayName, String category) {
         this.displayName = displayName;
+        this.category = category;
     }
-
 }

src/main/java/com/hyetaekon/hyetaekon/UserInterest/repository/UserInterestRepository.java

@@ -1,4 +1,10 @@
 package com.hyetaekon.hyetaekon.UserInterest.repository;
 
-public class UserInterestRepository {
+import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterest;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserInterestRepository extends JpaRepository<UserInterest, Long> {
+
 }