Dev

.github/workflows/actions.yml

@@ -2,7 +2,7 @@ name: ModernFarmer CI/CD
 
 on:
   push:
-    branches: ["dev"]
+    branches: ["feature_32/계정-삭제-api", "dev"]
 
 permissions:
   contents: read
@@ -49,6 +49,7 @@ jobs:
           echo "${{ secrets.PROPERTIES_YML }}" > ./application.yml
         shell: bash
 
+
       # 빌드(테스트 스킵)
       - name: Build with Gradle
         run: ./gradlew build -x test
@@ -68,8 +69,9 @@ jobs:
           username: ubuntu
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           script: |
+
             docker stop ModernFarmerUser
             docker rm ModernFarmerUser
             docker rmi ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:1.0
             docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:1.0
-            docker run -d -p 80:8080 --name ModernFarmerUser ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:1.0
+            docker run -d -p 8081:8081 --name ModernFarmerUser ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:1.0

.jpb/jpb-settings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaPluginProjectSettings">
+    <option name="entityNameTemplate" />
+    <option name="isLombokBuilder" value="true" />
+    <option name="isLombokAllArgsConstructor" value="true" />
+    <option name="isLombokNoArgsConstructor" value="true" />
+    <option name="scaffoldingLanguage" />
+  </component>
+</project>

build.gradle

@@ -21,11 +21,17 @@ repositories {
     mavenCentral()
 }
 
