Merge pull request #2 from team-welcome/main

.github/workflows/uckgisagi-deploy.yml

@@ -0,0 +1,76 @@
+name: CI
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "develop" ]
+
+env:
+  S3_BUCKET_NAME: uckgisagi-bucket
+  PROJECT_NAME: uckgisagi-server
+  RESOURCE_AWS_PATH: ./src/main/resources/application-aws.yml
+  RESOURCE_JWT_PATH: ./src/main/resources/application-jwt.yml
+  RESOURCE_PROD_PATH: ./src/main/resources/application-prod.yml
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: '11'
+
+    - name: Set PROD Yml
+      uses: microsoft/variable-substitution@v1
+      with:
+        files: ${{ env.RESOURCE_PROD_PATH }}
+      env:
+        spring.datasource.url: ${{ secrets.RDS_URL }}
+        spring.datasource.username: ${{ secrets.RDS_USERNAME }}
+        spring.datasource.password: ${{ secrets.RDS_PASSWORD }}
+
+    - name: Set AWS Yml
+      uses: microsoft/variable-substitution@v1
+      with:
+        files: ${{ env.RESOURCE_AWS_PATH }}
+      env:
+        cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+    - name: Set JWT Yml
+      uses: microsoft/variable-substitution@v1
+      with:
+        files: ${{ env.RESOURCE_JWT_PATH }}
+      env:
+        jwt.secret: ${{ secrets.JWT_SECRET }}
+
+    - name: Grant execute permission for gradlew 
+      run: chmod +x gradlew 
+      shell: bash 
+
+    - name: Build with Gradle
+      run: ./gradlew build -x test
+      shell: bash
+
+    - name: Make zip file
+      run: zip -r ./$GITHUB_SHA.zip .
+      shell: bash
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ap-northeast-2
+
+    - name: Upload to S3
+      run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip
+
+    - name: Code Deploy
+      run: aws deploy create-deployment --application-name uckgisagi-code-deploy --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name uckgisagi-code-deploy-group --s3-location bucket=$S3_BUCKET_NAME,bundleType=zip,key=$GITHUB_SHA.zip

.gitignore

@@ -36,9 +36,8 @@ out/
 ### VS Code ###
 .vscode/
 
