Merge pull request codestates-seb#349 from codestates-seb/revert-348-…

…dev-be

Revert "[BE] ✨ 실시간 채팅 구현"

.github/workflows/server.yml

@@ -16,14 +16,12 @@ jobs:
       AWS_SECRET_KEY: ${{secrets.AWS_SECRET_KEY}}
       AWS_BUCKET_NAME: ${{secrets.AWS_BUCKET_NAME}}
       ADMIN_EMAIL: ${{secrets.ADMIN_EMAIL}}
-      GUEST_EMAIL: ${{secrets.GUEST_EMAIL}}
       GROWSTORY_EMAIL_USERNAME: ${{secrets.GROWSTORY_EMAIL_USERNAME}}
       GROWSTORY_EMAIL_PASSWORD: ${{secrets.GROWSTORY_EMAIL_PASSWORD}}
       G_CLIENT_ID: ${{secrets.G_CLIENT_ID}}
       G_CLIENT_SECRET: ${{secrets.G_CLIENT_SECRET}}
       JWT_SECRET_KEY: ${{secrets.JWT_SECRET_KEY}}
       KEY_STORE_PASSWORD: ${{secrets.KEY_STORE_PASSWORD}}
-      EVENT_KEY: ${{secrets.EVENT_KEY}}
       working-directory: ./server
 
     steps:
@@ -53,14 +51,12 @@ jobs:
           --build-arg AWS_SECRET_KEY="${{env.AWS_SECRET_KEY}}" \
           --build-arg AWS_BUCKET_NAME="${{env.AWS_BUCKET_NAME}}" \
           --build-arg ADMIN_EMAIL="${{env.ADMIN_EMAIL}}" \
-          --build-arg GUEST_EMAIL="${{env.GUEST_EMAIL}}" \
           --build-arg GROWSTORY_EMAIL_USERNAME="${{env.GROWSTORY_EMAIL_USERNAME}}" \
           --build-arg GROWSTORY_EMAIL_PASSWORD="${{env.GROWSTORY_EMAIL_PASSWORD}}" \
           --build-arg G_CLIENT_ID="${{env.G_CLIENT_ID}}" \
           --build-arg G_CLIENT_SECRET="${{env.G_CLIENT_SECRET}}" \
           --build-arg JWT_SECRET_KEY="${{env.JWT_SECRET_KEY}}" \
           --build-arg KEY_STORE_PASSWORD="${{env.KEY_STORE_PASSWORD}}" \
-          --build-arg EVENT_KEY="${{env.EVENT_KEY}}" \
           -t growstory-cicd . 
           docker tag growstory-cicd leest/growstory-cicd:${GITHUB_SHA::7}
           docker push leest/growstory-cicd:${GITHUB_SHA::7}
@@ -84,4 +80,4 @@ jobs:
             sudo docker rm -f server
             sudo docker pull leest/growstory-cicd:${GITHUB_SHA::7}
             sudo docker tag leest/growstory-cicd:${GITHUB_SHA::7} growstory-cicd
-            sudo docker run -d --name server -e TZ=Asia/Seoul -p 443:443 growstory-cicd
+            sudo docker run -d --name server -e TZ=Asia/Seoul -p 443:443 growstory-cicd

server/Dockerfile

@@ -6,7 +6,6 @@ ARG MYSQL_USER \
     MYSQL_PASSWORD \
     RDS_ENDPOINT \
     ADMIN_EMAIL \
-    GUEST_EMAIL \
     AWS_ACCESS_KEY \
     AWS_SECRET_KEY \
     AWS_BUCKET_NAME \
@@ -15,15 +14,13 @@ ARG MYSQL_USER \
     GROWSTORY_EMAIL_PASSWORD \
     GROWSTORY_EMAIL_USERNAME \
     JWT_SECRET_KEY \
-    KEY_STORE_PASSWORD \
-    EVENT_KEY
+    KEY_STORE_PASSWORD
 
 # ⭐ 'ENV' 예약어를 통해 전달받은 값을 실제 값과 매칭시켜야 한다.
 ENV MYSQL_USER=${MYSQL_USER} \
     MYSQL_PASSWORD=${MYSQL_PASSWORD} \
     RDS_ENDPOINT=${RDS_ENDPOINT} \
     ADMIN_EMAIL=${ADMIN_EMAIL} \
-    GUEST_EMAIL=${GUEST_EMAIL} \
     AWS_ACCESS_KEY=${AWS_ACCESS_KEY} \
     AWS_SECRET_KEY=${AWS_SECRET_KEY} \
     AWS_BUCKET_NAME=${AWS_BUCKET_NAME} \
@@ -32,8 +29,7 @@ ENV MYSQL_USER=${MYSQL_USER} \
     GROWSTORY_EMAIL_PASSWORD=${GROWSTORY_EMAIL_PASSWORD} \
     GROWSTORY_EMAIL_USERNAME=${GROWSTORY_EMAIL_USERNAME} \
     JWT_SECRET_KEY=${JWT_SECRET_KEY} \
