Feature/docker

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@
 # 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
+name: Java CI with Gradle and Docker for WashPedia Project
 
 on:
   push:
@@ -31,10 +31,12 @@ jobs:
 
       # Gradle Build를 위한 권한 부여
       - name: Grant execute permission for gradlew
+        working-directory: ./module-api
         run: chmod +x ./gradlew
 
       # Gradle Build (test 제외)
       - name: Build with Gradle
+        working-directory: ./module-api
         run: ./gradlew clean build -x test
 
       # DockerHub 로그인
@@ -43,17 +45,28 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+
+      # DockerCompose 세팅
+      - name: Set up Docker Compose
+        uses: microsoft/variable-substitution@v1
+        with:
+          files: ./docker-compose.yml
+        env:
+          services.db-edit.environment.POSTGRES_USER: ${{ secrets.POSTGRE_USER }}
+          services.db-edit.environment.POSTGRES_PASSWORD: ${{ secrets.POSTGRE_PASSWORD }}
+          services.webapp.image: ${{ secrets.DOCKER_IMAGE }}
+
       # Docker 이미지 빌드
-      - name: Docker Image Build
-        run: docker build -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.PROJECT_NAME }} . --platform=linux/amd64
+      - name: Docker Compose Build
+        run: docker-compose build
 
       # DockerHub Push
       - name: DockerHub Push
-        run: docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.PROJECT_NAME }}
+        run: docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.PROJECT_NAME }}:latest
 
 #  deploy:
 #    runs-on: ubuntu-latest
-#    steps:
+#    steps:cd
 #
 #      - name: Application Run
 #        uses: appleboy/[email protected]

docker-compose.yml

@@ -0,0 +1,49 @@
+version: '3.8'
+services:
+  webapp:
+    build: ./module-api
+    image: ${IMAGE}
+    ports:
+      - "8080:8080"
+    depends_on:
+      - db-edit
+
+#  batch:
+#    build: ./module-batch
+#    ports:
+#      - "8082:8080"
+#    depends_on:
+#      - db-edit
+#
+#  admin:
+#    build: ./module-admin
+#    ports:
+#      - "8083:8080"
+#    depends_on:
+#      - db-read
+
+  db-edit:
+    image: younglong/pg-washpedia:latest
+    volumes:
+      - ./postgreReadOnlyDB:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: edit_db
+      POSTGRES_USER: ${USER}
+      POSTGRES_PASSWORD: ${PASSWORD}
+    ports:
+      - "5432:5432"
+
+#  db-read:
+#    image: younglong/pg-washpedia:latest
+#    volumes:
+#      - postgreEditDB:/var/lib/postgresql/data
+#    environment:
+#      POSTGRES_DB: read_db
+#      POSTGRES_USER: ${{ secrets.PROJECT_USER }}
+#      POSTGRES_PASSWORD: ${{ secrets.POSTGRE_PASSWORD }}
+#    ports:
+#      - "5433:5433"
+
+volumes:
+  db-read-volume: {}
+  db-edit-volume: {}

module-api/Dockerfile

@@ -1,5 +1,10 @@
 FROM openjdk:17-jdk
 CMD ["./gradlew", "clean", "build"]
-ARG JAR_FILE=module-api/build/libs/washpedia-0.0.1-SNAPSHOT.jar
+ARG JAR_FILE=./build/libs/module-api-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} washpedia.jar
-ENTRYPOINT ["java", "-jar", "washpedia.jar"]
+ENTRYPOINT ["java", "-jar", "washpedia.jar"]
+
+
+
+
+

module-api/src/main/java/com/kernel360/member/controller/MemberController.java

@@ -1,38 +1,17 @@
 package com.kernel360.member.controller;
 
-import ch.qos.logback.core.model.Model;
+
 import com.kernel360.member.dto.MemberDto;
