배포 v1

.github/workflows/build_and_deploy.yml

@@ -0,0 +1,58 @@
+name: Deploy to DockerHub & EC2
+
+on:
+  push:
+    branches: [ main, develop ]
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+        with:
+          cache-read-only: false
+
+      - name: Grant Execute Permission For Gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: | 
+          set -e
+          ./gradlew clean build -Dspring.profiles.active=local
+
+      - name: Build Docker image
+        run: |
+          docker build \
+          --build-arg SPRING_PROFILES_ACTIVE=prob \
+          -f Dockerfile \
+          -t ${{ vars.DOCKERHUB_USERNAME}}/erica-favicon:latest .
+
+      - name: DockerHub login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME}}
+          password: ${{ vars.DOCKERHUB_PASSWORD}}
+
+      - name: Push Docker image
+        run: |
+          docker push ${{ vars.DOCKERHUB_USERNAME}}/erica-favicon:latest
+
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ubuntu
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            docker pull ${{ vars.DOCKERHUB_USERNAME }}/erica-favicon:latest
+            docker rm -f back 2>/dev/null || true
+            docker compose -f docker-compose.yml --env-file .env up --build -d

.github/workflows/build_test.yml

@@ -0,0 +1,30 @@
+name: PR Build TEST
+
+on:
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+        with:
+          cache-read-only: false
+
+      - name: Grant Execute Permission For Gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: |
+          set -e
+          ./gradlew clean build -Dspring.profiles.active=local

Dockerfile

