dev -> main

.github/ISSUE_TEMPLATE/-etc.md

@@ -0,0 +1,14 @@
+---
+name: "\betc"
+about: 기타 이슈 템플릿
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## 어떤 이슈인가요?
+
+> 해당 이슈에 대해 간단히 서술해주세요
+
+## 참고할만한 자료(선택)

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,22 @@
+---
+name: bug
+about: 버그 관련 이슈 템플릿
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## 어떤 버그인가요?
+
+> 어떤 버그인지 간결하게 설명해주세요
+
+## 어떤 상황에서 발생한 버그인가요?
+
+> (가능하면) Given-When-Then 형식으로 서술해주세요
+
+## 예상 결과
+
+> 예상했던 정상적인 결과가 어떤 것이었는지 설명해주세요
+
+## 참고할만한 자료(선택)

.github/ISSUE_TEMPLATE/feat.md

@@ -0,0 +1,18 @@
+---
+name: feat
+about: 기능 개발 이슈 템플릿
+title: ''
+labels: feat
+assignees: ''
+
+---
+
+## 어떤 기능인가요?
+
+> 추가하려는 기능에 대해 간결하게 설명해주세요
+
+## 작업 상세 내용
+
+- [ ] TODO
+
+## 참고할만한 자료(선택)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+## 🧙 PR 타입
+- [ ] 기능 추가
+- [ ] 기능 삭제
+- [ ] 버그 수정
+- [ ] 의존성, 환경 변수, 빌드 관련 코드 업데이트
+
+## #️⃣연관 이슈
+
+> ex) #이슈번호
+
+## 📝작업 내용
+
+> 이번 PR에서 작업한 내용을 간략히 설명해주세요
+
+## 💬리뷰 시 요구사항 (선택)
+
+> 리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요
+>

.github/workflows/cd.yml

@@ -0,0 +1,65 @@
+name: CD
+
+on:
+  push:
+    branches:
+      - main
+
+permissions: write-all
+
+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'
+
+      # gradle 캐싱
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      # prod properties 설정
+      - name: Make application-prod.properties
+        run: |
+          cd ./src/main/resources
+          touch ./application-prod.properties
+          echo "${{ secrets.PROPERTIES_PROD }}" > ./application-prod.properties
+        shell: bash
+
+      # test를 제외한 프로젝트 빌드
+      - name: Build With Gradle
+        run: ./gradlew build -x test
+
+      # 도커 빌드 & 이미지 push
+      - name: Docker build & Push
+        run: |
+          docker login -u ${{ secrets.DOCKER_ID }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }}/algobaro-api .
+          docker push ${{ secrets.DOCKER_REPO }}/algobaro-api
+      # docker-compose 파일을 ec2 서버에 배포
+      - name: Deploy to Prod
+        uses: appleboy/ssh-action@master
+        id: deploy-prod
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
+          envs: GITHUB_SHA
+          script: |
+            docker stop algobaro-api
+            docker rm algobaro-api
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/algobaro-api
+            docker run -d --name algobaro-api -p 8080:8080 ${{ secrets.DOCKER_REPO }}/algobaro-api
+            docker rmi -f $(docker images -f "dangling=true" -q)

.github/workflows/ci.yml

@@ -0,0 +1,81 @@
+# 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 Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+# 테스트 결과 작성을 위해 쓰기권한 추가
+permissions: write-all
+
+# 해당 Workflow의 Job 목록
+jobs:
+  build:
+    # Runner가 실행되는 환경을 정의
+    runs-on: ubuntu-latest
+
+    # build Job 내의 step 목록
+    steps:
+      # uses 키워드를 통해 Action 호출
+      - uses: actions/checkout@v4
+      # jdk 세팅
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+        # gradle 캐싱
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      ### CI
+      #gradlew 권한 추가
+      - name: Grant Execute Permission For Gradlew
+        run: chmod +x gradlew
+
+      #test를 제외한 프로젝트 빌드
+      - name: Build With Gradle
+        run: ./gradlew build -x test
+
+      #test를 위한 mysql설정
+      - name: Start MySQL
+        uses: samin/[email protected]
+        with:
+          host port: 3305
+          container port: 3305
+          mysql database: 'algobaro'
+          mysql user: 'admin'
+          mysql password: 'admin1234'
+
+      #테스트를 위한 test properties 설정
+      - name: Make application-test.properties
+        run: |
+          cd ./src/test/resources
+          touch ./application.properties
+          echo "${{ secrets.PROPERTIES_TEST }}" > ./application.properties
+        shell: bash
+
+      #test코드 빌드
+      - name: Build With Test
+        run: ./gradlew test
+
+      #테스트 결과 파일 생성
+      - name: Publish Unit Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        if: ${{ always() }}
+        with:
+          files: build/test-results/**/*.xml