-import com.kernel360.member.service.MemberService;
-import com.kernel360.utils.JWT;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
-@Slf4j
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/member/")
+@RequestMapping("/member")
 public class MemberController {
-
-    private final MemberService memberService;
-
-    /** 가입 **/
     @PostMapping("/join")
-    public ResponseEntity<Model> joinMember (@ModelAttribute MemberDto joinRequestDto){
-
-        try{
-            memberService.joinMember(joinRequestDto);
-        }catch (IllegalArgumentException args){
-            log.error("가입에러발생", args);
-        }
-
-        return new ResponseEntity<>(null, HttpStatus.CREATED);
+    public String signup(@RequestBody MemberDto memberDto ) {
+        return "member/signup";
     }
-
-
 }

module-api/src/main/java/com/kernel360/member/dto/MemberDto.java

@@ -19,7 +19,6 @@ public record MemberDto(Integer memberNo,
                         String modifiedBy
 ) {
 
-    /** New All **/
     public static MemberDto of(
             Integer memberNo,
             String id,
@@ -46,27 +45,6 @@ public static MemberDto of(
         );
     }
 
-    /** joinMember **/
-    public static MemberDto of(
-            String id,
-            String email,
-            String password
-    ){
-        return new MemberDto(
-                null,
-                id,
-                email,
-                password,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null
-        );
-    }
-
-    /** Entity -> DTO **/
     public static MemberDto from(Member entity) {
         return MemberDto.of(
                 entity.getMemberNo(),
@@ -82,15 +60,14 @@ public static MemberDto from(Member entity) {
         );
     }
 
-    /** DTO -> Entity All binding **/
-    public static Member toEntity(MemberDto memberDto) {
+    public Member toEntity(MemberDto memberDto) {
         return Member.of(
-                memberDto.memberNo,
-                memberDto.id,
-                memberDto.email,
-                memberDto.password,
-                memberDto.gender,
-                memberDto.birthdate
+                this.memberNo,
+                this.id,
+                this.email,
+                this.password,
+                this.gender,
+                this.birthdate
         );
     }
 }

module-api/src/main/java/com/kernel360/member/service/MemberService.java

@@ -1,33 +1,33 @@
-package com.kernel360.member.service;
-
-import com.kernel360.member.dto.MemberDto;
-import com.kernel360.member.entity.Member;
-import com.kernel360.member.repository.MemberRepository;
-import com.kernel360.utils.ConvertSHA256;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class MemberService {
-
-    final private MemberRepository memberRepository;
-    /** 가입 로직 **/
-    public void joinMember(MemberDto requestDto){
-
-        String encodePassword = ConvertSHA256.convertToSHA256(requestDto.password());
-
-        Member entity = getNewJoinMemberEntity(requestDto,encodePassword);
-
-        memberRepository.save(entity);
-    }
+//package com.kernel360.member.service;
+//
+//import com.kernel360.member.dto.MemberDto;
+//import com.kernel360.member.entity.Member;
+//import com.kernel360.member.repository.MemberRepository;
+//import com.kernel360.utils.ConvertSHA256;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Service;
+//
+//
+//@Slf4j
+//@Service
+//@RequiredArgsConstructor
+//public class MemberService {
+//
+//    final private MemberRepository memberRepository;
+//    /** 가입 로직 **/
+//    public void joinMember(MemberDto requestDto){
+//
+//        String encodePassword = ConvertSHA256.convertToSHA256(requestDto.password());
+//
+//        Member entity = getNewJoinMemberEntity(requestDto,encodePassword);
+//
+//        memberRepository.save(entity);
+//    }
 
-    private Member getNewJoinMemberEntity (MemberDto dto, String password){
-        return Member.createJoinMember(dto.id(),dto.email(),password);
-    }
+//    private Member getNewJoinMemberEntity (MemberDto dto, String password){
+//        return Member.createJoinMember(dto.id(),dto.email(),password);
+//    }
 
 //
 //    public void login(){
@@ -76,4 +76,4 @@ private Member getNewJoinMemberEntity (MemberDto dto, String password){
 ////                - 패스워드 재설정 resetPasswordByAuthKey
 //
 //    }
-}
+//}

module-api/src/main/java/com/kernel360/product/service/ProductService.java

@@ -31,4 +31,5 @@ public List<ProductDto> getProductListByKeyword(String keyword) {
 
         return products.stream().map(ProductDto::from).toList();
     }
+
 }