@@ -1,9 +1,6 @@
-FROM gradle:8.4-jdk17 AS builder
-WORKDIR /app
-COPY . .
-RUN ./gradlew bootJar
-
-FROM amazoncorretto:17.0.12
-WORKDIR /app
-COPY --from=builder /app/build/libs/*.jar app.jar
-ENTRYPOINT ["java", "-jar", "-Djava.security.egd=file:/dev/./urandom", "app.jar"]
+FROM amazoncorretto:17
+RUN yum update -y && \
+    yum install -y python3 && \
+    yum clean all
+COPY build/libs/app.jar app.jar
+ENTRYPOINT ["java", "-jar", "/app.jar"]

build.gradle

@@ -29,38 +29,53 @@ jar {
     enabled = false
 }
 
+springBoot {
+	mainClass = 'com.capstone.favicon.FaviconApplication'
+}
+
+bootJar {
+	archiveFileName = 'app.jar'
+}
+
+jar {
+	enabled = false
+}
+
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
-    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
-    implementation 'org.springframework.boot:spring-boot-starter:3.4.2'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+	implementation 'io.netty:netty-resolver-dns-native-macos:4.1.109.Final:osx-aarch_64'
+
+	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+	implementation 'org.springframework.boot:spring-boot-starter:3.4.2'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
-    implementation 'org.postgresql:postgresql:42.6.0'
+	implementation 'org.postgresql:postgresql:42.6.0'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    // lombok
+	// lombok
     compileOnly 'org.projectlombok:lombok:1.18.28'
-    annotationProcessor 'org.projectlombok:lombok:1.18.28'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.36'
+	annotationProcessor 'org.projectlombok:lombok:1.18.28'
+	testAnnotationProcessor 'org.projectlombok:lombok:1.18.36'
 
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
-    // aws
-    implementation 'software.amazon.awssdk:s3:2.20.28'
+	// aws
+	implementation 'software.amazon.awssdk:s3:2.20.28'
 
-    // assertj
-    testImplementation "org.assertj:assertj-core:3.26.3"
-    testImplementation "org.junit.jupiter:junit-jupiter:5.11.4"
+	// assertj
+	testImplementation "org.assertj:assertj-core:3.26.3"
+	testImplementation "org.junit.jupiter:junit-jupiter:5.11.4"
 
-    // mail
-    implementation 'org.springframework.boot:spring-boot-starter-mail'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	// mail
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
 }
 
 tasks.named('test') {
-    useJUnitPlatform()
-}
+	useJUnitPlatform()
+}

docker-compose.yml

@@ -1,37 +1,24 @@
 services:
-  postgres:
-    image: postgres
-    container_name: postgres
-    restart: always
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: ${POSTGRES_DB}
+  redis:
+    image: redis:latest
+    container_name: redis
     ports:
-      - "5432:5432"
+      - "6379:6379"
+    command:
+      - redis-server
+    networks:
+      - backend-network
 
   backend:
-    build:
-      context: ${REPO_BACK_URL}
-    container_name: back
-    restart: always
-    depends_on:
-      - postgres
-    environment:
-      SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
-      SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
-      SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
+    image: 211i2/erica-backend:latest
+    container_name: backend
     ports:
-      - "8081:8080"
-
-  frontend:
-    build:
-      context: ${REPO_FRONT_URL}
-    container_name: front
-    restart: always
+      - "8080:8080"
+    networks:
+      - backend-network
     depends_on:
-      - backend
-    environment:
-      REACT_APP_API_URL: ${REACT_APP_API_URL}
-    ports:
-      - "3000:80"
+      - redis
+
+networks:
+  backend-network:
+    driver: bridge

src/main/java/com/capstone/favicon/FaviconApplication.java

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

src/main/java/com/capstone/favicon/admin/application/AdminServiceImpl.java

@@ -0,0 +1,22 @@
+package com.capstone.favicon.admin.application;
+
+import com.capstone.favicon.admin.application.service.AdminService;
+import com.capstone.favicon.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@RequiredArgsConstructor
+@Service
+public class AdminServiceImpl implements AdminService {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Override
+    @Transactional
+    public void deleteUser(Long userId) {
+        userRepository.deleteByUserId(userId);
+    }
+}

src/main/java/com/capstone/favicon/admin/application/FAQServiceImpl.java

@@ -0,0 +1,80 @@
+package com.capstone.favicon.admin.application;
+
+import com.capstone.favicon.admin.application.service.FAQService;
+import com.capstone.favicon.admin.domain.FAQ;
+import com.capstone.favicon.admin.dto.FAQRequestDto;
+import com.capstone.favicon.admin.dto.FAQResponseDto;
+import com.capstone.favicon.admin.repository.FAQRepository;
+import com.capstone.favicon.user.domain.User;
+import com.capstone.favicon.user.repository.UserRepository;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Primary
+@RequiredArgsConstructor
+public class FAQServiceImpl implements FAQService {
+
+    private final FAQRepository faqRepository;
+    private final UserRepository userRepository;
+
+    @Override
+    public User getAdminUserFromSession(HttpServletRequest request) {
+        HttpSession session = request.getSession();
+        Long id = (Long) session.getAttribute("id");
+        User user = userRepository.findByUserId(id);
+        if (user == null || user.getRole() != 1) {
+            throw new RuntimeException("이 기능은 관리자만 접근 가능합니다.");
+        }
+        return user;
+    }
+
+    @Override
+    public void createFAQ(FAQRequestDto request) {
+        FAQ faq = new FAQ();
+        faq.setCategory(request.getCategory());
+        faq.setQuestion(request.getQuestion());
+        faq.setAnswer(request.getAnswer());
+
+        faqRepository.save(faq);
+    }
+
+    @Override
+    public void updateFAQ(Long faqId, FAQRequestDto request) {
+        FAQ faq = faqRepository.findById(faqId)
+                .orElseThrow(() -> new RuntimeException("FAQ를 찾을 수 없습니다."));
+
+        faq.setCategory(request.getCategory());
+        faq.setQuestion(request.getQuestion());
+        faq.setAnswer(request.getAnswer());
+
+        faqRepository.save(faq);
+    }
+
+    @Override
+    public void deleteFAQ(Long faqId) {
+        FAQ faq = faqRepository.findById(faqId)
+                .orElseThrow(() -> new RuntimeException("FAQ를 찾을 수 없습니다."));
+        faqRepository.delete(faq);
+    }
+
+    @Override
+    public List<FAQResponseDto> getAllFAQs() {
+        List<FAQ> faqs = faqRepository.findAll();
+        return faqs.stream().map(FAQResponseDto::new).collect(Collectors.toList());
+    }
+
+    @Override
+    public FAQResponseDto getFAQById(Long faqId) {
+        FAQ faq = faqRepository.findById(faqId)
+                .orElseThrow(() -> new RuntimeException("FAQ를 찾을 수 없습니다."));
+        return new FAQResponseDto(faq);
+    }
+
+}