Dockerfile

@@ -0,0 +1,4 @@
+FROM openjdk:17
+ARG JAR_FILE=./build/libs/algobaro-api-0.0.1-SNAPSHOT.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar", "--spring.profiles.active=prod"]

build.gradle

@@ -23,11 +23,35 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+
+    // Validation
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    // Spring Security
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    // JWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // Lombok
     compileOnly 'org.projectlombok:lombok'
-    runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
+
+    // MySQL
+    runtimeOnly 'com.mysql:mysql-connector-j'
+
+    // QueryDSL
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    // Swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
 }

docker-compose.yml

@@ -0,0 +1,29 @@
+version: "3"
+
+services:
+  database:
+    container_name: mysql
+    image: mysql/mysql-server:latest
+    environment:
+      MYSQL_DATABASE: algobaro
+      MYSQL_USER: admin
+      MYSQL_PASSWORD: admin1234
+      MYSQL_ROOT_HOST: '%'
+      MYSQL_ROOT_PASSWORD: rootpwd
+    command:
+      - --default-authentication-plugin=mysql_native_password
+    ports:
+      - 3305:3306
+    networks:
+      - db_network
+    restart: always
+  mytamla:
+    build: .
+    expose:
+      - 8080
+    depends_on:
+      - database
+
+networks:
+  db_network:
+    driver: bridge

src/main/java/e5i/algobaroapi/AlgobaroApiApplication.java → src/main/java/ei/algobaroapi/AlgobaroApiApplication.java

@@ -1,4 +1,4 @@
-package e5i.algobaroapi;
+package ei.algobaroapi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/ei/algobaroapi/domain/auth/controller/AuthController.java

@@ -0,0 +1,42 @@
+package ei.algobaroapi.domain.auth.controller;
+
+import ei.algobaroapi.domain.auth.dto.AuthSignInRequest;
+import ei.algobaroapi.domain.auth.dto.AuthSignInResponse;
+import ei.algobaroapi.domain.auth.dto.AuthSignUpRequest;
+import ei.algobaroapi.domain.auth.service.AuthService;
+import ei.algobaroapi.domain.member.domain.Member;
+import ei.algobaroapi.global.config.swaggerdoc.AuthControllerDoc;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1")
+public class AuthController implements AuthControllerDoc {
+
+    private final AuthService authService;
+
+    @Override
+    @PostMapping("/auth/sign-up")
+    public void signUp(@RequestBody AuthSignUpRequest request) {
+        this.authService.signUp(request);
+    }
+
+    @Override
+    @PostMapping("/auth/sign-in")
+    public AuthSignInResponse signIn(@RequestBody AuthSignInRequest request) {
+        return this.authService.signIn(request);
+    }
+
+    @Override
+    @GetMapping("/auth/test")
+    public String hello(@AuthenticationPrincipal Member member) {
+        System.out.println(member.getEmail().getEmail());
+        return "Hello, World!";
+    }
+}

src/main/java/ei/algobaroapi/domain/auth/dto/AuthSignInRequest.java

@@ -0,0 +1,10 @@
+package ei.algobaroapi.domain.auth.dto;
+
+import lombok.Getter;
+
+@Getter
+public class AuthSignInRequest {
+
+    private String email;
+    private String password;
+}

src/main/java/ei/algobaroapi/domain/auth/dto/AuthSignInResponse.java

@@ -0,0 +1,16 @@
+package ei.algobaroapi.domain.auth.dto;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public class AuthSignInResponse {
+
+    private final String accessToken;
+
+    public static AuthSignInResponse of(String accessToken) {
+        return new AuthSignInResponse(accessToken);
+    }
+}

src/main/java/ei/algobaroapi/domain/auth/dto/AuthSignUpRequest.java

@@ -0,0 +1,20 @@
+package ei.algobaroapi.domain.auth.dto;
+
+import ei.algobaroapi.domain.member.domain.Member;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class AuthSignUpRequest {
+
+    private String email;
+    private String password;
+
+    public Member toEntity(String encryptPassword) {
+        return Member.builder()
+                .email(this.email)
+                .password(encryptPassword)
+                .build();
+    }
+}