Feature/follow

.github/workflows/ec2_deploy.yml

@@ -0,0 +1,34 @@
+name: Deploy to EC2
+on:
+  push:
+    branches: [ "release" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Deploy main branch
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Connect ssh and git pull
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ec2-user
+          key: ${{ secrets.EC2_PEM_KEY }}
+          script: |
+            echo "연결 완료"
+            cd army/ARdiray_Spring/ardiary/
+            git checkout release
+            git pull origin release
+            kill `ps -ef | grep ardiary-0.0.1-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+            echo "기존 서비스 배포 중지"
+            sudo ./gradlew build
+            cd build/libs/
+            nohup java -jar ardiary-0.0.1-SNAPSHOT.jar 2>&1 &
+            echo "업데이트 서비스 배포 시작"
+            exit
+
+

ardiary/build.gradle

@@ -23,6 +23,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	//spring-web
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	//swagger
+	implementation 'io.springfox:springfox-boot-starter:3.0.0'
 	//lombok
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
@@ -36,6 +38,11 @@ dependencies {
 	implementation 'org.mariadb.jdbc:mariadb-java-client:3.0.5'
 	//mybatis
 	implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
+	// JAX-B dependencies for JDK 9+
+	implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"
+	implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
+	// aws cloud framework for aws s3 (aws sdk의 s3관련된 라이브러리만 추가하는 코드도 있는데 혹시 몰라서 포괄적으로 설정함)
+	implementation "org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE"
 }
 
 tasks.named('test') {

ardiary/src/main/java/com/army/ardiary/ArdiaryApplication.java

@@ -3,7 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages ={"com.army.ardiary.repository.UserRepository"})
+@SpringBootApplication()
 public class ArdiaryApplication {
 
 	public static void main(String[] args) {

ardiary/src/main/java/com/army/ardiary/config/AwsS3Config.java

@@ -0,0 +1,29 @@
+package com.army.ardiary.config;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+
+public class AwsS3Config {
+    @Value("${cloud.aws.credentials.accessKey}")
+    private String accessKey;
+
+    @Value("${cloud.aws.credentials.secretKey}")
+    private String secretKey;
+
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    @Bean
+    public AmazonS3 amazonS3() {
+        AWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey);
+        return AmazonS3ClientBuilder.standard()
+                .withRegion(region)
+                .withCredentials(new AWSStaticCredentialsProvider(awsCredentials))
+                .build();
+    }
+}

ardiary/src/main/java/com/army/ardiary/config/SwaggerConfig.java

@@ -0,0 +1,34 @@
+package com.army.ardiary.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@Configuration
+public class SwaggerConfig{
+    //springfox 기본 config
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("Army Project API")
+                .description("Army api")
+                .version("0.1")
+                .build();
+    }
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .useDefaultResponseMessages(false)//swagger 제공 기본 응답 코드. false로 설정하면 안보임
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.army.ardiary")) //api스펙이 작성되어있는 패키지(컨트롤러) 지정 RequestHandlerSelectors.any()로 선언해도 됨
+                .paths(PathSelectors.any()) //path에 입력한 조건에 맞는 api를 문서화
+                .build()
+                .apiInfo(apiInfo());
+    }
+}

ardiary/src/main/java/com/army/ardiary/controller/CameraARController.java

@@ -0,0 +1,23 @@
+package com.army.ardiary.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/cameraAR")
+public class CameraARController {
+
+/*    @GetMapping("/distance={distance}")
+    public ResponseEntity<?> loadCameraARByDistance(@RequestParam int distance, @RequestBody @Valid MyLocatioinDto myLocatioinDto){
+       // CameraARListDto cameraARListDto =cameraARService.findByDistance(myLocatioinDto,distance);
+        return ResponseEntity.status(HttpStatus.OK).body(cameraARListDto);
+    }*/
+/*    @PostMapping("")
+    ResponseEntity<?> createCameraAR(@RequestBody @Valid CameraARRequestDto cameraARRequestDto){
+        int newARMarkerId=cameraARService.createCameraAR(cameraARRequestDto);
+        return ResponseEntity.status(HttpStatus.CREATED).body(newARMarkerId);
+    }*/
+
+
+}

ardiary/src/main/java/com/army/ardiary/controller/DiaryController.java

@@ -0,0 +1,112 @@
+package com.army.ardiary.controller;
+
+import com.army.ardiary.dto.DiaryRequestDto;
+import com.army.ardiary.dto.DiaryResponseDto;
+import com.army.ardiary.dto.ErrorResponse;
+import com.army.ardiary.dto.TokenRequestDto;
+import com.army.ardiary.service.DiaryService;
+import com.army.ardiary.service.TokenService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/diaries")
+public class DiaryController {
+    //다이어리 목록을 불러오는 api를 다루는 컨트롤러
+
+    private final DiaryService diaryService;
+    private final TokenService tokenService;
+
+    @GetMapping()
+    public ResponseEntity<?> loadDiary(){
+        DiaryResponseDto diaryResponseDto= diaryService.findAll();
+        return ResponseEntity.status(HttpStatus.OK).body(diaryResponseDto);
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<?> loadDiaryById(@PathVariable(value = "id") int diaryId){
+        DiaryResponseDto diaryResponseDto = diaryService.findById(diaryId);
+        return ResponseEntity.status(HttpStatus.OK).body(diaryResponseDto);
+    }
+
+    //이거 유저로 빠질 예정
+    @GetMapping("api/user/diary")
+    public ResponseEntity<?> loadDiaryByUser(@RequestHeader(value = "Authorization") String headerToken){
+        String token = headerToken.substring("Bearer ".length());
+        //토큰 유효성 확인
+        if(!tokenService.validateToken(token)){
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse("사용자 인증이 불가합니다. 잘못된 접근입니다."));
+        }
+        //토큰을 통해 사용자 정보 불러오기
+        int userId = tokenService.findUserIdByJwt(token);
+        //다이어리 불러오기
+        DiaryResponseDto diaryResponseDto= diaryService.findByWriter(userId);
+        return ResponseEntity.status(HttpStatus.OK).body(diaryResponseDto);
+    }
+
+    @PostMapping("")
+    public ResponseEntity<?> writeDiary(@RequestHeader(value = "Authorization") String headerToken, DiaryRequestDto diaryRequestDto){
+        String token = headerToken.substring("Bearer ".length());
+        //토큰 유효성 확인
+        if(token==null){ //토큰을 보내지않은 경우
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ErrorResponse("잘못된 요청입니다. 토큰도 함께 보내주세요."));
+        }
+        if(!tokenService.validateToken(token)){ //토큰이 유효하지않은 경우: 지금 이 에러 발생. 토큰이 변조된 상황.
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse("사용자 인증이 불가합니다. 잘못된 접근입니다."));
+        }
+        //토큰을 통해 사용자 정보 불러오기
+        int userId = tokenService.findUserIdByJwt(token);
+        //일기 생성 후, 작성된 일기 불러오기
+        int newDiaryId=diaryService.createDiary(diaryRequestDto,userId);
+        DiaryResponseDto diaryResponseDto=diaryService.findById(newDiaryId);
+        return ResponseEntity.status(HttpStatus.CREATED).body(diaryResponseDto);
+    }
+
+    //@RequestMapping(value = "/diary/delete/{id}",method = {RequestMethod.GET,RequestMethod.POST})
+    @DeleteMapping("/{id}")
+    public ResponseEntity<?> deleteDiary(@PathVariable(value = "id") int diaryId, @RequestHeader(value = "Authorization") String headerToken){
+        String token = headerToken.substring("Bearer ".length());
+        //토큰 유효성 확인
+        if(token==null||!tokenService.validateToken(token)){
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse("사용자 인증이 불가합니다. 잘못된 접근입니다."));
+        }
+        //토큰을 통해 사용자 정보 불러오기
+        int userId = tokenService.findUserIdByJwt(token);
+        int deleteCount = diaryService.deleteDiary(diaryId,userId);
+        if(deleteCount == 0){
+            return ResponseEntity.status(HttpStatus.METHOD_NOT_ALLOWED).body(new ErrorResponse("삭제가 실패했습니다"));
+        }
+        return ResponseEntity.ok("삭제 완료");
+    }
+
+    @PatchMapping("/{id}")
+    public ResponseEntity<?> modifyDiary(@PathVariable(value = "id") int diaryId,@RequestHeader(value = "Authorization") String headerToken, @RequestBody @Valid DiaryRequestDto diaryRequestDto){
+        String token = headerToken.substring("Bearer ".length());
+        //토큰 유효성 확인
+        if(!tokenService.validateToken(token)){
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse("사용자 인증이 불가합니다. 잘못된 접근입니다."));
+        }
+        //토큰을 통해 사용자 정보 불러오기
+        int userId = tokenService.findUserIdByJwt(token);
+        int updateDiaryId=diaryService.modifyDiary(diaryId, diaryRequestDto,userId);
+        DiaryResponseDto diaryResponseDto = diaryService.findById(updateDiaryId);
+        return ResponseEntity.status(HttpStatus.OK).body(diaryResponseDto);
+    }
+
+/*    @PostMapping("/user/diary/like")
+    public ResponseEntity<?> listDiaryByUserLike(@RequestBody @Valid TokenRequestDto tokenRequestDto){
+        String token= tokenRequestDto.getJwt();
+        //validateToken함수 오류 확인후 후 주석 지우기
+        if(!tokenService.validateToken(token)){
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse("사용자 인증이 불가합니다. 잘못된 접근입니다."));
+        }
+        DiaryResponseDto diaryResponseDto=diaryListService.listMine(token);
+        return ResponseEntity.status(HttpStatus.OK).body(diaryResponseDto);
+    }*/
+
+
+}

ardiary/src/main/java/com/army/ardiary/controller/FollowController.java

@@ -0,0 +1,40 @@
+package com.army.ardiary.controller;
+
+import com.army.ardiary.dto.ErrorResponse;
+import com.army.ardiary.dto.FollowRequestDto;
+import com.army.ardiary.service.FollowService;
+import com.army.ardiary.service.TokenService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+public class FollowController {
+
+    private final TokenService tokenService;
+    private final FollowService followService;
+
+    @PostMapping("/api/follow")
+    public ResponseEntity<?> addFollow(@RequestHeader(value = "Authorization") String headerToken, @RequestBody FollowRequestDto followRequestDto){
+        String token = headerToken.substring("Bearer ".length());
+        int userId = tokenService.findUserIdByJwt(token);
+        if (token == null || !tokenService.validateToken(token))
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse("토큰 인증 실패. 조회 권한이 없습니다."));
+
+        int followeeId = followRequestDto.getFollowee();
+        followService.addFollow(userId, followeeId);
+        return ResponseEntity.status(HttpStatus.CREATED).body("팔로우 연결 완료");
+    }
+
+    @DeleteMapping("/api/follow/{id}")
+    public ResponseEntity<?> deleteFollow(@RequestHeader(value = "Authorization") String headerToken, @PathVariable int id){
+        String token = headerToken.substring("Bearer ".length());
+        if(token == null|| !tokenService.validateToken(token))
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse("토큰 인증 실패. 조회 권한이 없습니다."));
+
+        followService.deleteFollow(id);
+        return ResponseEntity.status(HttpStatus.OK).body("팔로우 해제 완료");
+    }
+}

ardiary/src/main/java/com/army/ardiary/controller/GuestBookController.java

@@ -0,0 +1,69 @@
+package com.army.ardiary.controller;
+
+import com.army.ardiary.domain.entity.GuestBookEntity;
+import com.army.ardiary.dto.ErrorResponse;
+import com.army.ardiary.dto.GuestBookContentDto;
+import com.army.ardiary.service.GuestBookService;
+import com.army.ardiary.service.TokenService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+
+@RestController
+@RequiredArgsConstructor
+public class GuestBookController {
+
+    private final TokenService tokenService;
+    public final GuestBookService guestBookService;
+
+    @PostMapping("/api/guestbooks")
+    public ResponseEntity<?> writeGuestBook(@RequestHeader(value = "Authorization", required = false) String headerToken, @RequestBody GuestBookContentDto content){
+        String token = headerToken.substring("Bearer ".length());
+        if(token == null|| !tokenService.validateToken(token))
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse("토큰 인증 실패. 작성 권한이 없습니다."));
+
+        int userId = tokenService.findUserIdByJwt(token);
+
+        GuestBookEntity newGuestBook = guestBookService.createGuestBook(userId, content);
+        return ResponseEntity.status(HttpStatus.CREATED).body(newGuestBook);
+    }
+
+    @GetMapping("/api/guestbooks/{id}")
+    public ResponseEntity<?> loadGuestBook(@PathVariable("id") int id){
+        GuestBookEntity guestBookEntity = guestBookService.findGuestBook(id);
+        return ResponseEntity.status(HttpStatus.OK).body(guestBookEntity);
+    }
+
+    @GetMapping("/api/guestbooks")
+    public ResponseEntity<?> loadGuestBookListByUser(@RequestHeader(value = "Authorization") String headerToken) {
+        String token = headerToken.substring("Bearer ".length());
+        int userId = tokenService.findUserIdByJwt(token);
+        if (token == null || !tokenService.validateToken(token))
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse("토큰 인증 실패. 조회 권한이 없습니다."));
+        ArrayList<GuestBookEntity> guestBookEntities = guestBookService.findGuestBookListByUser(userId);
+        return ResponseEntity.status(HttpStatus.OK).body(guestBookEntities);
+    }
+
+    @PatchMapping("/api/guestbooks/{id}/content")
+    public ResponseEntity<?> modifyContent(@RequestHeader(value = "Authorization") String headerToken, @PathVariable("id") int guestBookId, @RequestBody GuestBookContentDto newContent){
+        String token = headerToken.substring("Bearer ".length());
+        int userId = tokenService.findUserIdByJwt(token);
+        if (token == null || !tokenService.validateToken(token)||!guestBookService.isUser(userId, guestBookId))
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse("토큰 인증 실패. 조회 권한이 없습니다."));
+        GuestBookEntity guestBookEntity = guestBookService.updateContent(guestBookId, newContent.getContent());
+        return ResponseEntity.status(HttpStatus.OK).body(guestBookEntity);
+    }
+
+    @DeleteMapping("/api/guestbooks/{id}")
+    public ResponseEntity<?> delete(@RequestHeader(value = "Authorization") String headerToken, @PathVariable("id") int guestBookId) {
+        String token = headerToken.substring("Bearer ".length());
+        int userId = tokenService.findUserIdByJwt(token);
+        if (token == null || !tokenService.validateToken(token)||!guestBookService.isUser(userId, guestBookId))
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorResponse("토큰 인증 실패. 조회 권한이 없습니다."));
+        GuestBookEntity deleted = guestBookService.delete(guestBookId);
+        return ResponseEntity.status(HttpStatus.OK).body(deleted);
+    }
+}