Merge pull request #45 from devocean-finut/develop

Deploy v1
devocean-finut · Nov 13, 2024 · 1a53ca9 · 1a53ca9
2 parents 3a70623 + ef28e57
commit 1a53ca9
Show file tree

Hide file tree

Showing 55 changed files with 1,646 additions and 480 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,26 @@
+name: Deploy to EC2
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      - name: Set up SSH key
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.FINUT_SSH_KEY }}
+
+      - name: Deploy to EC2
+        env:
+          EC2_HOST: ${{ secrets.FINUT_EC2_HOST }}
+          EC2_USER: ${{ secrets.FINUT_EC2_USER }}
+        run: |
+          ssh -o StrictHostKeyChecking=no $EC2_USER@$EC2_HOST 'bash /home/ec2-user/app/deploy.sh'
diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,15 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.5'
 }
 
+jar {
+    manifest {
+        attributes(
+                'Main-Class': 'com.finut.finut_server.FinutServerApplication'
+        )
+    }
+}
+
+
 group = 'com.finut'
 version = '0.0.1-SNAPSHOT'
 
@@ -28,16 +37,34 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' // 스웨거
+    implementation 'org.jsoup:jsoup:1.15.3' // 크롤링
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+    // Google Auth Library for OAuth 2.0
+    implementation 'com.google.auth:google-auth-library-oauth2-http:1.8.0'
+
+    // Google API Client Library for OAuth2
+    implementation 'com.google.apis:google-api-services-oauth2:v2-rev151-1.25.0'
+
+    // JSON Parsing (Gson)
+    implementation 'com.google.http-client:google-http-client-gson:1.41.6'
+
     // mysql 설정
     runtimeOnly 'com.mysql:mysql-connector-j'
+    implementation 'org.mariadb.jdbc:mariadb-java-client'
+
+    //RSS 툴
+    implementation 'com.rometools:rome:1.15.0'
+
+    //MariaDB
+    implementation("org.mariadb.jdbc:mariadb-java-client")
+
 }
 
 tasks.named('test') {

diff --git a/src/main/java/com/finut/finut_server/apiPayload/ApiResponse.java b/src/main/java/com/finut/finut_server/apiPayload/ApiResponse.java
@@ -33,4 +33,12 @@ public static <T> ApiResponse<T> of(BaseCode code, T result){
     public static <T> ApiResponse<T> onFailure(String code, String message, T data){
         return new ApiResponse<>(true, code, message, data);
     }
+
+    public String getData() {
+        return  message;
+    }
+
+    public String getStatusCode() {
+        return code;
+    }
 }
diff --git a/src/main/java/com/finut/finut_server/apiPayload/code/status/ErrorStatus.java b/src/main/java/com/finut/finut_server/apiPayload/code/status/ErrorStatus.java
@@ -24,7 +24,11 @@ public enum ErrorStatus implements BaseErrorCode {
     ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."),
 
     // 퀴즈 관련 에러
-    INVALID_NUMBER(HttpStatus.BAD_REQUEST, "QUIZ400", "유효하지 않은 값입니다.");
+    INVALID_NUMBER(HttpStatus.BAD_REQUEST, "QUIZ400", "유효하지 않은 값입니다."),
+    NULL_DATA(HttpStatus.BAD_REQUEST, "QUIZ401", "데이터가 없습니다."),
+
+    // 출석 관련 에러
+    NO_DATA_FOUND(HttpStatus.BAD_REQUEST, "ATTEND400", "데이터가 없습니다");
 
     private final HttpStatus httpStatus;
     private final String code;

diff --git a/src/main/java/com/finut/finut_server/config/SecurityConfig.java b/src/main/java/com/finut/finut_server/config/SecurityConfig.java
@@ -4,10 +4,12 @@
 import com.finut.finut_server.apiPayload.exception.handler.CustomOAuth2AuthenticationSuccessHandler;
 import com.finut.finut_server.config.auth.CustomOAuth2UserService;
 import com.finut.finut_server.domain.user.UsersRepository;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -44,7 +46,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, CustomOAuth2Us
                         logout
                                 .logoutSuccessUrl("/") // 임시
                 )
-                .csrf(csrf -> csrf.ignoringRequestMatchers("/h2-console/**"))
+                .csrf(AbstractHttpConfigurer::disable) // post 요청을 위한 csrf disable
                 .headers(headers -> headers.frameOptions(frameOptions -> frameOptions.sameOrigin()));
         return http.build();
     }