+ext {
+    set('springCloudVersion', "2021.0.8")
+}
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
@@ -39,6 +45,19 @@ dependencies {
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
+
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+    // firebase sdk
+    implementation 'com.google.firebase:firebase-admin:6.8.1'
+    // okhttp
+    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.2.2'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
 }
 
 tasks.named('test') {

src/main/java/modernfarmer/server/farmususer/FarmusUserApplication.java

@@ -2,8 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@EnableJpaAuditing
+@EnableDiscoveryClient
 @SpringBootApplication
+@EnableFeignClients
 public class FarmusUserApplication {
 
     public static void main(String[] args) {

src/main/java/modernfarmer/server/farmususer/community/CommunityServiceFeignClient.java

@@ -0,0 +1,20 @@
+package modernfarmer.server.farmususer.community;
+
+
+import modernfarmer.server.farmususer.user.dto.response.BaseResponseDto;
+import modernfarmer.server.farmususer.user.entity.BaseEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(url = "http://3.38.2.59:8082", name = "community-service")
+public interface CommunityServiceFeignClient {
+
+    @DeleteMapping("/api/community/posting/all-posting/{userId}")
+    void deleteAllPosting(@PathVariable("userId") Long userId);
+
+
+
+
+}

src/main/java/modernfarmer/server/farmususer/farm/FarmServiceFeignClient.java

@@ -0,0 +1,14 @@
+package modernfarmer.server.farmususer.farm;
+
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(url = "http://3.36.221.140:8081", name = "farm-service")
+public interface FarmServiceFeignClient {
+
+    @DeleteMapping("/api/veggie/{userId}")
+    void deleteAllVeggies(@PathVariable("userId") Long userId);
+
+}

src/main/java/modernfarmer/server/farmususer/global/config/Firebase/FcmMessage.java

@@ -0,0 +1,31 @@
+package modernfarmer.server.farmususer.global.config.Firebase;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@AllArgsConstructor
+@Getter
+public class FcmMessage {
+    private boolean validate_only;
+    private Message message;
+    @Builder
+    @AllArgsConstructor
+    @Getter
+    public static class Message {
+
+        private Notification notification;
+
+        private String token;
+    }
+    @Builder
+    @AllArgsConstructor
+    @Getter
+    public static class Notification {
+        private String title;
+        private String body;
+        private String image;
+
+         }
+}

src/main/java/modernfarmer/server/farmususer/global/config/Firebase/FirebaseCloudMessageService.java

@@ -0,0 +1,64 @@
+package modernfarmer.server.farmususer.global.config.Firebase;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.auth.oauth2.GoogleCredentials;
+import lombok.RequiredArgsConstructor;
+import okhttp3.*;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class FirebaseCloudMessageService {
+
+    private final String API_URL = "https://fcm.googleapis.com/v1/projects/tourcash-13092/messages:send";  // 프론트에서 제공한 url
+    private final ObjectMapper objectMapper;
+
+     public void sendMessageTo(String targetToken, String title, String body) throws IOException {
+         String message = makeMessage(targetToken, title, body);
+         OkHttpClient client = new OkHttpClient();
+         RequestBody requestBody = RequestBody.create(message, MediaType.get("application/json; charset=utf-8"));
+         Request request = new Request.Builder()
+                 .url(API_URL)
+                 .post(requestBody)
+                 .addHeader(HttpHeaders.AUTHORIZATION, "Bearer " + getAccessToken())
+                 .addHeader(HttpHeaders.CONTENT_TYPE, "application/json; UTF-8")
+                 .build();
+         Response response = client.newCall(request)
+                 .execute();
+
+         System.out.println(response.body().string());
+
+           }
+     private String makeMessage(String targetToken, String title, String body) throws JsonProcessingException {
+         FcmMessage fcmMessage = FcmMessage.builder()
+                                     .message(FcmMessage.Message.builder()
+                                     .token(targetToken)
+                                         .notification(FcmMessage.Notification.builder()
+                                         .title(title)
+                                         .body(body)
+                                         .image(null)
+                                         .build()
+                                         ).build()
+                                     )
+                                     .validate_only(false)
+                                     .build();
+         return objectMapper.writeValueAsString(fcmMessage);
+     }
+
+
+    private String getAccessToken() throws IOException {
+        String firebaseConfigPath = "firebase/firebase_service_key.json";     // 프론트에서 받은 파일을 해당 위치에 넣기
+        GoogleCredentials googleCredentials = GoogleCredentials
+                         .fromStream(new ClassPathResource(firebaseConfigPath).getInputStream())
+                         .createScoped(List.of("https://www.googleapis.com/auth/cloud-platform"));
+        googleCredentials.refreshIfExpired();
+        return googleCredentials.getAccessToken().getTokenValue();
+    }
+
+}

src/main/java/modernfarmer/server/farmususer/global/config/redis/RedisConfig.java

@@ -24,8 +24,7 @@ public RedisConnectionFactory redisConnectionFactory() {
         RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration();
         redisStandaloneConfiguration.setHostName(redisHost);
         redisStandaloneConfiguration.setPort(Integer.parseInt(redisPort));
-        LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(redisStandaloneConfiguration);
-        return lettuceConnectionFactory;
+        return new LettuceConnectionFactory(redisStandaloneConfiguration);
     }
 
     @Bean

src/main/java/modernfarmer/server/farmususer/global/config/s3/S3Config.java

@@ -0,0 +1,28 @@
+package modernfarmer.server.farmususer.global.config.s3;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class S3Config {
+    @Value("${cloud.aws.credentials.access-key}")
+    private String accessKey;
+    @Value("${cloud.aws.credentials.secret-key}")
+    private String secretKey;
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    @Bean
+    public AmazonS3Client amazonS3Client() {
+        BasicAWSCredentials awsCredentials= new BasicAWSCredentials(accessKey, secretKey);
+        return (AmazonS3Client) AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                .build();
+    }
+}

src/main/java/modernfarmer/server/farmususer/global/config/s3/S3Uploader.java

@@ -0,0 +1,68 @@
+package modernfarmer.server.farmususer.global.config.s3;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.UUID;
+
+@Slf4j
+@Component
+public class S3Uploader {
+    private final AmazonS3Client amazonS3Client;
+
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+    public S3Uploader(AmazonS3Client amazonS3Client) {
+        this.amazonS3Client = amazonS3Client;
+    }
+
+    public String uploadFiles(
+            MultipartFile multipartFile, String dirName) throws IOException {
+        File uploadFile = convert(multipartFile).orElseThrow(() ->
+                new IllegalArgumentException("error: MultipartFile -> File convert fail"));
+        return upload(uploadFile, dirName);
+    }
+
+    public String upload(File uploadFile, String filePath) {
+        String fileName = filePath + "/" + UUID.randomUUID() + uploadFile.getName();
+        String uploadImageUrl = putS3(uploadFile, fileName);
+        removeNewFile(uploadFile);
+        return uploadImageUrl;
+    }
+
+    private String putS3(File uploadFile, String fileName) {
+        amazonS3Client.putObject(
+                new PutObjectRequest(bucket, fileName, uploadFile)
+                        .withCannedAcl(CannedAccessControlList.PublicRead));
+        return amazonS3Client.getUrl(bucket, fileName).toString();
+    }
+
+    private void removeNewFile(File targetFile) {
+        if (targetFile.delete()) {
+            System.out.println("File delete success");
+            return;
+        }
+        System.out.println("File delete fail");
+    }
+
+    private Optional<File> convert(MultipartFile file) throws IOException {
+        File convertFile = new File(System.getProperty("user.dir") + "/" + file.getOriginalFilename());
+        if (convertFile.createNewFile()) {
+            try (FileOutputStream fileOutputStream = new FileOutputStream(convertFile)) {
+                fileOutputStream.write(file.getBytes());
+            }
+            return Optional.of(convertFile);
+        }
+        return Optional.empty();
+    }
+}

src/main/java/modernfarmer/server/farmususer/global/enums/Motivations.java

@@ -0,0 +1,54 @@
+package modernfarmer.server.farmususer.global.enums;
+
+public class Motivations {
+
+    public enum Motive_1 {
+        MOTIVE1_1("채소를 직접 길러\n식비를 줄여보세요!"),
+        MOTIVE1_2("직접 기른 채소로\n알뜰하고 현명한 식사를 해봐요!"),
+        MOTIVE1_3("오늘도 채솟값\n알뜰하게 아끼는 중!"),
+        MOTIVE1_4("홈파밍으로 지출은 줄이고\n성취감은 더해봐요"),
+        MOTIVE1_5("직접 기른 채소로\n매일 알뜰하게, 매일 특별하게!");
+
+        private final String motive1;
+
+        Motive_1(String motive1) {
+            this.motive1 = motive1;
+        }
+
+        public String getMotive() {
+            return motive1;
+        }
+    }
+    public enum Motive_2 {
+        MOTIVE2_1("직접 기른 채소를\n먹을 수 있는 그날까지!"),
+        MOTIVE2_2("신선함으로 가득 채워지는 식탁, \n늘 함께할게요!"),
+        MOTIVE2_3("눈으로 보는 재미, 입으로 맛보는\n홈파밍의 즐거움!");
+
+        private final String motive2;
+
+        Motive_2(String motive2) {
+            this.motive2 = motive2;
+        }
+
+        public String getMotive() {
+            return motive2;
+        }
+    }
+    public enum Motive_3 {
+        MOTIVE3_1("바쁜 일상에서 잠깐 벗어나\n텃밭을 가꿔봐요"),
+        MOTIVE3_2("홈파밍을 하며\n마음의 안정을 느껴봐요!"),
+        MOTIVE3_3("스트레스 받는 하루, \n홈파밍으로 힐링하세요"),
+        MOTIVE3_4("나만의 채소를 키우며\n소소한 성취감을 느껴보세요"),
+        MOTIVE3_5("성취감은 꾸준함에서! \n오늘도 함께 성장해요");
+
+        private final String motive3;
+
+        Motive_3(String motive3) {
+            this.motive3 = motive3;
+        }
+
+        public String getMotive() {
+            return motive3;
+        }
+    }
+}