[Team-21][BE][루이1세] 2주차 세번째 PR

.github/workflows/gradle.yml

@@ -0,0 +1,83 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ BE-deploy ]
+  pull_request:
+    branches: [ BE-deploy ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./BE
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # JDK11로 gradle 빌드
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+
+      - name: Insert data source information into application.yml
+        run: |
+          sed -i "s|\${DATASOURCE_URL}|$DATASOURCE_URL|g" ./src/main/resources/application.yml
+          sed -i "s|\${DATASOURCE_USERNAME}|$DATASOURCE_USERNAME|g" ./src/main/resources/application.yml
+          sed -i "s|\${DATASOURCE_PASSWORD}|$DATASOURCE_PASSWORD|g" ./src/main/resources/application.yml
+
+          sed -i "s|\${OAUTH_CLIENT_ID}|$OAUTH_CLIENT_ID|g" ./src/main/resources/oauth.yml
+          sed -i "s|\${OAUTH_CLIENT_SECRET}|$OAUTH_CLIENT_SECRET|g" ./src/main/resources/oauth.yml
+          sed -i "s|\${OAUTH_ACCESS_SCOPE}|$OAUTH_ACCESS_SCOPE|g" ./src/main/resources/oauth.yml
+          sed -i "s|\${OAUTH_LOGIN_FORM_URL}|$OAUTH_LOGIN_FORM_URL|g" ./src/main/resources/oauth.yml
+          sed -i "s|\${JWT_ISSUER}|$JWT_ISSUER|g" ./src/main/resources/oauth.yml
+          sed -i "s|\${JWT_SECRET_KEY}|$JWT_SECRET_KEY|g" ./src/main/resources/oauth.yml
+
+        env:
+          DATASOURCE_URL: ${{ secrets.DATASOURCE_URL }}
+          DATASOURCE_USERNAME: ${{ secrets.DATASOURCE_USERNAME }}
+          DATASOURCE_PASSWORD: ${{ secrets.DATASOURCE_PASSWORD }}
+          OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }}
+          OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }}
+          OAUTH_ACCESS_SCOPE: ${{ secrets.OAUTH_ACCESS_SCOPE }}
+          OAUTH_LOGIN_FORM_URL: ${{ secrets.OAUTH_LOGIN_FORM_URL }}
+          JWT_ISSUER: ${{ secrets.JWT_ISSUER }}
+          JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      # 도커 빌드(도커 이미지 생성)
+      - name: Docker build
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/issue-tracker:1.0 .
+          docker push ${{ secrets.DOCKER_USERNAME }}/issue-tracker:1.0
+          docker rmi ${{ secrets.DOCKER_USERNAME }}/issue-tracker:1.0
+
+      # 도커 이미지 배포 및 실행(EC2 ubuntu20.04로 배포)
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.AWS_HOST_DNS }} #(생성한 인스턴스의 DNS주소)
+          username: ubuntu
+          key: ${{ secrets.SSH_PRIVATE_KEY }} #(인스턴스를 생성할 때 다운받은 pem키안에 값을 모두 복사해서 붙여넣기)
+          envs: GITHUB_SHA
+          script: |
+            sudo docker ps -a -q --filter "name=issue-tracker" | grep -q . && docker stop issue-tracker && docker rm issue-tracker | true
+            sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/issue-tracker:1.0
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/issue-tracker:1.0
+            sudo docker run -d -p 80:8080 --name issue-tracker -e FILE_UPLOAD_S3_ACCESS_KEY=${{ secrets.FILE_UPLOAD_S3_ACCESS_KEY }} -e FILE_UPLOAD_S3_SECRET_KEY=${{ secrets.FILE_UPLOAD_S3_SECRET_KEY }} ${{ secrets.DOCKER_USERNAME }}/issue-tracker:1.0
+            sudo docker rmi -f $(docker images -f "dangling=true" -q) || true

.gitignore

@@ -0,0 +1 @@
+.idea

BE/.gitignore

@@ -1,4 +1,3 @@
-oauth.yml
 HELP.md
 .gradle
 build/

BE/Dockerfile