-    KEY_STORE_PASSWORD=${KEY_STORE_PASSWORD} \
-    EVENT_KEY=${EVENT_KEY}
+    KEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
 
 # (2) COPY에서 사용될 경로 변수
 ARG JAR_FILE=build/libs/*-SNAPSHOT.jar

server/build.gradle

@@ -62,14 +62,6 @@ dependencies {
 
 	// spring-security-test 모듈 추가
 	testImplementation 'org.springframework.security:spring-security-test'
-
-	// websocket
-	implementation 'org.springframework.boot:spring-boot-starter-websocket'
-//	implementation 'org.webjars:sockjs-client'
-//	implementation 'org.webjars:stomp-websocket'
-	implementation 'org.springframework:spring-messaging'
-	implementation 'org.springframework.security:spring-security-messaging'
-
 }
 
 test {

server/src/main/java/com/growstory/GrowstoryApplication.java

@@ -2,20 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
 @EnableJpaAuditing
 @EnableAsync
-@EnableAspectJAutoProxy
-@SpringBootApplication(exclude = {
-		org.springframework.cloud.aws.autoconfigure.context.ContextInstanceDataAutoConfiguration.class,
-		org.springframework.cloud.aws.autoconfigure.context.ContextStackAutoConfiguration.class,
-		org.springframework.cloud.aws.autoconfigure.context.ContextRegionProviderAutoConfiguration.class
-})
+@SpringBootApplication
 public class GrowstoryApplication {
 
 	public static void main(String[] args) {

server/src/main/java/com/growstory/domain/account/controller/AccountController.java

@@ -7,10 +7,10 @@
 import com.growstory.global.response.SingleResponseDto;
 import com.growstory.global.utils.UriCreator;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -36,26 +36,12 @@ public class AccountController {
     @Operation(summary = "회원가입", description = "사용자 정보를 입력받아 계정 생성")
     @PostMapping("/signup")
     public ResponseEntity<HttpStatus> postAccount(@Valid @RequestBody AccountDto.Post accountPostDto) {
-        AccountDto.Response responseDto = accountService.createAccount(accountPostDto);
-        URI location = UriCreator.createUri(ACCOUNT_DEFAULT_URL, responseDto.getAccountId());
-
+        AccountDto.Response accountResponseDto = accountService.createAccount(accountPostDto);
+        URI location = UriCreator.createUri(ACCOUNT_DEFAULT_URL, accountResponseDto.getAccountId());
 
         return ResponseEntity.created(location).build();
     }
 
-    @Operation(summary = "회원가입", description = "게스트 계정 생성")
-    @PostMapping("/guest")
-    public ResponseEntity<?> postAccount() {
-        List<String> token = accountService.createAccount();
-        URI location = UriCreator.createUri(ACCOUNT_DEFAULT_URL, Long.parseLong(token.get(2)));
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Authorization", token.get(0));
-        headers.add("Refresh", token.get(1));
-
-        return ResponseEntity.created(location).headers(headers).build();
-    }
-
     @Operation(summary = "프로필 사진 수정", description = "입력받은 프로필 사진으로 정보 수정")
     @PatchMapping(value = "/profileimage", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<HttpStatus> patchProfileImage(@RequestPart MultipartFile profileImage) {
@@ -170,12 +156,4 @@ public ResponseEntity<HttpStatus> deleteAccount() {
 
         return ResponseEntity.noContent().build();
     }
-
-    @Operation(summary = "게스트 회원 탈퇴", description = "게스트 사용자 계정 삭제")
-    @DeleteMapping("/guest/{account-id}")
-    public ResponseEntity<HttpStatus> deleteAccount(@Positive @PathVariable("account-id") Long accountId){
-        accountService.deleteAccount(accountId);
-
-        return ResponseEntity.noContent().build();
-    }
 }

server/src/main/java/com/growstory/domain/account/dto/AccountDto.java

@@ -1,7 +1,6 @@
 package com.growstory.domain.account.dto;
 
 import com.growstory.domain.point.entity.Point;
-import com.growstory.global.badwords.dto.TextContainer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,7 +16,7 @@ public class AccountDto {
     @Getter
     @Builder
     @Schema(name = "AccountPostDto")
-    public static class Post implements TextContainer {
+    public static class Post {
         @NotBlank
         private String displayName;
 
@@ -28,29 +27,18 @@ public static class Post implements TextContainer {
         @NotBlank
         @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*\\d).{6,}$" , message = "영문, 숫자 포함 6글자 이상의 패스워드만 허용합니다.")
         private String password;
-
-        @Override
-        public String combineText() {
-            return displayName;
-        }
     }
 
-
     @Getter
     @NoArgsConstructor
-    public static class DisplayNamePatch implements TextContainer {
+    public static class DisplayNamePatch {
         @NotBlank
         private String displayName;
 
         @Builder
         public DisplayNamePatch(String displayName) {
             this.displayName = displayName;
         }
-
-        @Override
-        public String combineText() {
-            return this.displayName;
-        }
     }
 
     @Getter
@@ -82,7 +70,6 @@ public static class Response {
         private Long accountId;
         private String email;
         private String displayName;
-        private String status;
         private String profileImageUrl;
         private String grade;
         private Point point;