-
-### Firebase Admin ###
-src/main/resources/firebase/*.json
-
 ### querydsl ###
-src/querydsl
+src/querydsl
+
+### h2 database ###
+database

README.md

@@ -1,3 +1,35 @@
 # uckgisagi-server
 
-🌏억지로 지구를 사랑하는 지구인들🌱
+# 🌏 억지로 지구를 사랑하는 지구인들 🌏
+<img src="https://img.shields.io/badge/Spring Boot-6DB33F?style=for-the-badge&logo=Spring Boot&logoColor=white"> <img src="https://img.shields.io/badge/JAVA-007396?style=for-the-badge&logo=JAVA&logoColor=white">
+<img src="https://img.shields.io/badge/MYSQL-4479A1?style=for-the-badge&logo=MYSQL&logoColor=white">
+
+## 개요
+2022학년도 2학기 오픈소스 기반 기초 설계 학기 프로젝트 과제
+## 깃 커밋 컨벤션
+* `feat`: 새로운 기능 개발
+* `fix`: 버그 수정
+* `add`: 새로운 기능 추가
+* `chore`: 빌드 업무 수정 (build.gradle 수정)
+* `refactor`: 코드 리팩토링
+* `style`: 코드 포맷팅, 주석 삭제 등 코드 변경이 없는 경우
+* `test`: 테스트 코드, 리팩토링 테스트 코드 개발 및 추가
+## 코드 컨벤션
+
+
+## 사용한 스택
+### 백엔드
+* 스프링 부트 2.7.4
+* 언어: 자바
+* JAVA 11, Gradle
+* MySQL
+* Spring JPA
+* QueryDsl
+* Spring Security
+* Swagger
+    * http://54.180.212.221/api/swagger-ui/index.html
+* Sl4j Logging
+* Validation
+* 그 외 스타터 라이브러리
+
+### 감사합니다

appspec.yml

@@ -0,0 +1,24 @@
+version: 0.0
+os: linux
+files:
+  - source: /
+    destination: /home/ec2-user/uckgisagi-server/
+    overwrite: yes
+
+permissions:
+  - object: /
+    pattern: "**"
+    owner: ec2-user
+    group: ec2-user
+
+hooks:
+  ApplicationStart:
+    - location: scripts/run_new_was.sh
+      timeout: 180
+      runas: ec2-user
+#    - location: scripts/health_check.sh
+#      timeout: 180
+#      runas: ec2-user
+    - location: scripts/switch.sh
+      timeout: 180
+      runas: ec2-user

build.gradle

@@ -22,7 +22,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     // aws
-//    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
     // jetbrains annotation
     compileOnly 'org.jetbrains:annotations:23.0.0'
@@ -63,8 +63,7 @@ dependencies {
     implementation 'org.json:json:20220924'
 
     // swagger
-    implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.9.2'
-    implementation group: 'io.springfox', name: 'springfox-swagger2', version: '2.9.2'
+    implementation group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0'
 }
 
 jar {

scripts/health_check.sh

@@ -0,0 +1,29 @@
+CURRENT_PORT=$(cat /home/ec2-user/service_url.inc | grep -Po '[0-9]+' | tail -1)
+TARGET_PORT=0
+
+# Toggle port Number
+if [ ${CURRENT_PORT} -eq 8081 ]; then
+  TARGET_PORT=8082
+elif [ ${CURRENT_PORT} -eq 8082 ]; then
+  TARGET_PORT=8081
+else
+  echo "> No WAS is connected to nginx"
+  exit 1
+fi
+
+echo "> Start health check of WAS at 'http://127.0.0.1:${TARGET_PORT}' ..."
+
+for RETRY_COUNT in 1 2 3 4 5 6 7 8 9 10
+do
+  echo "> #${RETRY_COUNT} trying..."
+  RESPONSE_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:${TARGET_PORT}/api/health)
+
+  if [ ${RESPONSE_CODE} -eq 200 ]; then
+    echo "> New WAS successfully running"
+    exit 0
+  elif [ ${RETRY_COUNT} -eq 10 ]; then
+    echo "> Health check failed."
+    exit 1
+  fi
+  sleep 10
+done

scripts/run_new_was.sh

@@ -0,0 +1,23 @@
+CURRENT_PORT=$(cat /home/ec2-user/service_url.inc | grep -Po '[0-9]+' | tail -1)
+TARGET_PORT=0
+
+echo "> Current port of running WAS is ${CURRENT_PORT}."
+
+if [ ${CURRENT_PORT} -eq 8081 ]; then
+  TARGET_PORT=8082
+elif [ ${CURRENT_PORT} -eq 8082 ]; then
+  TARGET_PORT=8081
+else
+  echo "> No WAS is connected to nginx"
+fi
+
+TARGET_PID=$(lsof -Fp -i TCP:${TARGET_PORT} | grep -Po 'p[0-9]+' | grep -Po '[0-9]+')
+
+if [ ! -z ${TARGET_PID} ]; then
+  echo "> Kill WAS running at ${TARGET_PORT}."
+  sudo kill ${TARGET_PID}
+fi
+
+nohup java -jar -Dserver.port=${TARGET_PORT} -Dspring.profiles.active=prod /home/ec2-user/uckgisagi-server/build/libs/*.jar > /home/ec2-user/nohup.out 2>&1 &
+echo "> Now new WAS runs at ${TARGET_PORT}."
+exit 0

scripts/switch.sh

@@ -0,0 +1,23 @@
+CURRENT_PORT=$(cat /home/ec2-user/service_url.inc | grep -Po '[0-9]+' | tail -1)
+TARGET_PORT=0
+
+echo "> Nginx currently proxies to ${CURRENT_PORT}."
+
+# Toggle port number
+if [ ${CURRENT_PORT} -eq 8081 ]; then
+  TARGET_PORT=8082
+elif [ ${CURRENT_PORT} -eq 8082 ]; then
+  TARGET_PORT=8081
+else
+  echo "> No WAS is connected to nginx"
+  exit 1
+fi
+
+# Change proxying port into target port
+echo "set \$service_url http://127.0.0.1:${TARGET_PORT};" | tee /home/ec2-user/service_url.inc
+
+echo "> Now Nginx proxies to ${TARGET_PORT}."
+# Reload nginx
+sudo service nginx reload
+
+echo "> Nginx reloaded."

src/main/java/server/uckgisagi/UckgisagiApplication.java

@@ -2,7 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+@EnableJpaAuditing
+@EnableFeignClients
 @SpringBootApplication
 public class UckgisagiApplication {
 

src/main/java/server/uckgisagi/app/accusation/controller/AccusationController.java

@@ -0,0 +1,30 @@
+package server.uckgisagi.app.accusation.controller;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import server.uckgisagi.app.accusation.dto.AccusationPostReqDto;
+import server.uckgisagi.app.accusation.dto.AccusationPostResDto;
+import server.uckgisagi.app.accusation.service.AccusationService;
+import server.uckgisagi.common.dto.ApiSuccessResponse;
+import server.uckgisagi.config.interceptor.Auth;
+import server.uckgisagi.config.resolver.LoginUserId;
+import springfox.documentation.annotations.ApiIgnore;
+
+import static server.uckgisagi.common.success.SuccessResponseResult.CREATED_ACCUSE_POST;
+
+@RestController
+@RequiredArgsConstructor
+public class AccusationController {
+
+    private final AccusationService accusationService;
+
+    @ApiOperation("[인증] 둘러보기 페이지 - 게시글 신고하기")
+    @Auth
+    @PostMapping("/v1/post/accuse")
+    public ApiSuccessResponse<AccusationPostResDto> accusePost(@RequestBody AccusationPostReqDto accusationPostReqDto, @ApiIgnore @LoginUserId Long userId) {
+        return ApiSuccessResponse.success(CREATED_ACCUSE_POST, accusationService.accusePost(accusationPostReqDto, userId));
+    }
+}

src/main/java/server/uckgisagi/app/accusation/domain/entity/Accusation.java

@@ -0,0 +1,45 @@
+package server.uckgisagi.app.accusation.domain.entity;
+
+import lombok.*;
+import server.uckgisagi.app.accusation.dto.AccusationPostResDto;
+import server.uckgisagi.common.domain.AuditingTimeEntity;
+import server.uckgisagi.app.post.domain.entity.Post;
+import server.uckgisagi.app.user.domain.entity.User;
+
+import javax.persistence.*;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Accusation extends AuditingTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "accusation_id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "post_id")
+    private Post post;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name="user_id")
+    private User user;
+
+
+    private Accusation(final Post post, final User user) {
+        this.post = post;
+        this.user = user;
+    }
+
+    public static Accusation newInstance(Post post, User user) {
+        return new Accusation(post, user);
+    }
+
+    public AccusationPostResDto toAccusePostResponseDto(Accusation accusation){
+        return AccusationPostResDto.builder()
+                .postId(accusation.getPost().getId())
+                .userId(accusation.getUser().getId())
+                .build();
+    }
+}

src/main/java/server/uckgisagi/app/accusation/domain/repository/AccusationCustomRepository.java

@@ -0,0 +1,13 @@
+package server.uckgisagi.app.accusation.domain.repository;
+
+import server.uckgisagi.app.accusation.domain.entity.Accusation;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface AccusationCustomRepository{
+
+    List<Accusation> findAllByPostId(Long postId);
+
+    Optional<Accusation> findByUserIdAndPostId(Long userId, Long postId);
+}

src/main/java/server/uckgisagi/app/accusation/domain/repository/AccusationCustomRepositoryImpl.java

@@ -0,0 +1,33 @@
+package server.uckgisagi.app.accusation.domain.repository;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import server.uckgisagi.app.accusation.domain.entity.Accusation;
+
+import java.util.List;
+import java.util.Optional;
+
+import static server.uckgisagi.app.accusation.domain.entity.QAccusation.accusation;
+
+
+@RequiredArgsConstructor
+public class AccusationCustomRepositoryImpl implements AccusationCustomRepository {
+
+    private final JPAQueryFactory query;
+
+
+    @Override
+    public List<Accusation> findAllByPostId(Long postId) {
+        return query.selectFrom(accusation)
+                .where(accusation.post.id.eq(postId))
+                .fetch();
+    }
+
+    @Override
+    public Optional<Accusation> findByUserIdAndPostId(Long userId, Long postId) {
+        return query.selectFrom(accusation)
+                .where(accusation.user.id.eq(userId))
+                .where(accusation.post.id.eq(postId))
+                .stream().findFirst();
+    }
+}