@@ -0,0 +1,17 @@
+# JDK11 이미지 사용
+FROM openjdk:11-jdk
+
+#마운트에 /tmp를 사용하는 이유
+#spring boot의 Tomcat의 default 저장소가 /tmp인데
+#위와 같이 볼륨 마운트를 해주면 호스트의 /var/lib/docker에 임시파일을 만들고
+#컨테이너 안의 /tmp 와 연결할 수 있다는 뜻입니다.
+VOLUME /tmp
+
+# JAR_FILE 변수에 값을 저장
+ARG JAR_FILE=./build/libs/*.jar
+
+# 변수에 저장된 것을 컨테이너 실행시 이름을 app.jar파일로 변경하여 컨테이너에 저장
+COPY ${JAR_FILE} app.jar
+
+# 빌드된 이미지가 run 될 때 실행할 명령어
+ENTRYPOINT ["java","-jar","/app.jar"]

BE/README.md

@@ -0,0 +1,38 @@
+
+- OneTab
+
+- 학습한 내용은 간단하게라도 마크다운 또는 노션으로 정리해서 깃헙에 올리자
+
+- 매일 회고를 작성하자
+
+- 프로젝트를 꼭 진행하자
+
+- 사람들과 연락 & 공유하면서 서로 자극받고 도움이 될 수 있는 좋은 관계를 유지하자
+
+- 잘 설명하지 못하는 내용에 대한 부분을 천천히 채워나가자
+
+- 해당 기술을 사용하는 이유 & 비슷한 기능을 하는 다른 기술과 비교해보자
+
+- 테스트코드도 공부해보자
+
+- 현재까지 진행했던 코쿼 커리큘럼을 다시 진행해보자
+
+- 다른 사람들의 코드와 리뷰를 참고해보자
+
+- 이력서, 코테, 면접을 어떻게 준비할지 고민해보자
+
+- 운동도 하자
+
+- 여유롭지만 오랫동안 지속 가능한 하루 일정을 새워보자
+
+- 슬랙, 카톡, 디코 보면서 사진 저장하기
+
+- 코쿼 사람들 호칭 어떻게 할지 고민하기
+
+- 옷 쇼핑하기
+
+- 카카오페이 엄마한테 물어보고 해지했다가 다시 가입하기
+
+- 리액트 간단하게 써보기
+
+- 채용 담당자가 자소서를 쓸 때 어떤 부분을 볼지 생각해보기

BE/build.gradle

@@ -1,6 +1,13 @@
+buildscript {
+	ext {
+		queryDslVersion = "5.0.0"
+	}
+}
+
 plugins {
 	id 'org.springframework.boot' version '2.7.0'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id "com.ewerk.gradle.plugins.querydsl" version "1.0.10"
 	id 'java'
 }
 
@@ -12,6 +19,7 @@ configurations {
 	compileOnly {
 		extendsFrom annotationProcessor
 	}
+	querydsl.extendsFrom compileClasspath
 }
 
 repositories {
@@ -24,14 +32,41 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.8.0'
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 	implementation 'com.auth0:java-jwt:3.19.1'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.h2database:h2'
 	runtimeOnly 'mysql:mysql-connector-java'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	implementation "com.querydsl:querydsl-jpa:${queryDslVersion}"
+	annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}"
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+jar {
+	enabled = false
+}
+bootJar {
+	archivesBaseName = 'app'
+	archiveFileName = 'app.jar'
+	archiveVersion = "0.0.0"
+}
+
+def querydslDir = "$buildDir/generated/querydsl"
+
+querydsl {
+	jpa = true
+	querydslSourcesDir = querydslDir
+}
+
+sourceSets {
+	main.java.srcDir querydslDir
+}
+
+compileQuerydsl {
+	options.annotationProcessorPath = configurations.querydsl
+}

BE/src/main/java/louie/hanse/issuetracker/config/QuerydslConfig.java

@@ -0,0 +1,19 @@
+package louie.hanse.issuetracker.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuerydslConfig {
+
+    @PersistenceContext
+    EntityManager entityManager;
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory() {
+        return new JPAQueryFactory(entityManager);
+    }
+}

BE/src/main/java/louie/hanse/issuetracker/config/WebConfig.java

@@ -0,0 +1,25 @@
+package louie.hanse.issuetracker.config;
+
+import louie.hanse.issuetracker.converter.StringToStatusConverter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+//@EnableWebMvc
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+            .allowedOrigins("*")
+            .allowedMethods("GET", "POST", "PUT", "PATCH", "OPTIONS")
+            .allowedHeaders("headers");
+    }
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new StringToStatusConverter());
+    }
+}

BE/src/main/java/louie/hanse/issuetracker/converter/StringToStatusConverter.java

@@ -0,0 +1,11 @@
+package louie.hanse.issuetracker.converter;
+
+import louie.hanse.issuetracker.domain.Status;
+import org.springframework.core.convert.converter.Converter;
+
+public class StringToStatusConverter implements Converter<String, Status> {
+    @Override
+    public Status convert(String source) {
+        return Status.valueOfWithCaseInsensitive(source);
+    }
+}

BE/src/main/java/louie/hanse/issuetracker/domain/Comment.java

@@ -1,24 +1,28 @@
 package louie.hanse.issuetracker.domain;
 
-import javax.persistence.*;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
 import static javax.persistence.FetchType.LAZY;
-import static javax.persistence.GenerationType.*;
+import static javax.persistence.GenerationType.IDENTITY;
 
+import java.time.LocalDateTime;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
 @Entity
 @Table(name = "comments")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Comment {
 
     @Id @GeneratedValue(strategy = IDENTITY)
     private Long id;
 
-    @OneToMany(mappedBy = "comment")
-    private List<UploadFile> uploadFiles = new ArrayList<>();
-
     @ManyToOne(fetch = LAZY)
     @JoinColumn
     private Issue issue;
@@ -27,8 +31,18 @@ public class Comment {
     @JoinColumn
     private Member writer;
 
-    private String content;
-    private LocalDateTime createdDateTime;
-    private LocalDateTime updatedDateTime;
+    private String contents;
+    private LocalDateTime createdDateTime = LocalDateTime.now();
+    private LocalDateTime updatedDateTime = LocalDateTime.now();
+
+    public Comment(Issue issue, String contents) {
+        this.issue = issue;
+        issue.addComment(this);
+        this.contents = contents;
+    }
 
+    public void updateContents(String contents) {
+        this.contents = contents;
+        updatedDateTime = LocalDateTime.now();
+    }
 }