테스트2

.github/CODEOWNERS

@@ -0,0 +1 @@
+*.java @gaaji/test

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 env:
-  DOCKER_IMAGE: ghcr.io/${{ github.actor }}/gaaji-auth-service
+  DOCKER_IMAGE: ghcr.io/gaaji/auth-service
   VERSION: ${{ github.sha }}
 
 
@@ -33,20 +33,21 @@ jobs:
         SECRET_FILE_NAME: secret.yml
       run: echo $SECRET_CODE | base64 --decode > $SECRET_DIR/$SECRET_FILE_NAME
 
-    - name: Create application-oauth.yml
+    - name: Create oauth.yml
       env:
        SECRET_CODE: ${{ secrets.OAUTH }}
        SECRET_DIR: src/main/resources
-       SECRET_FILE_NAME: application-oauth.yml
+       SECRET_FILE_NAME: oauth.yml
+      run: echo $SECRET_CODE | base64 --decode > $SECRET_DIR/$SECRET_FILE_NAME
+    - name: Create kafka.yml
+      env:
+        SECRET_CODE: ${{ secrets.KAFKA }}
+        SECRET_DIR: src/main/resources
+        SECRET_FILE_NAME: kafka.yml
       run: echo $SECRET_CODE | base64 --decode > $SECRET_DIR/$SECRET_FILE_NAME
-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
-    - name : Set Eureka Server
-      run: |
-        docker pull ${{ secrets.EUREKA  }}
-        docker run -d -p 8761:8761 ${{ secrets.EUREKA }}
 
     - name: Build with Gradle
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
@@ -74,4 +75,4 @@ jobs:
         context: . 			# dockerfile이 있는 위치랑 맞춰주자
         file: ./Dockerfile	# 빌드할 Dockerfile이 있는 디렉토리
         push: true
-        tags: ${{ env.DOCKER_IMAGE }}:local
+        tags: ${{ env.DOCKER_IMAGE }}:local

.gitignore

@@ -37,5 +37,7 @@ out/
 .vscode/
 
 ### security
-/src/main/resources/application-oauth.yml
-/src/main/resources/secret.yml
+/src/main/resources/oauth.yml
+/src/main/resources/secret.yml
+/src/main/resources/kafka.yml
+/spy.log

build.gradle