diff --git a/src/main/java/com/finut/finut_server/controller/ConsumptionController.java b/src/main/java/com/finut/finut_server/controller/ConsumptionController.java
@@ -2,12 +2,21 @@
 
 
 import com.finut.finut_server.apiPayload.ApiResponse;
+import com.finut.finut_server.apiPayload.code.ErrorReasonDTO;
 import com.finut.finut_server.domain.product.Product;
 import com.finut.finut_server.domain.purchases.Purchases;
+import com.finut.finut_server.domain.user.Users;
 import com.finut.finut_server.service.ConsumptionService;
 import com.finut.finut_server.service.PurchasesService;
+import com.finut.finut_server.service.UsersService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,32 +31,72 @@ public class ConsumptionController {
     private final ConsumptionService consumptionService;
     private final PurchasesService purchasesService;
 
+    private UsersService usersService;
+
     @Autowired
     public ConsumptionController(ConsumptionService consumptionService, PurchasesService purchasesService) {
         this.consumptionService = consumptionService;
         this.purchasesService = purchasesService;
     }
     @Operation(summary = "전체 물품 보기", description = "전체 물품을 보기 위한 api 입니다")
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    array = @ArraySchema(schema = @Schema(implementation = Product.class)))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
     @GetMapping("/products")
     public ApiResponse<List<Product>> readAllProducts() {
         return ApiResponse.onSuccess(ConsumptionService.getAllProducts());
     }
 
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    array = @ArraySchema(schema = @Schema(implementation = Product.class)))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
     @Operation(summary = "물품 상세 정보 보기", description = "각 물품의 상세 정보를 보기 위한 api 입니다")
     @GetMapping("/products/{productId}")
     public ApiResponse<Optional<Product>> readProduct(@PathVariable Long productId) {
         return ApiResponse.onSuccess(ConsumptionService.getProductInfo(productId));
     }
 
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    schema = @Schema(implementation = Purchases.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
     @Operation(summary = "물품 구매", description = "물품을 구매하기 위한 api 입니다")
     @GetMapping("/buy")
-    public ApiResponse<Purchases> buyProduct(@RequestParam Long userId, @RequestParam Long productId) {
-        return ApiResponse.onSuccess(PurchasesService.buyProduct(userId, productId));
+    public ApiResponse<Purchases> buyProduct(@RequestParam Long productId, HttpServletRequest request, HttpServletResponse response) {
+        Users user = usersService.getUserIdByToken(request, response);
+        return ApiResponse.onSuccess(PurchasesService.buyProduct(user.getId(), productId));
     }
 
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    array = @ArraySchema(schema = @Schema(implementation = Product.class)))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
     @Operation(summary = "내 물품 보기", description = "구매한 물품들을 모두 위한 api 입니다")
     @GetMapping("/my-purchases")
-    public ApiResponse<List<Product>> readMyPurchases(@RequestParam Long userId) {
-        return ApiResponse.onSuccess(PurchasesService.getMyProducts(userId));
+    public ApiResponse<List<Product>> readMyPurchases(HttpServletRequest request, HttpServletResponse response) {
+        Users user = usersService.getUserIdByToken(request, response);
+        return ApiResponse.onSuccess(PurchasesService.getMyProducts(user.getId()));
     }
 }
diff --git a/src/main/java/com/finut/finut_server/controller/HomeController.java b/src/main/java/com/finut/finut_server/controller/HomeController.java
@@ -1,10 +1,14 @@
 package com.finut.finut_server.controller;
 
 import com.finut.finut_server.apiPayload.ApiResponse;
+import com.finut.finut_server.apiPayload.code.ErrorReasonDTO;
 import com.finut.finut_server.config.auth.dto.SessionUser;
 import com.finut.finut_server.domain.user.UserResponseDTO;
 import com.finut.finut_server.service.UsersService;
 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.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +38,15 @@ public HomeController(HttpSession httpSession) {
     @Autowired
     private UsersService userService;
 
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    schema = @Schema(implementation = UserResponseDTO.loginUserDTO.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
     @Operation(summary = "로그인 성공", description = "로그인 성공시 해당 api에 리다이렉션 되어 수행됩니다")
     @GetMapping("/success")
     @ResponseBody

diff --git a/src/main/java/com/finut/finut_server/controller/InterestRateController.java b/src/main/java/com/finut/finut_server/controller/InterestRateController.java
diff --git a/src/main/java/com/finut/finut_server/controller/QuestController.java b/src/main/java/com/finut/finut_server/controller/QuestController.java
@@ -0,0 +1,101 @@
+package com.finut.finut_server.controller;
+
+import com.finut.finut_server.apiPayload.ApiResponse;
+import com.finut.finut_server.apiPayload.code.ErrorReasonDTO;
+import com.finut.finut_server.domain.quest.Quest;
+import com.finut.finut_server.domain.quest.QuestDTO;
+import com.finut.finut_server.domain.questDone.QuestDone;
+import com.finut.finut_server.domain.questQuiz.QuestQuiz;
+import com.finut.finut_server.domain.questQuiz.QuestQuizRepository;
+import com.finut.finut_server.domain.quiz.Quiz;
+import com.finut.finut_server.domain.user.Users;
+import com.finut.finut_server.domain.user.UsersRepository;
+import com.finut.finut_server.service.LevelService;
+import com.finut.finut_server.service.QuestQuizService;
+import com.finut.finut_server.service.QuestService;
+import com.finut.finut_server.service.UsersService;
+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.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequestMapping("/quest")
+@Tag(name = "Quest Controller", description = "퀘스트 관련 api")
+public class QuestController {
+    @Autowired
+    private UsersService usersService;
+
+    @Autowired
+    private QuestQuizService questQuizService;
+
+    @Autowired
+    private QuestService questService;
+
+    @Autowired
+    private LevelService levelService;
+
+    @Operation(summary = "전체 퀘스트 가져오기", description = "전체 퀘스트를 가져옵니다")
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    schema = @Schema(implementation = Quest.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "퀘스트 내용을 제대로 가지고 오지 못했습니다.",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
+    @GetMapping("")
+    public ApiResponse<List<QuestDTO>> getQuests(){
+        List<QuestDTO> quests = questService.getAllQuests();
+        return ApiResponse.onSuccess(quests);
+    }
+
+
+    @Operation(summary = "해당 퀘스트 퀴즈들 가져오기", description = "해당 퀘스트의 퀴즈을 모두 가져옵니다.")
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    schema = @Schema(implementation = QuestQuiz.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "퀘스트 퀴즈 내용을 제대로 가지고오지 못했습니다.",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
+    @GetMapping("/{questId}")
+    public ApiResponse<List<QuestQuiz>> getQuestQuizes(@PathVariable Long questId){
+        List<QuestQuiz> questQuizzes = questQuizService.getQuestQuizzes(questId);
+        return ApiResponse.onSuccess(questQuizzes);
+    }
+
+
+
+    @Operation(summary = "퀘스트 성공", description = "퀘스트 성공시 Level을 다음 레벨으로 바꿉니다.")
+    @ApiResponses(value = {
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공", content = @Content(mediaType = "application/json",
+                    schema = @Schema(implementation = QuestDone.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "",
+                    content = @Content),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "서버 에러, 관리자에게 문의 바랍니다.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorReasonDTO.class)))
+    })
+    @GetMapping("/done-quest/{questId}")
+    public ApiResponse<Users> updateQuestDone(@PathVariable Long questId, HttpServletRequest request, HttpServletResponse response) {
+        Users user = usersService.getUserIdByToken(request, response);
+        questService.updateQuestDone(user, questId);
+        user = levelService.upgradeUserLevel(user.getId());
+        return ApiResponse.onSuccess(user);
+    }
+
+
+}