@@ -28,6 +28,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.kafka:spring-kafka'
+
 
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
@@ -43,6 +45,7 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
+    testImplementation 'org.springframework.kafka:spring-kafka-test'
 }
 
 dependencyManagement {

pull_request_template.md

@@ -0,0 +1,30 @@
+# Issue# - Issue
+## Description
+> 
+
+## PR Type
+- [ ] Hotfix
+- [ ] Feature
+- [ ] Code style update
+- [ ] Refactor (code, package, etc.)
+- [ ] Build (gradle, spring, etc) 
+- [ ] Documentation content changes (api docs, etc.)
+- [ ] Infra (cloud, security, etc.)
+- [ ] Other... Please describe :
+
+## Related Issues
+- 
+
+## Issues
+
+### Test
+
+*** 
+
+## Related Files
+- `file`
+
+## Think About..  
+
+## Conclusion  
+> 

src/main/java/com/gaaji/auth/adaptor/KafkaProducer.java

@@ -0,0 +1,9 @@
+package com.gaaji.auth.adaptor;
+
+import com.gaaji.auth.event.NicknameChangedEvent;
+
+public interface KafkaProducer {
+
+    void publishNicknameChangedEvent(NicknameChangedEvent event);
+
+}

src/main/java/com/gaaji/auth/adaptor/KafkaProducerImpl.java

@@ -0,0 +1,28 @@
+package com.gaaji.auth.adaptor;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gaaji.auth.event.NicknameChangedEvent;
+import lombok.RequiredArgsConstructor;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Service;
+
+@RequiredArgsConstructor
+@Service
+public class KafkaProducerImpl implements KafkaProducer {
+
+    private final KafkaTemplate<String,String> kafkaTemplate;
+
+    @Override
+    public void publishNicknameChangedEvent(NicknameChangedEvent event) {
+
+        String nicknameChangedEvent = null;
+        try {
+            nicknameChangedEvent = new ObjectMapper().writeValueAsString(event);
+            kafkaTemplate.send("nickname-changed",nicknameChangedEvent);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}

src/main/java/com/gaaji/auth/applicationservice/AuthRetrieveServiceImpl.java

@@ -3,6 +3,7 @@
 import com.gaaji.auth.controller.dto.RetrieveResponse;
 import com.gaaji.auth.domain.Auth;
 import com.gaaji.auth.domain.AuthId;
+import com.gaaji.auth.exception.AuthIdNotFoundException;
 import com.gaaji.auth.repository.AuthRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -19,7 +20,7 @@ public class AuthRetrieveServiceImpl implements
     @Override
     public RetrieveResponse retrieveAuth(String authId) {
         Auth auth = authRepository.findById(authId)
-                .orElseThrow();
+                .orElseThrow(AuthIdNotFoundException::new);
         return RetrieveResponse.of(authId, auth.getNickname(), auth.getMannerTemperature(), auth.getProfilePictureUrl());
     }
 }

src/main/java/com/gaaji/auth/applicationservice/MannerRetriveService.java

@@ -0,0 +1,14 @@
+package com.gaaji.auth.applicationservice;
+
+import java.util.List;
+
+import com.gaaji.auth.domain.BadManner;
+import com.gaaji.auth.domain.GoodManner;
+
+public interface MannerRetriveService {
+
+	List<GoodManner> retriveGoodMannerList();
+
+	List<BadManner> retriveBadMannerList();
+
+}

src/main/java/com/gaaji/auth/applicationservice/MannerRetriveServiceImpl.java

@@ -0,0 +1,31 @@
+package com.gaaji.auth.applicationservice;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.gaaji.auth.domain.BadManner;
+import com.gaaji.auth.domain.GoodManner;
+import com.gaaji.auth.repository.AuthRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Transactional
+@Service
+public class MannerRetriveServiceImpl implements MannerRetriveService {
+
+	@Override
+	public List<GoodManner> retriveGoodMannerList() {
+		return Arrays.asList(GoodManner.values());
+	}
+
+	@Override
+	public List<BadManner> retriveBadMannerList() {
+		return Arrays.asList(BadManner.values());
+
+	}
+
+}

src/main/java/com/gaaji/auth/applicationservice/NicknameRegisterServiceImpl.java

@@ -1,5 +1,8 @@
 package com.gaaji.auth.applicationservice;
 
+import com.gaaji.auth.adaptor.KafkaProducer;
+import com.gaaji.auth.event.Events;
+import com.gaaji.auth.event.NicknameChangedEvent;
 import com.gaaji.auth.domain.Auth;
 import com.gaaji.auth.exception.AuthIdNotFoundException;
 import com.gaaji.auth.repository.AuthRepository;
@@ -21,5 +24,6 @@ public void registerNickname(String authId, String nickname){
                 .orElseThrow(AuthIdNotFoundException::new);
 
         auth.registerNickname(nickname);
+        Events.raise(new NicknameChangedEvent(authId, nickname));
     }
 }

src/main/java/com/gaaji/auth/applicationservice/ReviewCreateService.java

@@ -0,0 +1,11 @@
+package com.gaaji.auth.applicationservice;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.gaaji.auth.controller.dto.ReviewCreateRequest;
+
+public interface ReviewCreateService {
+
+	void createReview(String authId, MultipartFile multipartFile, ReviewCreateRequest dto);
+
+}

src/main/java/com/gaaji/auth/applicationservice/ReviewCreateServiceImpl.java

@@ -0,0 +1,112 @@
+package com.gaaji.auth.applicationservice;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.gaaji.auth.adaptor.S3Uploader;
+import com.gaaji.auth.controller.dto.ReviewCreateRequest;
+import com.gaaji.auth.domain.AuthId;
+import com.gaaji.auth.domain.BadManner;
+import com.gaaji.auth.domain.Comment;
+import com.gaaji.auth.domain.GoodManner;
+import com.gaaji.auth.domain.PostId;
+import com.gaaji.auth.domain.Review;
+import com.gaaji.auth.domain.ReviewId;
+import com.gaaji.auth.exception.EqualsSellerAndPurchaserException;
+import com.gaaji.auth.exception.NoMatchIdException;
+import com.gaaji.auth.exception.NoReviewException;
+import com.gaaji.auth.exception.NoTownException;
+import com.gaaji.auth.exception.NonexistentTargetException;
+import com.gaaji.auth.repository.ReviewRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Transactional
+@Service
+public class ReviewCreateServiceImpl implements ReviewCreateService {
+
+	private final ReviewRepository reviewRepository;
+	private final S3Uploader s3Uploader;
+
+	@Override
+	public void createReview(String authId, MultipartFile multipartFile,ReviewCreateRequest dto) {
+		saveEntity(createReviewEntity(dto, multipartFile, authId));
+	}
+
+	private void saveEntity(Review review) {
+		this.reviewRepository.save(review);
+	}
+
+	private Review createReviewEntity(ReviewCreateRequest dto, MultipartFile multipartFile, String authId) {
+		if(dto.getTown() == null) {
+			throw new NoTownException();
+		}
+
+		if((dto.getPurchaserId() == null) || dto.getSellerId() == null) {
+			throw new NonexistentTargetException();
+		} 
+
+		if((dto.getContents() == null) && (dto.getGoodManners().size() == 0) && (dto.getBadManners().size() == 0)) {
+			throw new NoReviewException();
+		}
+
+		if(dto.getSellerId().equals(dto.getPurchaserId())) {
+			throw new EqualsSellerAndPurchaserException();
+		}
+
+		String pictureUrl = uploadImage(multipartFile);
+		List<GoodManner> goodManners = getGoodManners(dto.getGoodManners());
+		List<BadManner> badManners = getBaddManners(dto.getBadManners());
+		if (dto.getPurchaserId().equals(authId)) {
+			return Review.of(ReviewId.of(this.reviewRepository.nextId()), PostId.of(dto.getPostId()), AuthId.of(authId),
+					AuthId.of(dto.getSellerId()), goodManners, badManners,
+					Comment.of(pictureUrl, dto.getContents(), dto.getTown(), true));
+
+		} else if (dto.getSellerId().equals(authId)) {
+			return Review.of(ReviewId.of(this.reviewRepository.nextId()), PostId.of(dto.getPostId()), AuthId.of(authId),
+					AuthId.of(dto.getPurchaserId()), goodManners, badManners,
+					Comment.of(pictureUrl, dto.getContents(), dto.getTown(), false));
+		} else {
+			throw new NoMatchIdException();
+		}
+	}
+
+	private List<BadManner> getBaddManners(List<String> badManners) {
+		if (badManners.size() == 0) {
+			return null;
+		}
+
+		List<BadManner> badMannerList = new ArrayList<BadManner>();
+
+		for (String badManner : badManners) {
+			badMannerList.add(BadManner.valueOf(badManner));
+		}
+		return badMannerList;
+	}
+
+	private List<GoodManner> getGoodManners(List<String> goodManners) {
+		if (goodManners.size() == 0) {
+			return null;
+		}
+
+		List<GoodManner> goodMannerList = new ArrayList<GoodManner>();
+
+		for (String goodManner : goodManners) {
+			goodMannerList.add(GoodManner.valueOf(goodManner));
+		}
+		return goodMannerList;
+	}
+
+	private String uploadImage(MultipartFile multipartFile) {
+		if(multipartFile == null) {
+			return null;
+		}
+		return s3Uploader.upload(multipartFile);
+	}
+
+}

src/main/java/com/gaaji/auth/applicationservice/ReviewRetriveService.java

@@ -0,0 +1,20 @@
+package com.gaaji.auth.applicationservice;
+
+import java.util.List;
+
+import com.gaaji.auth.controller.dto.CommentRetrieveResponse;
+import com.gaaji.auth.controller.dto.MannerRetrieveResponse;
+import com.gaaji.auth.controller.dto.PreviewReviewRetrieveResponse;
+import com.gaaji.auth.controller.dto.ReviewRetrieveResponse;
+
+public interface ReviewRetriveService {
+
+	ReviewRetrieveResponse retriveMyReview(String authId, String postId);
+
+	List<CommentRetrieveResponse> retriveComment(String userId);
+
+	MannerRetrieveResponse retriveManner(String authId, String userId);
+
+	PreviewReviewRetrieveResponse retriveReview(String userId);
+
+}