From 756ad14522721c576aa2d97d9251fcb5dbf259f9 Mon Sep 17 00:00:00 2001 From: Hanna Lee <8annahxxl@gmail.com> Date: Sat, 9 Mar 2024 12:38:42 +0900 Subject: [PATCH 1/3] deploy: v1.0.0 (#70) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Member, Bundle 도메인 엔티티 추가 * fix: 필드들 클래스 바디로 이동 * fix: enum 클래스 인라인 * feat: 질문, 건의, 질문신고, 태그, 질문태그 엔티티 추가 (#5) * fix: Data config kt 파일로 변경 * feat: #2 질문, 질문 신고, 건의, 태그, 질문-태그 엔티티 생성 * refactor: 엔티티 패키지 명 수정 * feat: ApiResponse 정의 * feat: 질문, 태그 기능 구현 (#6) * fix: Data config kt 파일로 변경 * feat: #2 질문, 질문 신고, 건의, 태그, 질문-태그 엔티티 생성 * feat: entity에 column 명시 * feat: Base 엔티티 추가 * feat: #2 question 생성 기능 구현 * feat: #2 question answer 생성 추가 * fix: ApiResponse 리턴하도록 수정 * feat: #2 question 내용 수정 추가 * feat: #2 question copy 구현 * feat: 태그 조회 추가 * feat: question 검색 추가 * fix: post -> create 이름 수정 * fix: add -> increase 이름 수정 * fix: 엔티티 컬럼명 수정 * feat: claim 작성 구현 * feat: 꾸러미 basic CRUD 구현 (#10) * fix: 엔티티 setter 접근제어자 private -> protected * feat: controller 설계 * feat: PageCondition 정의 * fix: id 타입 수정 * feat: 컨트롤러 설계 * feat: create, get 구현 * feat: update, delete 구현 * fix: tag content -> name 으로 수정 * fix: create 버그 수정 * feat: Bundle.ShareType validate 추가 * feat: question add, remove 구현 * feat: BundleGetResponse questions 응답 필드 추가 * fix: Questions 생성자 shareStatus 매개변수 제거 * fix: Question copy shareStatus public으로 * fix: question consturct shareStatus default value 할당 * fix: ClaimController ApiResponse import 수정 * chore * feat: 꾸러미 조회 기본 기능 구현 (#13) * feat: 내 꾸러미 목록 조회 기능 구현 * fix: create 메서드 응답 상태코드 201로 가도록 수정 * feat: 내 꾸러미 목록 조회 기능 구현 * refactor: infra-queryDsl 모듈 제거 및 의존성 data로 이동 * feat: 꾸러미 search jpa 버전 api 구현 * fix: jpaQueryFactory 네이밍 수정 * 질문 상세구현 (#14) * feat: 질문 등록 시 태그 등록, 태그 수정 추가 * feat: #8 페이지네이션, 태그 추가 * feat: #8 add test code for create question * feat: 검색 시 page response 담아 반환하도록 수정 * fix: 피드백 반영 * fix: 페이지 사이즈 피드백 반영 * feat: bundle 조회 관련 기능 필터 & 정렬 추가, questions CUD api 수정, exceptionHandler 추가 (#19) * refactor: customRepository switch문 리팩터링 * feat: 꾸러미 상세 조회 - 내가 작성한 질문만 보기 필터 추가 * fix: 질문 copy 시 originId 체킹 먼저 하도록 * chore: 추천순 정렬 주석 처리 * feat: 꾸러미 스크랩 기능 구현 * refactor: bundle shareCount -> scrapeCount * refactor: 꾸러미 get 로직 분리 * fix: bundle create, get, update 버그 fix * fix: questions CUD 꾸러미 연동 및 수정 * feat: @Valid 어노테이션 추가 * fix: question create bug fix * fix: scrape, update bug fix * chore * feat: CustomException 정의 * feat: validation exceptionHandler 추가 * refactor: exception custom -> api * feat: IllegalException handler 추가 * feat: question order 순서 조정 api 구현 (#22) * docs: swagger 설정 * fix: requestDto enum 필드, enum 타입으로 명시 * feat: 인증 구현 (#23) * chore: #18 시큐리티 모듈 추가 * feat: #18 기본 security 설정 추가 * feat: #18 jwt token provider 추가 * feat: #18 filter 추가 * feat: #18 access denied handler, authentication entry point 추가 * feat: oauth2 추가 * feat: #18 add oauth2 service * fix: #18 oauth2 로그인 버그 수정 * feat: redis refresh token 저장 추가 * feat: 현재 로그인 member 정보 조회 추가 * feat: #18 auth 기능 - 로그아웃, 토큰 재발급 추가 * fix: #18 authorities 타입 수정 * feat: #18 test 제거 * fix: 예외처리 수정 * feat: #18 security 예외 처리 추가 * docs: 회원, 인증 docs 추가 * fix: #18 피드백 반영 * Create aws-deploy.yml * feat: dockerfile 추가 * chore: yml 파일 제거 * chore: yml 파일 git ignore 추가 * chore: mysql 의존 추가 * chore: 기본 profile 설정 * Update aws-deploy.yml * chore: Dockerfile 철자 수정 * Update aws-deploy.yml * Update aws-deploy.yml * feat: task-def-dev 추가 * feat: health-check 추가 * chore * infra: 컨테이너 사이즈 조정 테스트 * infra: rollback * fix: #27 코틀린 형변환 에러 수정 및 userDetail 예외 처리 * feat: bundle, question isHot 응답 필드 추가 (#26) * fix: bundle copy시 shareType=private * feat: bundle originId 추가 * feat: BundleCustomRepositoryImpl tagIds where절 추가 * chore * feat: #31 cors 설정 추가 (#33) * feat: 회원관련 기능들 추가 (#34) * feat: #31 cors 설정 추가 * feat: #32 method argument 추가 * feat: #32 바로 member 가져오는 편의성 어노테이션 추가 * feat: #32 사용자 닉네임 변경 추가 * feat: 리퀘스트 토큰 레디스 저장 * feat: #32 회원 탈퇴 메소드 추가 * feat: member 조회시 soft delete 제약 추가 * fix: soft delete 제약조건 수정 * fix: 메소드 아규먼트 에러 수정 * feat: bundle scrapeCount, question shareCount 응답 필드 추가 * feat: 유저 프로필 이미지 등록 구현 (#37) * feat: #35 s3 모듈 추가 * feat: #35 s3 service 추가 * fix: 회원 탈퇴 이동 * feat: #35 프로필 이미지 업로드 추가 * fix: 시큐리티 설정 cors 추가 * fix: #35 멤버 정보 아규먼트 리졸버 일부 수정 --------- Co-authored-by: Hanna Lee <8annahxxl@gmail.com> * Update aws-deploy.yml * fix: #40 cors 설정 수정 * feat: bundle, question API 멤버 연동 (#39) * feat: bundle 멤버 연동 * feat: question 멤버 연동 * feat: bundle shareType 연동 * chore * fix: addQuestion question filter 로직 제거 * fix: findAllByMemberId default 정렬 수정순 * fix: copy 시 this.id 들어가도록 * fix: TagResponse content -> name * feat: bundle list 조회 tags 응답 필드 추가 * chore * refactor: BundleSearchCondition searchTerm -> keyword --------- Co-authored-by: Kyunghun Kim <86098663+KarmaPol@users.noreply.github.com> * fix: #40 cors 설정 수정 (#42) Co-authored-by: Hanna Lee <8annahxxl@gmail.com> * fix: BundleSearchCondition sortingType 타입 String -> SortingType * feat: 꾸러미 삭제 시 count 필드들 감소 로직 추가 및 커스텀 update 쿼리문 작성 (#50) * feat: redisson 세팅 * feat: DistributeLock 정의 * feat: bundle 삭제 시 scrapeCount, shareCount 감소 * fix: increase, decrease 쿼리 분리 * chore * feat: frameOptions disable * fix: fix OAuth2userDetails cast bug, count bug * test: count 관련 테스트 템플릿 작성 * fix: #48 resolver 수정 * fix: #48 string 제거 * fix: #48 accesstoken url 방식으로 변경 * fix: createBundle 태그 개수 검사 서비스 로직으로 이동 * fix: tag 개수 제한 로직 버그 재수정 * refactor: ApiResponse 제거 (#54) * feat: #48 member 소셜 링크 추가 * fix: 비공개 꾸러미 응답 세팅 * feat: bundle originId 응답 추가 * feat: #48 member social link 추가 * feat: #48 memberTag 엔티티 추가 * feat: #48 member sns list 추가 구현 * feat: #48 회원 관심 태그 설정 추가 * feat: #48 아이디로 회원 정보 조회 추가 * fix: #46 질문 신고 requestbody로 수정 * feat: #48 @AuthToMember swagger 무시되도록 수정 * merge: 충돌 수정 * fix: tagResponse name으로 수정 * fix: tagResponse name으로 수정 * feat: 회원 관련 기능 추가 (#55) * fix: #40 cors 설정 수정 * fix: #48 resolver 수정 * fix: #48 string 제거 * fix: #48 accesstoken url 방식으로 변경 * feat: #48 member 소셜 링크 추가 * feat: #48 member social link 추가 * feat: #48 memberTag 엔티티 추가 * feat: #48 member sns list 추가 구현 * feat: #48 회원 관심 태그 설정 추가 * feat: #48 아이디로 회원 정보 조회 추가 * fix: #46 질문 신고 requestbody로 수정 * feat: #48 @AuthToMember swagger 무시되도록 수정 * merge: 충돌 수정 * fix: tagResponse name으로 수정 * fix: tagResponse name으로 수정 * feat: 질문 개수 제한, 글자 수 제한 추가 (#56) * feat: 질문 개수 제한 로직 추가 * feat: 글자 수 제한 * chore * docs: queryString dto 필드별로 명시되도록 수정 * docs: swaggeer definition 수정 --------- Co-authored-by: Kyunghun Kim <86098663+KarmaPol@users.noreply.github.com> * hotfix: AuthToMemberArgumentResolver casting 수정 * hotfix: rollback * feat: ExceptionHandler logger 추가 * fix: 리다이렉트 경로 수정 * fix: session redis로 교체 * rollback: redis session rollback * chore * fix: 헤더 설정 추가 * fix: swaggger 서버 URl 수정 * fix: argumetn resolver 수정 * hotfix: QuestionSearchRequest keyword nullable * feat: 회원가입 관련 API 하나로 합치기 (#58) * feat: #58 회원가입 시 통합 api 추가 * feat: #58 cors preflight 설정 추가 * feat: #57 회원가입 시 통합 api 추가 * feat: #57 cors preflight 설정 추가 * hotfix: cors * hotfix: 리프레시 토큰 발금 컨트롤러 get -> post * hotfix: 리프레시 토큰 발급 로직 수정 * hotfix: origin 지정 * feat: 꾸러미 순서 변경 기능 구현 (#61) * feat: member bundleOrder 컬럼 추가 * feat: bundle 스크랩 시 questionOrder도 copy * feat: 질문 생성 시 questionOrder update * feat: 꾸러미 순서 변경 api * fix: createQuestion questionOrder 버그 수정 * feat: 꾸러미 생성 시 update bundleOrder, 내 꾸러미 목록 조회 custom 정렬 추가 * refactor: 꾸러미 순서 변경 api 위치 bundleController로 이동 * hotfix: origin 지정 * refactor: 오타 수정 --------- Co-authored-by: Kyunghun Kim <86098663+KarmaPol@users.noreply.github.com> * 선택한 질문 여러 꾸러미에 추가할 수 있도록 변경 (#66) * fix: 질문 선택해서 추가하는 api 여러 꾸러미 선택 가능하도록 수정 * refactor: 번들 순서 변경 함수 위치 변경 * feat: writerId 응답 추가 * hotfix: allowedOrigin 수정 * fix: 꾸러미 스크랩 버그 수정 (리팩터링 필요) * fix: 번들 생성 시 bundleOrder에 null 들어가는 버그 수정 * feat: 닉네임 중복 체크 api 추가 (#68) * feat: #59 권한 path 추가 * feat: #59 닉네임 중복 검사 추가, 일단 시큐리티 권한 설정 방치 --------- Co-authored-by: Hanna Lee <8annahxxl@gmail.com> * hotfix: searchQuestion sortingType, tagIds 요청 쿼리스트링 추가 * fix: dockerFile arg 추가 * chore: add ecs task def-prod * Create deploy-prod.yml --------- Co-authored-by: Hanna Co-authored-by: Kyunghun Kim <86098663+KarmaPol@users.noreply.github.com> Co-authored-by: KarmaPol --- .aws/kiwing-task-def-dev.json | 94 ++++++++ .aws/kiwing-task-def-prod.json | 89 +++++++ .github/workflows/aws-deploy.yml | 91 ++++++++ .github/workflows/deploy-prod.yml | 94 ++++++++ .gitignore | 4 + Dockerfile | 6 + build.gradle.kts | 2 + data/build.gradle.kts | 22 ++ .../data/{DataConfig.java => DataConfig.kt} | 16 +- .../kw/data/common/dto/SearchSortingType.kt | 17 ++ .../com/kw/data/config/QuerydslConfig.kt | 18 ++ .../main/kotlin/com/kw/data/domain/Base.kt | 22 ++ .../com/kw/data/domain/bundle/Bundle.kt | 115 +++++++++ .../com/kw/data/domain/bundle/BundleTag.kt | 21 ++ .../bundle/dto/request/BundleGetCondition.kt | 22 ++ .../dto/request/BundleSearchCondition.kt | 9 + .../repository/BundleCustomRepository.kt | 16 ++ .../repository/BundleCustomRepositoryImpl.kt | 81 +++++++ .../bundle/repository/BundleRepository.kt | 24 ++ .../bundle/repository/BundleTagRepository.kt | 7 + .../kotlin/com/kw/data/domain/claim/Claim.kt | 15 ++ .../claim/repository/ClaimRepository.kt | 7 + .../com/kw/data/domain/member/Member.kt | 93 ++++++++ .../com/kw/data/domain/member/MemberTag.kt | 21 ++ .../kotlin/com/kw/data/domain/member/Sns.kt | 24 ++ .../member/repository/MemberRepository.kt | 10 + .../com/kw/data/domain/question/Question.kt | 104 +++++++++ .../kw/data/domain/question/QuestionReport.kt | 19 ++ .../kw/data/domain/question/QuestionTag.kt | 21 ++ .../domain/question/dto/QuestionSearchDto.kt | 11 + .../repository/QuestionCustomRepository.kt | 12 + .../QuestionCustomRepositoryImpl.kt | 99 ++++++++ .../repository/QuestionReportRepository.kt | 7 + .../question/repository/QuestionRepository.kt | 28 +++ .../repository/QuestionTagRepository.kt | 7 + .../main/kotlin/com/kw/data/domain/tag/Tag.kt | 15 ++ .../domain/tag/repository/TagRepository.kt | 7 + .../src/main/resources/application.properties | 1 - docker-compose.yml | 7 + infra/infra-redis/build.gradle.kts | 13 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../com/kw/infraredis/config/RedisConfig.kt | 36 +++ .../repository/RedisRefreshTokenRepository.kt | 29 +++ infra/infra-s3/build.gradle.kts | 20 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../com/kw/infras3/service/S3Service.kt | 35 +++ infra/infra-security/build.gradle.kts | 31 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../config/SecurityModuleConfig.kt | 13 ++ .../infrasecurity/config/WebSecurityConfig.kt | 135 +++++++++++ .../jwt/JwtAccessDeniedHandler.kt | 21 ++ .../jwt/JwtAuthenticationEntryPoint.kt | 24 ++ .../jwt/JwtAuthenticationFilter.kt | 42 ++++ .../kw/infrasecurity/jwt/JwtTokenProvider.kt | 96 ++++++++ .../oauth/OAuth2SuccessHandler.kt | 71 ++++++ .../infrasecurity/oauth/OAuth2UserDetails.kt | 42 ++++ .../infrasecurity/oauth/OAuth2UserService.kt | 22 ++ .../kw/infrasecurity/resolver/AuthToMember.kt | 9 + .../resolver/AuthToMemberArgumentResolver.kt | 55 +++++ .../kw/infrasecurity/util/HttpResponseUtil.kt | 24 ++ server/api/build.gradle.kts | 16 ++ .../main/kotlin/com/kw/api/ApiApplication.kt | 3 +- .../kw/api/common/controller/ApiController.kt | 16 ++ .../com/kw/api/common/dto/PageResponse.kt | 4 + .../api/common/dto/request/PageCondition.kt | 24 ++ .../api/common/dto/response/ErrorResponse.kt | 12 + .../api/common/dto/response/PageResponse.kt | 21 ++ .../kw/api/common/exception/ApiErrorCode.kt | 39 ++++ .../kw/api/common/exception/ApiException.kt | 16 ++ .../common/exception/ApiExceptionHandler.kt | 99 ++++++++ .../kotlin/com/kw/api/config/SwaggerConfig.kt | 33 +++ .../kotlin/com/kw/api/config/WebMvcConfig.kt | 22 ++ .../domain/auth/controller/AuthController.kt | 37 +++ .../auth/dto/request/RefreshTokenRequest.kt | 3 + .../domain/auth/dto/response/TokenResponse.kt | 4 + .../kw/api/domain/auth/service/AuthService.kt | 58 +++++ .../bundle/controller/BundleController.kt | 138 +++++++++++ .../bundle/dto/request/BundleCreateRequest.kt | 26 +++ .../dto/request/BundleQuestionAddRequest.kt | 11 + .../BundleQuestionOrderUpdateRequest.kt | 8 + .../request/BundleQuestionRemoveRequest.kt | 8 + .../bundle/dto/request/BundleUpdateRequest.kt | 11 + .../dto/response/BundleDetailResponse.kt | 35 +++ .../bundle/dto/response/BundleResponse.kt | 35 +++ .../domain/bundle/service/BundleService.kt | 220 ++++++++++++++++++ .../claim/controller/ClaimController.kt | 22 ++ .../claim/dto/request/CreateClaimRequest.kt | 3 + .../claim/dto/response/ClaimResponse.kt | 4 + .../api/domain/claim/service/ClaimService.kt | 18 ++ .../member/controller/MemberController.kt | 87 +++++++ .../dto/request/BundleOrderUpdateRequest.kt | 3 + .../dto/request/MemberInfoUpdateRequest.kt | 6 + .../dto/request/MemberSnsUpdateRequest.kt | 6 + .../member/dto/response/MemberInfoResponse.kt | 44 ++++ .../domain/member/service/MemberService.kt | 101 ++++++++ .../question/controller/QuestionController.kt | 70 ++++++ .../dto/request/QuestionCreateRequest.kt | 33 +++ .../dto/request/QuestionReportRequest.kt | 3 + .../dto/request/QuestionSearchRequest.kt | 11 + .../dto/request/QuestionUpdateRequest.kt | 18 ++ .../dto/response/QuestionListResponse.kt | 5 + .../dto/response/QuestionReportResponse.kt | 15 ++ .../question/dto/response/QuestionResponse.kt | 37 +++ .../question/service/QuestionService.kt | 120 ++++++++++ .../domain/tag/controller/TagController.kt | 21 ++ .../domain/tag/dto/response/TagResponse.kt | 17 ++ .../kw/api/domain/tag/service/TagService.kt | 17 ++ .../src/main/resources/application.properties | 1 - server/api/src/main/resources/application.yml | 7 + .../bundle/service/BundleServiceTest.kt | 38 +++ .../question/service/QuestionServiceTest.kt | 41 ++++ settings.gradle.kts | 3 + 115 files changed, 3656 insertions(+), 11 deletions(-) create mode 100644 .aws/kiwing-task-def-dev.json create mode 100644 .aws/kiwing-task-def-prod.json create mode 100644 .github/workflows/aws-deploy.yml create mode 100644 .github/workflows/deploy-prod.yml create mode 100644 Dockerfile rename data/src/main/kotlin/com/kw/data/{DataConfig.java => DataConfig.kt} (60%) create mode 100644 data/src/main/kotlin/com/kw/data/common/dto/SearchSortingType.kt create mode 100644 data/src/main/kotlin/com/kw/data/config/QuerydslConfig.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/Base.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/Bundle.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/BundleTag.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleGetCondition.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleSearchCondition.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepositoryImpl.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleTagRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/claim/Claim.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/claim/repository/ClaimRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/member/Member.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/member/MemberTag.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/member/Sns.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/member/repository/MemberRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/Question.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/QuestionReport.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/QuestionTag.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/dto/QuestionSearchDto.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepositoryImpl.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionReportRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionTagRepository.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/tag/Tag.kt create mode 100644 data/src/main/kotlin/com/kw/data/domain/tag/repository/TagRepository.kt delete mode 100644 data/src/main/resources/application.properties create mode 100644 docker-compose.yml create mode 100644 infra/infra-redis/build.gradle.kts create mode 100644 infra/infra-redis/gradle/wrapper/gradle-wrapper.jar create mode 100644 infra/infra-redis/gradle/wrapper/gradle-wrapper.properties create mode 100644 infra/infra-redis/src/main/kotlin/com/kw/infraredis/config/RedisConfig.kt create mode 100644 infra/infra-redis/src/main/kotlin/com/kw/infraredis/repository/RedisRefreshTokenRepository.kt create mode 100644 infra/infra-s3/build.gradle.kts create mode 100644 infra/infra-s3/gradle/wrapper/gradle-wrapper.jar create mode 100644 infra/infra-s3/gradle/wrapper/gradle-wrapper.properties create mode 100644 infra/infra-s3/src/main/kotlin/com/kw/infras3/service/S3Service.kt create mode 100644 infra/infra-security/build.gradle.kts create mode 100644 infra/infra-security/gradle/wrapper/gradle-wrapper.jar create mode 100644 infra/infra-security/gradle/wrapper/gradle-wrapper.properties create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/SecurityModuleConfig.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/WebSecurityConfig.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAccessDeniedHandler.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationEntryPoint.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationFilter.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtTokenProvider.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2SuccessHandler.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserDetails.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserService.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMember.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMemberArgumentResolver.kt create mode 100644 infra/infra-security/src/main/kotlin/com/kw/infrasecurity/util/HttpResponseUtil.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/controller/ApiController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/dto/PageResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/dto/request/PageCondition.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/dto/response/ErrorResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/dto/response/PageResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/exception/ApiErrorCode.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/exception/ApiException.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/common/exception/ApiExceptionHandler.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/config/SwaggerConfig.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/config/WebMvcConfig.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/auth/controller/AuthController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/auth/dto/request/RefreshTokenRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/auth/dto/response/TokenResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/auth/service/AuthService.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/controller/BundleController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleCreateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionAddRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionOrderUpdateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionRemoveRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleUpdateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleDetailResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/bundle/service/BundleService.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/claim/controller/ClaimController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/claim/dto/request/CreateClaimRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/claim/dto/response/ClaimResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/claim/service/ClaimService.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/member/controller/MemberController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/BundleOrderUpdateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberInfoUpdateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberSnsUpdateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/member/dto/response/MemberInfoResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/member/service/MemberService.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/controller/QuestionController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionCreateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionReportRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionSearchRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionUpdateRequest.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionListResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionReportResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/question/service/QuestionService.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/tag/controller/TagController.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/tag/dto/response/TagResponse.kt create mode 100644 server/api/src/main/kotlin/com/kw/api/domain/tag/service/TagService.kt delete mode 100644 server/api/src/main/resources/application.properties create mode 100644 server/api/src/main/resources/application.yml create mode 100644 server/api/src/test/kotlin/com/kw/api/domain/bundle/service/BundleServiceTest.kt create mode 100644 server/api/src/test/kotlin/com/kw/api/domain/question/service/QuestionServiceTest.kt diff --git a/.aws/kiwing-task-def-dev.json b/.aws/kiwing-task-def-dev.json new file mode 100644 index 0000000..b0a090c --- /dev/null +++ b/.aws/kiwing-task-def-dev.json @@ -0,0 +1,94 @@ +{ + "taskDefinitionArn": "arn:aws:ecs:ap-northeast-2:533267244952:task-definition/kiwing-task-def-dev:1", + "containerDefinitions": [ + { + "name": "kiwing-container-dev", + "image": "533267244952.dkr.ecr.ap-northeast-2.amazonaws.com/kiwing:9f788db8a320ecbab05fba0d5cf383ade66d2c46", + "cpu": 512, + "memory": 1024, + "portMappings": [ + { + "name": "kiwing-container-8080", + "containerPort": 8080, + "hostPort": 8080, + "protocol": "tcp", + "appProtocol": "http" + } + ], + "essential": true, + "environment": [], + "environmentFiles": [], + "mountPoints": [], + "volumesFrom": [], + "ulimits": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/kiwing-task-def-dev", + "awslogs-region": "ap-northeast-2", + "awslogs-stream-prefix": "ecs" + }, + "secretOptions": [] + } + } + ], + "family": "kiwing-task-def-dev", + "taskRoleArn": "arn:aws:iam::533267244952:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::533267244952:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 1, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" + }, + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": [ + "EC2", + "FARGATE" + ], + "requiresCompatibilities": [ + "FARGATE" + ], + "cpu": "512", + "memory": "1024", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2024-02-23T05:33:46.387Z", + "registeredBy": "arn:aws:iam::533267244952:user/team-03", + "tags": [ + { + "key": "Name", + "value": "kiwing-task-def-dev" + } + ] +} diff --git a/.aws/kiwing-task-def-prod.json b/.aws/kiwing-task-def-prod.json new file mode 100644 index 0000000..ef070e7 --- /dev/null +++ b/.aws/kiwing-task-def-prod.json @@ -0,0 +1,89 @@ +{ + "taskDefinitionArn": "arn:aws:ecs:ap-northeast-2:533267244952:task-definition/kiwing-task-def-prod:1", + "containerDefinitions": [ + { + "name": "kiwing-container-prod", + "image": "533267244952.dkr.ecr.ap-northeast-2.amazonaws.com/kiwing:092bc4a2385a2ca6f9924ebe2f2c83c67173fbc4", + "cpu": 0, + "portMappings": [ + { + "name": "kiwing-container-8080", + "containerPort": 8080, + "hostPort": 8080, + "protocol": "tcp", + "appProtocol": "http" + } + ], + "essential": true, + "environment": [], + "environmentFiles": [], + "mountPoints": [], + "volumesFrom": [], + "ulimits": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/kiwing-task-def-prod", + "awslogs-region": "ap-northeast-2", + "awslogs-stream-prefix": "ecs" + }, + "secretOptions": [] + }, + "systemControls": [] + } + ], + "family": "kiwing-task-def-prod", + "taskRoleArn": "arn:aws:iam::533267244952:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::533267244952:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 1, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" + }, + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": [ + "EC2", + "FARGATE" + ], + "requiresCompatibilities": [ + "FARGATE" + ], + "cpu": "512", + "memory": "1024", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2024-03-09T03:00:05.444Z", + "registeredBy": "arn:aws:iam::533267244952:user/team-03", + "tags": [] +} diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml new file mode 100644 index 0000000..beea8d2 --- /dev/null +++ b/.github/workflows/aws-deploy.yml @@ -0,0 +1,91 @@ +name: Deploy to Amazon ECS + +on: + push: + branches: [ "dev" ] + +env: + AWS_REGION: ap-northeast-2 # set this to your preferred AWS region, e.g. us-west-1 + ECR_REPOSITORY: kiwing # set this to your Amazon ECR repository name + ECS_SERVICE: kiwing-service-dev # set this to your Amazon ECS service name + ECS_CLUSTER: kiwing-cluster # set this to your Amazon ECS cluster name + ECS_TASK_DEFINITION: .aws/kiwing-task-def-dev.json # set this to the path to your Amazon ECS task definition + # file, e.g. .aws/task-definition.json + CONTAINER_NAME: kiwing-container-dev # set this to the name of the container in the + # containerDefinitions section of your task definition + +permissions: + contents: read + +jobs: + ci-cd: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Create necessary directories + run: | + mkdir -p infra/infra-redis/src/main/resources + mkdir -p infra/infra-security/src/main/resources + mkdir -p infra/infra-s3/src/main/resources + mkdir -p data/src/main/resources + + - name: Create application-properties.yml + run: | + echo "${{ secrets.APPLICATION_REDIS }}" > infra/infra-redis/src/main/resources/application-redis.yml + echo "${{ secrets.APPLICATION_SECURITY }}" > infra/infra-security/src/main/resources/application-security.yml + echo "${{ secrets.APPLICATION_S3 }}" > infra/infra-s3/src/main/resources/application-s3.yml + echo "${{ secrets.APPLICATION_RDB }}" > data/src/main/resources/application-rdb.yml + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ env.AWS_REGION }} + + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: Build, tag, and push image to Amazon ECR + id: build-image + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} + IMAGE_TAG: ${{ github.sha }} + run: | + # Build a docker container and + # push it to ECR so that it can + # be deployed to ECS. + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . + docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG + echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT + + - name: Fill in the new image ID in the Amazon ECS task definition + id: task-def + uses: aws-actions/amazon-ecs-render-task-definition@v1 + with: + task-definition: ${{ env.ECS_TASK_DEFINITION }} + container-name: ${{ env.CONTAINER_NAME }} + image: ${{ steps.build-image.outputs.image }} + + - name: Deploy Amazon ECS task definition + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: ${{ steps.task-def.outputs.task-definition }} + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} + wait-for-service-stability: true diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml new file mode 100644 index 0000000..9f7efea --- /dev/null +++ b/.github/workflows/deploy-prod.yml @@ -0,0 +1,94 @@ +# This workflow will build and push a new container image to Amazon ECR, +# and then will deploy a new task definition to Amazon ECS, when there is a push to the "dev" branch. +# +# To use this workflow, you will need to complete the following set-up steps: +# +# 1. Create an ECR repository to store your images. +# For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`. +# Replace the value of the `ECR_REPOSITORY` environment variable in the workflow below with your repository's name. +# Replace the value of the `AWS_REGION` environment variable in the workflow below with your repository's region. +# +# 2. Create an ECS task definition, an ECS cluster, and an ECS service. +# For example, follow the Getting Started guide on the ECS console: +# https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun +# Replace the value of the `ECS_SERVICE` environment variable in the workflow below with the name you set for the Amazon ECS service. +# Replace the value of the `ECS_CLUSTER` environment variable in the workflow below with the name you set for the cluster. +# +# 3. Store your ECS task definition as a JSON file in your repository. +# The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`. +# Replace the value of the `ECS_TASK_DEFINITION` environment variable in the workflow below with the path to the JSON file. +# Replace the value of the `CONTAINER_NAME` environment variable in the workflow below with the name of the container +# in the `containerDefinitions` section of the task definition. +# +# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`. +# See the documentation for each action used below for the recommended IAM policies for this IAM user, +# and best practices on handling the access key credentials. + +name: Deploy prod to Amazon ECS + +on: + push: + branches: [ "main" ] + +env: + AWS_REGION: ap-northeast-2 # set this to your preferred AWS region, e.g. us-west-1 + ECR_REPOSITORY: kiwing # set this to your Amazon ECR repository name + ECS_SERVICE: kiwing-service-prod # set this to your Amazon ECS service name + ECS_CLUSTER: kiwing-cluster # set this to your Amazon ECS cluster name + ECS_TASK_DEFINITION: .aws/kiwing-task-def-prod.json # set this to the path to your Amazon ECS task definition + # file, e.g. .aws/task-definition.json + CONTAINER_NAME: kiwing-container-prod # set this to the name of the container in the + # containerDefinitions section of your task definition + +permissions: + contents: read + +jobs: + deploy: + name: Deploy + runs-on: ubuntu-latest + environment: production + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ env.AWS_REGION }} + + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: Build, tag, and push image to Amazon ECR + id: build-image + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} + IMAGE_TAG: ${{ github.sha }} + run: | + # Build a docker container and + # push it to ECR so that it can + # be deployed to ECS. + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . + docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG + echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT + + - name: Fill in the new image ID in the Amazon ECS task definition + id: task-def + uses: aws-actions/amazon-ecs-render-task-definition@v1 + with: + task-definition: ${{ env.ECS_TASK_DEFINITION }} + container-name: ${{ env.CONTAINER_NAME }} + image: ${{ steps.build-image.outputs.image }} + + - name: Deploy Amazon ECS task definition + uses: aws-actions/amazon-ecs-deploy-task-definition@v1 + with: + task-definition: ${{ steps.task-def.outputs.task-definition }} + service: ${{ env.ECS_SERVICE }} + cluster: ${{ env.ECS_CLUSTER }} + wait-for-service-stability: true diff --git a/.gitignore b/.gitignore index 5a979af..5e8199d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ out/ ### Kotlin ### .kotlin +/infra/infra-security/src/main/resources/application-security.yml +/data/src/main/resources/application-rdb.yml +/infra/infra-redis/src/main/resources/application-redis.yml +/infra/infra-s3/src/main/resources/application-s3.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e52d0a9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:17-jdk +ARG JAR_PATH=server/api/build/libs +ARG PROFILE=dev +COPY ${JAR_PATH}/api-0.0.1-SNAPSHOT.jar api.jar +ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=$PROFILE"] +CMD ["/api.jar"] diff --git a/build.gradle.kts b/build.gradle.kts index 63d2f74..6aec5eb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -53,4 +53,6 @@ subprojects { useJUnitPlatform() } } + + tasks.register("prepareKotlinBuildScriptModel"){} } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 41f19c8..07599e0 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -8,6 +8,28 @@ bootJar.enabled = false // 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 jar.enabled = true +plugins { + kotlin("plugin.jpa") version "1.9.22" // JPA를 사용하기 위한 플러그인 + kotlin("kapt") +} + +allOpen { + annotation("javax.persistence.Entity") + annotation("javax.persistence.MappedSuperclass") + annotation("javax.persistence.Embeddable") +} + dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") + + // queryDsl + implementation("com.querydsl:querydsl-jpa:5.0.0:jakarta") + implementation("com.querydsl:querydsl-core:5.0.0") + kapt("com.querydsl:querydsl-apt:5.0.0:jakarta") + kapt("com.querydsl:querydsl-kotlin-codegen:5.0.0") + + // h2 + runtimeOnly("com.h2database:h2") + // mysql + runtimeOnly("com.mysql:mysql-connector-j") } diff --git a/data/src/main/kotlin/com/kw/data/DataConfig.java b/data/src/main/kotlin/com/kw/data/DataConfig.kt similarity index 60% rename from data/src/main/kotlin/com/kw/data/DataConfig.java rename to data/src/main/kotlin/com/kw/data/DataConfig.kt index 475724b..16ee488 100644 --- a/data/src/main/kotlin/com/kw/data/DataConfig.java +++ b/data/src/main/kotlin/com/kw/data/DataConfig.kt @@ -1,15 +1,15 @@ -package com.kw.data; +package com.kw.data -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.boot.autoconfigure.domain.EntityScan +import org.springframework.context.annotation.Configuration +import org.springframework.data.jpa.repository.config.EnableJpaAuditing +import org.springframework.data.jpa.repository.config.EnableJpaRepositories +import org.springframework.transaction.annotation.EnableTransactionManagement @Configuration @EntityScan("com.kw.data") @EnableJpaAuditing -@EnableTransactionManagement @EnableJpaRepositories("com.kw.data") -public class DataConfig { +@EnableTransactionManagement +class DataConfig { } diff --git a/data/src/main/kotlin/com/kw/data/common/dto/SearchSortingType.kt b/data/src/main/kotlin/com/kw/data/common/dto/SearchSortingType.kt new file mode 100644 index 0000000..cc10c50 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/common/dto/SearchSortingType.kt @@ -0,0 +1,17 @@ +package com.kw.data.common.dto + +enum class SearchSortingType { + // RECOMMENDED, + LATEST, + POPULAR; + + companion object { + fun from(input: String): SearchSortingType { + try { + return SearchSortingType.valueOf(input.uppercase()) + } catch (e: IllegalArgumentException) { + throw IllegalArgumentException("존재하지 않는 정렬 타입입니다: $input") + } + } + } +} diff --git a/data/src/main/kotlin/com/kw/data/config/QuerydslConfig.kt b/data/src/main/kotlin/com/kw/data/config/QuerydslConfig.kt new file mode 100644 index 0000000..8129ac7 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/config/QuerydslConfig.kt @@ -0,0 +1,18 @@ +package com.kw.data.config + +import com.querydsl.jpa.impl.JPAQueryFactory +import jakarta.persistence.EntityManager +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class QuerydslConfig( + private val em: EntityManager, +) { + + @Bean + fun jpaQueryFactory(): JPAQueryFactory { + return JPAQueryFactory(em) + } + +} diff --git a/data/src/main/kotlin/com/kw/data/domain/Base.kt b/data/src/main/kotlin/com/kw/data/domain/Base.kt new file mode 100644 index 0000000..689ea71 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/Base.kt @@ -0,0 +1,22 @@ +package com.kw.data.domain + +import jakarta.persistence.Column +import jakarta.persistence.EntityListeners +import jakarta.persistence.MappedSuperclass +import org.springframework.data.annotation.CreatedDate +import org.springframework.data.annotation.LastModifiedDate +import org.springframework.data.jpa.domain.support.AuditingEntityListener +import java.time.LocalDateTime + +@MappedSuperclass +@EntityListeners(AuditingEntityListener::class) +abstract class Base { + + @Column(name = "created_at", nullable = false, updatable = false) + @CreatedDate + var createdAt: LocalDateTime = LocalDateTime.now() + @Column(name = "updated_at", nullable = false) + @LastModifiedDate + var updatedAt: LocalDateTime = LocalDateTime.now() + protected set +} diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/Bundle.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/Bundle.kt new file mode 100644 index 0000000..e62b71d --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/Bundle.kt @@ -0,0 +1,115 @@ +package com.kw.data.domain.bundle + +import com.kw.data.domain.Base +import com.kw.data.domain.member.Member +import com.kw.data.domain.question.Question +import jakarta.persistence.* + +@Entity +class Bundle( + name: String, + shareType: ShareType, + originId: Long? = null, + member: Member, +) : Base() { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false, updatable = false) + val id: Long? = null + + @Column(name = "name", nullable = false) + var name: String = name + protected set + + @Enumerated(EnumType.STRING) + @Column(name = "share_type", nullable = false) + var shareType: ShareType = shareType + protected set + + @Column(name = "scrape_count", nullable = false) + var scrapeCount: Long = 0 + protected set + + @Column(name = "question_order", nullable = false) + var questionOrder: String = "" + protected set + + @Column(name = "origin_id", nullable = true, updatable = true) + val originId: Long? = originId + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false, updatable = false) + val member: Member = member + + @OneToMany(mappedBy = "bundle", cascade = [CascadeType.ALL], orphanRemoval = true) + var bundleTags: MutableList = mutableListOf() + protected set + + @OneToMany(mappedBy = "bundle", cascade = [CascadeType.ALL], orphanRemoval = true) + var questions: MutableList = mutableListOf() + protected set + + enum class ShareType { + PUBLIC, + PRIVATE; + + companion object { + fun from(input: String): ShareType { + try { + return ShareType.valueOf(input.uppercase()) + } catch (e: Exception) { + throw IllegalArgumentException("존재하지 않는 공개 범위 타입입니다: $input") + } + } + } + } + + fun isHot(): Boolean { + return scrapeCount >= 30 + } + + fun updateName(name: String) { + this.name = name + } + + fun updateShareType(shareType: ShareType) { + this.shareType = shareType + } + + fun updateQuestionOrder(questionOrder: String) { + this.questionOrder = questionOrder + } + + fun updateBundleTags(bundleTags: List) { + if (bundleTags.size > 3) { + throw IllegalArgumentException("태그는 최대 3개까지 지정 가능합니다.") + } + this.bundleTags.clear() + this.bundleTags.addAll(bundleTags) + } + + fun addQuestions(questions: List) { + this.questions.addAll(questions) + updateQuestionOrder((this.questionOrder + " " + questions.joinToString(" ") { it.id.toString() }).trim()) + } + + fun removeQuestions(questions: List) { + this.questions.removeAll(questions) + val questionOrderList = this.questionOrder.split(" ").toMutableList() + questions.forEach { questionOrderList.remove(it.id.toString()) } + updateQuestionOrder(questionOrderList.joinToString(" ")) + } + + fun copy(member: Member): Bundle { + val bundle = Bundle( + name = this.name, + shareType = ShareType.PRIVATE, + originId = this.id, + member = member + ) + bundle.updateBundleTags(this.bundleTags.map { BundleTag(bundle, it.tag) }) + return bundle + } +} + + diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/BundleTag.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/BundleTag.kt new file mode 100644 index 0000000..ef95184 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/BundleTag.kt @@ -0,0 +1,21 @@ +package com.kw.data.domain.bundle + +import com.kw.data.domain.Base +import com.kw.data.domain.tag.Tag +import jakarta.persistence.* + +@Entity +class BundleTag(bundle: Bundle, tag: Tag) : Base() { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false, updatable = false) + val id: Long? = null + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "bundle_id", nullable = false) + val bundle: Bundle = bundle + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "tag_id", nullable = false) + val tag: Tag = tag +} diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleGetCondition.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleGetCondition.kt new file mode 100644 index 0000000..2380f1b --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleGetCondition.kt @@ -0,0 +1,22 @@ +package com.kw.data.domain.bundle.dto.request + +data class BundleGetCondition( + val sortingType: SortingType?, +) { + enum class SortingType { + CUSTOM, + LATEST, + CREATED, + UPDATED; + + companion object { + fun from(input: String): SortingType { + try { + return valueOf(input.uppercase()) + } catch (e: IllegalArgumentException) { + throw IllegalArgumentException("존재하지 않는 정렬 타입입니다: $input") + } + } + } + } +} diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleSearchCondition.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleSearchCondition.kt new file mode 100644 index 0000000..2082a75 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/dto/request/BundleSearchCondition.kt @@ -0,0 +1,9 @@ +package com.kw.data.domain.bundle.dto.request + +import com.kw.data.common.dto.SearchSortingType + +data class BundleSearchCondition( + val sortingType: SearchSortingType?, + val tagIds: List?, + val keyword: String? +) diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepository.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepository.kt new file mode 100644 index 0000000..6d38273 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepository.kt @@ -0,0 +1,16 @@ +package com.kw.data.domain.bundle.repository + +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.bundle.dto.request.BundleGetCondition +import com.kw.data.domain.bundle.dto.request.BundleSearchCondition +import org.springframework.data.domain.Pageable + +interface BundleCustomRepository { + + fun count(condition: BundleSearchCondition): Long + + fun findAll(condition: BundleSearchCondition, pageable: Pageable): List + + fun findAllByMemberId(memberId: Long, condition: BundleGetCondition): List + +} diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepositoryImpl.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepositoryImpl.kt new file mode 100644 index 0000000..d2bf19d --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleCustomRepositoryImpl.kt @@ -0,0 +1,81 @@ +package com.kw.data.domain.bundle.repository + +import com.kw.data.common.dto.SearchSortingType +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.bundle.QBundle.Companion.bundle +import com.kw.data.domain.bundle.QBundleTag.Companion.bundleTag +import com.kw.data.domain.bundle.dto.request.BundleGetCondition +import com.kw.data.domain.bundle.dto.request.BundleSearchCondition +import com.querydsl.jpa.impl.JPAQueryFactory +import org.springframework.data.domain.Pageable + +class BundleCustomRepositoryImpl(private val queryFactory: JPAQueryFactory) : BundleCustomRepository { + + override fun count(condition: BundleSearchCondition): Long { + val query = queryFactory + .select(bundle.count()) + .from(bundle) + .where( + bundle.shareType.eq(Bundle.ShareType.PUBLIC), + condition.keyword?.let { bundle.name.contains(it) } + ) + + if (condition.tagIds != null) { + query + .leftJoin(bundle.bundleTags, bundleTag) + .where(bundleTag.tag.id.`in`(condition.tagIds)) + } + + return query.fetchOne()!! + } + + override fun findAll(condition: BundleSearchCondition, pageable: Pageable): List { + val query = queryFactory + .selectFrom(bundle) + .leftJoin(bundle.bundleTags, bundleTag).fetchJoin() + .where( + bundle.shareType.eq(Bundle.ShareType.PUBLIC), + condition.keyword?.let { bundle.name.contains(it) } + ) + .orderBy( + if (condition.sortingType == null) { + bundle.scrapeCount.desc() + } else { + when (condition.sortingType) { +// SortingType.RECOMMENDED -> TODO() //TODO + SearchSortingType.LATEST -> bundle.createdAt.desc() + SearchSortingType.POPULAR -> bundle.scrapeCount.desc() + } + } + ) + .offset(pageable.offset) + .limit(pageable.pageSize.toLong()) + + if (condition.tagIds != null) { + query.where(bundleTag.tag.id.`in`(condition.tagIds)) + } + + return query.fetch() + } + + override fun findAllByMemberId(memberId: Long, condition: BundleGetCondition): List { + return queryFactory + .selectFrom(bundle) + .leftJoin(bundle.bundleTags, bundleTag).fetchJoin() + .where(bundle.member.id.eq(memberId)) + .orderBy( + if (condition.sortingType == null) { + bundle.updatedAt.desc() + } else { + when (condition.sortingType) { + BundleGetCondition.SortingType.CUSTOM -> bundle.id.asc() // 서비스에서 재정렬 + BundleGetCondition.SortingType.LATEST -> bundle.createdAt.desc() + BundleGetCondition.SortingType.CREATED -> bundle.createdAt.asc() + BundleGetCondition.SortingType.UPDATED -> bundle.updatedAt.desc() + } + } + ) + .fetch() + } + +} diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleRepository.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleRepository.kt new file mode 100644 index 0000000..1e24db4 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleRepository.kt @@ -0,0 +1,24 @@ +package com.kw.data.domain.bundle.repository + +import com.kw.data.domain.bundle.Bundle +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.jpa.repository.Modifying +import org.springframework.data.jpa.repository.Query +import org.springframework.data.repository.query.Param + +interface BundleRepository : JpaRepository, BundleCustomRepository { + + @Query("SELECT b FROM Bundle b WHERE b.member.id = :memberId AND b.id IN :ids") + fun findAllByMemberIdAndIdIn(@Param("memberId") memberId: Long, @Param("ids") ids: List): List + + @Query("SELECT b FROM Bundle b LEFT JOIN FETCH b.bundleTags bt LEFT JOIN FETCH bt.tag WHERE b.id = :id") + fun findWithTagsById(@Param("id") id: Long): Bundle? + + @Modifying + @Query("UPDATE Bundle b SET b.scrapeCount = b.scrapeCount + 1 WHERE b.id = :id") + fun increaseScrapeCount(@Param("id") id: Long) + + @Modifying + @Query("UPDATE Bundle b SET b.scrapeCount = b.scrapeCount - 1 WHERE b.id = :id") + fun decreaseScrapeCount(@Param("id") id: Long) +} diff --git a/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleTagRepository.kt b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleTagRepository.kt new file mode 100644 index 0000000..9af68cc --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/bundle/repository/BundleTagRepository.kt @@ -0,0 +1,7 @@ +package com.kw.data.domain.bundle.repository + +import com.kw.data.domain.bundle.BundleTag +import org.springframework.data.jpa.repository.JpaRepository + +interface BundleTagRepository : JpaRepository { +} diff --git a/data/src/main/kotlin/com/kw/data/domain/claim/Claim.kt b/data/src/main/kotlin/com/kw/data/domain/claim/Claim.kt new file mode 100644 index 0000000..30d69a9 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/claim/Claim.kt @@ -0,0 +1,15 @@ +package com.kw.data.domain.claim + +import com.kw.data.domain.Base +import jakarta.persistence.* + +@Entity +class Claim(content : String) : Base() { + @Id + @Column(name = "id", nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + val id : Long? = null + + @Column(name = "content", nullable = false, updatable = false) + var content : String = content +} diff --git a/data/src/main/kotlin/com/kw/data/domain/claim/repository/ClaimRepository.kt b/data/src/main/kotlin/com/kw/data/domain/claim/repository/ClaimRepository.kt new file mode 100644 index 0000000..f15c47e --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/claim/repository/ClaimRepository.kt @@ -0,0 +1,7 @@ +package com.kw.data.domain.claim.repository + +import com.kw.data.domain.claim.Claim +import org.springframework.data.jpa.repository.JpaRepository + +interface ClaimRepository : JpaRepository{ +} diff --git a/data/src/main/kotlin/com/kw/data/domain/member/Member.kt b/data/src/main/kotlin/com/kw/data/domain/member/Member.kt new file mode 100644 index 0000000..fe48c33 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/member/Member.kt @@ -0,0 +1,93 @@ +package com.kw.data.domain.member + +import com.kw.data.domain.Base +import jakarta.persistence.* +import org.hibernate.annotations.SQLRestriction +import java.time.LocalDateTime + +@Entity +@SQLRestriction("deleted_at is null") +class Member(email: String) : Base() { + @Id + @Column(name = "id", nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + val id: Long? = null + + @Column(name = "nickname") + var nickname: String? = null + protected set + + @Column(name = "profile_image") + var profileImage: String? = null + protected set + + @Column(name = "email", nullable = false, updatable = false) + val email: String = email + + @Enumerated(EnumType.STRING) + @Column(name = "provider", nullable = false, updatable = false) + val provider: Provider = Provider.GOOGLE + + @Column(name = "last_logined_at", nullable = false) + var lastLoginedAt: LocalDateTime = LocalDateTime.now() + protected set + + @Column(name = "deleted_at") + var deletedAt: LocalDateTime? = null + protected set + + @Column(name = "bundle_order", nullable = false) + var bundleOrder: String = "" + protected set + + var memberRoles: MutableList = mutableListOf(MemberRoleType.ROLE_USER) + + @OneToMany(mappedBy = "member", cascade = [CascadeType.ALL], orphanRemoval = true) + var snsList: MutableList = mutableListOf() + protected set + + @OneToMany(mappedBy = "member", cascade = [CascadeType.ALL], orphanRemoval = true) + var memberTags: MutableList = mutableListOf() + protected set + + fun updateMemberNickname(nickname: String) { + this.nickname = nickname + } + + fun updateMemberProfileImage(url: String) { + this.profileImage = url + } + + fun withdrawMember() { + this.deletedAt = LocalDateTime.now() + } + + fun updateMemberSns(snsList: List) { + if (snsList.size > 3) { + throw IllegalArgumentException("Sns는 최대 3개까지 지정 가능합니다.") + } + this.snsList.clear() + this.snsList.addAll(snsList) + } + + fun updateMemberTags(memberTags: List) { + if (memberTags.size > 3) { + throw IllegalArgumentException("관심 태그는 최대 3개까지 지정 가능합니다.") + } + this.memberTags.clear() + this.memberTags.addAll(memberTags) + } + + fun updateBundleOrder(bundleOrder: String) { + this.bundleOrder = bundleOrder + } + + enum class MemberRoleType { + ROLE_USER, + ROLE_ADMIN + } + + enum class Provider { + GOOGLE, + } +} diff --git a/data/src/main/kotlin/com/kw/data/domain/member/MemberTag.kt b/data/src/main/kotlin/com/kw/data/domain/member/MemberTag.kt new file mode 100644 index 0000000..45127c2 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/member/MemberTag.kt @@ -0,0 +1,21 @@ +package com.kw.data.domain.member + +import com.kw.data.domain.Base +import com.kw.data.domain.tag.Tag +import jakarta.persistence.* + +@Entity +class MemberTag(member: Member, tag: Tag): Base() { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false, updatable = false) + val id: Long? = null + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + val member: Member = member + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "tag_id", nullable = false) + val tag: Tag = tag +} diff --git a/data/src/main/kotlin/com/kw/data/domain/member/Sns.kt b/data/src/main/kotlin/com/kw/data/domain/member/Sns.kt new file mode 100644 index 0000000..05e138a --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/member/Sns.kt @@ -0,0 +1,24 @@ +package com.kw.data.domain.member + +import com.kw.data.domain.Base +import jakarta.persistence.* + +@Entity +class Sns(name: String, url: String, member: Member) : Base() { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false, updatable = false) + val id: Long? = null + + @Column(name = "name", nullable = false) + var name: String = name + protected set + + @Column(name = "url", nullable = false) + var url: String = url + protected set + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + val member: Member = member +} diff --git a/data/src/main/kotlin/com/kw/data/domain/member/repository/MemberRepository.kt b/data/src/main/kotlin/com/kw/data/domain/member/repository/MemberRepository.kt new file mode 100644 index 0000000..d5cdbfa --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/member/repository/MemberRepository.kt @@ -0,0 +1,10 @@ +package com.kw.data.domain.member.repository + +import com.kw.data.domain.member.Member +import org.springframework.data.jpa.repository.JpaRepository + +interface MemberRepository : JpaRepository { + fun findMemberByEmail(email : String): Member? + + fun existsByNickname(nickname: String): Boolean +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/Question.kt b/data/src/main/kotlin/com/kw/data/domain/question/Question.kt new file mode 100644 index 0000000..b37c472 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/Question.kt @@ -0,0 +1,104 @@ +package com.kw.data.domain.question + +import com.kw.data.domain.Base +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.member.Member +import jakarta.persistence.* + +@Entity +class Question( + content: String, + answer: String? = null, + answerShareType: AnswerShareType, + originId: Long? = null, + bundle: Bundle, + member: Member +) : Base() { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + val id: Long? = null + + @Column(name = "content", nullable = false, updatable = true) + var content: String = content + protected set + + @Column(name = "answer", nullable = true, updatable = true) + var answer: String? = answer + protected set + + @Column(name = "share_count", nullable = false, updatable = true) + var shareCount: Long = 0 + protected set + + @Enumerated(EnumType.STRING) + @Column(name = "answer_share_type", nullable = false, updatable = true) + var answerShareType: AnswerShareType = answerShareType + protected set + + @Column(name = "origin_id", nullable = true, updatable = true) + val originId: Long? = originId + + @OneToMany(mappedBy = "question", cascade = [CascadeType.ALL], orphanRemoval = true) + var questionTags: MutableList = mutableListOf() + protected set + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false, updatable = false) + val member: Member = member + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "bundle_id", nullable = false, updatable = false) + var bundle: Bundle = bundle + protected set + + enum class AnswerShareType { + PUBLIC, PRIVATE; + + companion object { + fun from(input: String): AnswerShareType { + try { + return valueOf(input.uppercase()) + } catch (e: Exception) { + throw IllegalArgumentException("존재하지 않는 답변 공유 상태입니다") + } + } + } + } + + fun isHot(): Boolean { + return shareCount >= 30 + } + + fun updateAnswer(answer: String?) { + this.answer = answer + } + + fun updateContent(content: String) { + this.content = content + } + + fun updateAnswerShareStatus(answerShareType: AnswerShareType) { + this.answerShareType = answerShareType + } + + fun updateQuestionTags(questionTags: List) { + if (questionTags.size > 3) { + throw IllegalArgumentException("태그는 최대 3개까지 지정 가능합니다.") + } + this.questionTags.clear() + this.questionTags.addAll(questionTags) + } + + fun copy(bundle: Bundle, member: Member): Question { + val question = Question( + content = this.content, + answer = if (this.answerShareType === AnswerShareType.PUBLIC) this.answer else null, + answerShareType = AnswerShareType.PUBLIC, + originId = this.id, + bundle = bundle, + member = member + ) + question.updateQuestionTags(this.questionTags.map { QuestionTag(question, it.tag) }) + return question + } +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/QuestionReport.kt b/data/src/main/kotlin/com/kw/data/domain/question/QuestionReport.kt new file mode 100644 index 0000000..4ccfa15 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/QuestionReport.kt @@ -0,0 +1,19 @@ +package com.kw.data.domain.question + +import com.kw.data.domain.Base +import jakarta.persistence.* + +@Entity +class QuestionReport(reason : String, question: Question) : Base() { + @Id + @Column(name = "id", nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + val id : Long? = null + + @Column(name = "reason", nullable = false, updatable = false) + var reason : String? = reason + + @ManyToOne + @JoinColumn(name = "question_id") + var question : Question = question +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/QuestionTag.kt b/data/src/main/kotlin/com/kw/data/domain/question/QuestionTag.kt new file mode 100644 index 0000000..ed69527 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/QuestionTag.kt @@ -0,0 +1,21 @@ +package com.kw.data.domain.question + +import com.kw.data.domain.Base +import com.kw.data.domain.tag.Tag +import jakarta.persistence.* + +@Entity +class QuestionTag(question: Question, tag: Tag) : Base() { + @Id + @Column(name = "id", nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + val id: Long? = null + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "question_id", nullable = false) + var question: Question = question + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "tag_id", nullable = false) + var tag: Tag = tag +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/dto/QuestionSearchDto.kt b/data/src/main/kotlin/com/kw/data/domain/question/dto/QuestionSearchDto.kt new file mode 100644 index 0000000..a7641d0 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/dto/QuestionSearchDto.kt @@ -0,0 +1,11 @@ +package com.kw.data.domain.question.dto + +import com.kw.data.common.dto.SearchSortingType + +data class QuestionSearchDto( + val sortingType: SearchSortingType?, + val tagIds: List?, + val keyword: String?, + val page: Long = 1, + val size: Long = 10 +) diff --git a/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepository.kt b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepository.kt new file mode 100644 index 0000000..ceef125 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepository.kt @@ -0,0 +1,12 @@ +package com.kw.data.domain.question.repository + +import com.kw.data.domain.question.Question +import com.kw.data.domain.question.dto.QuestionSearchDto + +interface QuestionCustomRepository { + fun searchQuestion(questionSearchDto: QuestionSearchDto): List + fun getPageNum(questionSearchDto: QuestionSearchDto): Long + + fun findAllWithTagsByBundleId(bundleId: Long, showOnlyMyQuestions: Boolean?, memberId: Long?): List + +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepositoryImpl.kt b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepositoryImpl.kt new file mode 100644 index 0000000..721cc13 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionCustomRepositoryImpl.kt @@ -0,0 +1,99 @@ +package com.kw.data.domain.question.repository + +import com.kw.data.common.dto.SearchSortingType +import com.kw.data.domain.question.QQuestion.Companion.question +import com.kw.data.domain.question.QQuestionTag.Companion.questionTag +import com.kw.data.domain.question.Question +import com.kw.data.domain.question.dto.QuestionSearchDto +import com.querydsl.core.types.dsl.BooleanExpression +import com.querydsl.jpa.impl.JPAQueryFactory +import org.springframework.stereotype.Repository + +@Repository +class QuestionCustomRepositoryImpl(val jpaQueryFactory: JPAQueryFactory) : QuestionCustomRepository { + override fun searchQuestion(questionSearchDto: QuestionSearchDto): List { + val keyword = questionSearchDto.keyword + val page = questionSearchDto.page + val size = questionSearchDto.size + + val query = jpaQueryFactory + .selectFrom(question) + .leftJoin(question.questionTags, questionTag).fetchJoin() + .where( + keyword?.let { containsKeyword(keyword) } + ) + .orderBy( + if (questionSearchDto.sortingType == null) { + question.shareCount.desc() + } else { + when (questionSearchDto.sortingType) { +// SortingType.RECOMMENDED -> TODO() //TODO + SearchSortingType.LATEST -> question.createdAt.desc() + SearchSortingType.POPULAR -> question.shareCount.desc() + } + } + ) + .offset((page - 1) * size) + .limit(size) + + if (questionSearchDto.tagIds != null) { + query + .where(questionTag.tag.id.`in`(questionSearchDto.tagIds)) + } + + return query.fetch() + } + + private fun containsKeyword(keyword: String): BooleanExpression? { + return question.content.contains(keyword) + } + + override fun getPageNum(questionSearchDto: QuestionSearchDto): Long { + val keyword = questionSearchDto.keyword + val page = questionSearchDto.page + val size = questionSearchDto.size + + val query = jpaQueryFactory + .select(question.count()) + .from(question) + .where( + keyword?.let { containsKeyword(keyword) } + ) + + if (questionSearchDto.tagIds != null) { + query + .leftJoin(question.questionTags, questionTag) + .where(questionTag.tag.id.`in`(questionSearchDto.tagIds)) + } + + val count = query.fetchOne() + + if (count == 0L) { + return 1L + } + return if (count!! % size != 0L) { + count / size + 1 + } else count / size + } + + override fun findAllWithTagsByBundleId( + bundleId: Long, + showOnlyMyQuestions: Boolean?, + memberId: Long? + ): List { + var query = jpaQueryFactory + .selectFrom(question) + .leftJoin(question.questionTags, questionTag).fetchJoin() + .leftJoin(questionTag.tag).fetchJoin() + .where(question.bundle.id.eq(bundleId)) + + if (showOnlyMyQuestions == true && memberId != null) { + query = query + .leftJoin(question.member).fetchJoin() + .where(question.member.id.eq(memberId)) + } + + return query.fetch() + } + +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionReportRepository.kt b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionReportRepository.kt new file mode 100644 index 0000000..3ab4825 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionReportRepository.kt @@ -0,0 +1,7 @@ +package com.kw.data.domain.question.repository + +import com.kw.data.domain.question.QuestionReport +import org.springframework.data.jpa.repository.JpaRepository + +interface QuestionReportRepository : JpaRepository { +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionRepository.kt b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionRepository.kt new file mode 100644 index 0000000..f875085 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionRepository.kt @@ -0,0 +1,28 @@ +package com.kw.data.domain.question.repository + +import com.kw.data.domain.question.Question +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.jpa.repository.Modifying +import org.springframework.data.jpa.repository.Query +import org.springframework.data.repository.query.Param + +interface QuestionRepository : JpaRepository, QuestionCustomRepository { + + fun countAllByBundleId(bundleId: Long): Long + + fun findAllByBundleId(bundleId: Long): List + + @Query("SELECT q FROM Question q LEFT JOIN FETCH q.questionTags qt LEFT JOIN FETCH qt.tag WHERE q.id IN :ids") + fun findAllWithTagsByIdIn(ids: List): List + + @Query("SELECT q FROM Question q LEFT JOIN FETCH q.questionTags qt LEFT JOIN FETCH qt.tag WHERE q.bundle.id = :bundleId") + fun findAllWithTagsByBundleId(@Param("bundleId") bundleId: Long): List + + @Modifying + @Query("UPDATE Question q SET q.shareCount = q.shareCount + 1 WHERE q.id IN :ids") + fun increaseShareCountByIdIn(@Param("ids") ids: List) + + @Modifying + @Query("UPDATE Question q SET q.shareCount = q.shareCount - 1 WHERE q.id IN :ids") + fun decreaseShareCountByIdIn(@Param("ids") ids: List) +} diff --git a/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionTagRepository.kt b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionTagRepository.kt new file mode 100644 index 0000000..f683c60 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/question/repository/QuestionTagRepository.kt @@ -0,0 +1,7 @@ +package com.kw.data.domain.question.repository + +import com.kw.data.domain.question.QuestionTag +import org.springframework.data.jpa.repository.JpaRepository + +interface QuestionTagRepository : JpaRepository { +} diff --git a/data/src/main/kotlin/com/kw/data/domain/tag/Tag.kt b/data/src/main/kotlin/com/kw/data/domain/tag/Tag.kt new file mode 100644 index 0000000..38863bc --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/tag/Tag.kt @@ -0,0 +1,15 @@ +package com.kw.data.domain.tag + +import jakarta.persistence.* + +@Entity +class Tag(content: String) { + @Id + @Column(name = "id", nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + val id: Long? = null + + @Column(name = "name", nullable = false, updatable = true) + var name: String = content + protected set +} diff --git a/data/src/main/kotlin/com/kw/data/domain/tag/repository/TagRepository.kt b/data/src/main/kotlin/com/kw/data/domain/tag/repository/TagRepository.kt new file mode 100644 index 0000000..7a7a1b8 --- /dev/null +++ b/data/src/main/kotlin/com/kw/data/domain/tag/repository/TagRepository.kt @@ -0,0 +1,7 @@ +package com.kw.data.domain.tag.repository + +import com.kw.data.domain.tag.Tag +import org.springframework.data.jpa.repository.JpaRepository + +interface TagRepository : JpaRepository { +} diff --git a/data/src/main/resources/application.properties b/data/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/data/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..31d9f38 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,7 @@ +version: '3' + +services: + redis: + image: redis:latest + ports: + - "6379:6379" diff --git a/infra/infra-redis/build.gradle.kts b/infra/infra-redis/build.gradle.kts new file mode 100644 index 0000000..327414a --- /dev/null +++ b/infra/infra-redis/build.gradle.kts @@ -0,0 +1,13 @@ +import org.springframework.boot.gradle.tasks.bundling.BootJar + +val jar: Jar by tasks +val bootJar: BootJar by tasks + +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +bootJar.enabled = false +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar.enabled = true + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-data-redis") +} diff --git a/infra/infra-redis/gradle/wrapper/gradle-wrapper.jar b/infra/infra-redis/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/infra/infra-redis/gradle/wrapper/gradle-wrapper.properties b/infra/infra-redis/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/infra/infra-redis/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/infra/infra-redis/src/main/kotlin/com/kw/infraredis/config/RedisConfig.kt b/infra/infra-redis/src/main/kotlin/com/kw/infraredis/config/RedisConfig.kt new file mode 100644 index 0000000..2889e57 --- /dev/null +++ b/infra/infra-redis/src/main/kotlin/com/kw/infraredis/config/RedisConfig.kt @@ -0,0 +1,36 @@ +package com.kw.infraredis.config + +import org.springframework.beans.factory.annotation.Value +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.data.redis.connection.RedisConnectionFactory +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory +import org.springframework.data.redis.core.RedisTemplate +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer +import org.springframework.data.redis.serializer.StringRedisSerializer + + +@Configuration +class RedisConfig( + @Value("\${spring.data.redis.host}") + val host: String, + + @Value("\${spring.data.redis.port}") + val port: Int +) { + + @Bean + fun redisConnectionFactory(): RedisConnectionFactory { + return LettuceConnectionFactory(host, port) + } + + @Bean + fun redisTemplate(connectionFactory: RedisConnectionFactory?): RedisTemplate { + val redisTemplate = RedisTemplate() + redisTemplate.keySerializer = StringRedisSerializer() + redisTemplate.valueSerializer = GenericJackson2JsonRedisSerializer() + redisTemplate.connectionFactory = connectionFactory + return redisTemplate + } +} + diff --git a/infra/infra-redis/src/main/kotlin/com/kw/infraredis/repository/RedisRefreshTokenRepository.kt b/infra/infra-redis/src/main/kotlin/com/kw/infraredis/repository/RedisRefreshTokenRepository.kt new file mode 100644 index 0000000..f26b9b8 --- /dev/null +++ b/infra/infra-redis/src/main/kotlin/com/kw/infraredis/repository/RedisRefreshTokenRepository.kt @@ -0,0 +1,29 @@ +package com.kw.infraredis.repository + +import org.springframework.data.redis.core.RedisTemplate +import org.springframework.data.redis.core.ValueOperations +import org.springframework.stereotype.Repository +import java.util.concurrent.TimeUnit + + +@Repository +class RedisRefreshTokenRepository(val redisTemplate: RedisTemplate) { + fun save(refreshToken: String, memberId: Long) { + val valueOperations: ValueOperations = redisTemplate.opsForValue() + valueOperations[refreshToken] = memberId + redisTemplate.expire(refreshToken, REFRESH_TOKEN_EXPIRE_LONG, TimeUnit.SECONDS) + } + + fun delete(refreshToken: String) { + redisTemplate.delete(refreshToken) + } + + fun findByRefreshToken(refreshToken: String): Long? { + return redisTemplate.opsForValue().get(refreshToken).toString().toLong() + } + + companion object { + private const val REFRESH_TOKEN_EXPIRE_LONG = 259200L + } +} + diff --git a/infra/infra-s3/build.gradle.kts b/infra/infra-s3/build.gradle.kts new file mode 100644 index 0000000..627fac2 --- /dev/null +++ b/infra/infra-s3/build.gradle.kts @@ -0,0 +1,20 @@ +import org.springframework.boot.gradle.tasks.bundling.BootJar + +val jar: Jar by tasks +val bootJar: BootJar by tasks + +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +bootJar.enabled = false +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar.enabled = true + +dependencies { + // spring-cloud-aws 관련 라이브러리 버전 관리 + implementation(platform("io.awspring.cloud:spring-cloud-aws-dependencies:3.1.0")) + + // aws - autoconfigure & s3 + implementation("io.awspring.cloud:spring-cloud-aws-starter-s3") + + // web + implementation("org.springframework.boot:spring-boot-starter-web") +} diff --git a/infra/infra-s3/gradle/wrapper/gradle-wrapper.jar b/infra/infra-s3/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 zcma&NWl&^owk(X(xVyW%ySuwf;qI=D6|RlDJ2cR^yEKh!@I- zp9QeisK*rlxC>+~7Dk4IxIRsKBHqdR9b3+fyL=ynHmIDe&|>O*VlvO+%z5;9Z$|DJ zb4dO}-R=MKr^6EKJiOrJdLnCJn>np?~vU-1sSFgPu;pthGwf}bG z(1db%xwr#x)r+`4AGu$j7~u2MpVs3VpLp|mx&;>`0p0vH6kF+D2CY0fVdQOZ@h;A` z{infNyvmFUiu*XG}RNMNwXrbec_*a3N=2zJ|Wh5z* z5rAX$JJR{#zP>KY**>xHTuw?|-Rg|o24V)74HcfVT;WtQHXlE+_4iPE8QE#DUm%x0 zEKr75ur~W%w#-My3Tj`hH6EuEW+8K-^5P62$7Sc5OK+22qj&Pd1;)1#4tKihi=~8C zHiQSst0cpri6%OeaR`PY>HH_;CPaRNty%WTm4{wDK8V6gCZlG@U3$~JQZ;HPvDJcT1V{ z?>H@13MJcCNe#5z+MecYNi@VT5|&UiN1D4ATT+%M+h4c$t;C#UAs3O_q=GxK0}8%8 z8J(_M9bayxN}69ex4dzM_P3oh@ZGREjVvn%%r7=xjkqxJP4kj}5tlf;QosR=%4L5y zWhgejO=vao5oX%mOHbhJ8V+SG&K5dABn6!WiKl{|oPkq(9z8l&Mm%(=qGcFzI=eLu zWc_oCLyf;hVlB@dnwY98?75B20=n$>u3b|NB28H0u-6Rpl((%KWEBOfElVWJx+5yg z#SGqwza7f}$z;n~g%4HDU{;V{gXIhft*q2=4zSezGK~nBgu9-Q*rZ#2f=Q}i2|qOp z!!y4p)4o=LVUNhlkp#JL{tfkhXNbB=Ox>M=n6soptJw-IDI|_$is2w}(XY>a=H52d z3zE$tjPUhWWS+5h=KVH&uqQS=$v3nRs&p$%11b%5qtF}S2#Pc`IiyBIF4%A!;AVoI zXU8-Rpv!DQNcF~(qQnyyMy=-AN~U>#&X1j5BLDP{?K!%h!;hfJI>$mdLSvktEr*89 zdJHvby^$xEX0^l9g$xW-d?J;L0#(`UT~zpL&*cEh$L|HPAu=P8`OQZV!-}l`noSp_ zQ-1$q$R-gDL)?6YaM!=8H=QGW$NT2SeZlb8PKJdc=F-cT@j7Xags+Pr*jPtlHFnf- zh?q<6;)27IdPc^Wdy-mX%2s84C1xZq9Xms+==F4);O`VUASmu3(RlgE#0+#giLh-& zcxm3_e}n4{%|X zJp{G_j+%`j_q5}k{eW&TlP}J2wtZ2^<^E(O)4OQX8FDp6RJq!F{(6eHWSD3=f~(h} zJXCf7=r<16X{pHkm%yzYI_=VDP&9bmI1*)YXZeB}F? z(%QsB5fo*FUZxK$oX~X^69;x~j7ms8xlzpt-T15e9}$4T-pC z6PFg@;B-j|Ywajpe4~bk#S6(fO^|mm1hKOPfA%8-_iGCfICE|=P_~e;Wz6my&)h_~ zkv&_xSAw7AZ%ThYF(4jADW4vg=oEdJGVOs>FqamoL3Np8>?!W#!R-0%2Bg4h?kz5I zKV-rKN2n(vUL%D<4oj@|`eJ>0i#TmYBtYmfla;c!ATW%;xGQ0*TW@PTlGG><@dxUI zg>+3SiGdZ%?5N=8uoLA|$4isK$aJ%i{hECP$bK{J#0W2gQ3YEa zZQ50Stn6hqdfxJ*9#NuSLwKFCUGk@c=(igyVL;;2^wi4o30YXSIb2g_ud$ zgpCr@H0qWtk2hK8Q|&wx)}4+hTYlf;$a4#oUM=V@Cw#!$(nOFFpZ;0lc!qd=c$S}Z zGGI-0jg~S~cgVT=4Vo)b)|4phjStD49*EqC)IPwyeKBLcN;Wu@Aeph;emROAwJ-0< z_#>wVm$)ygH|qyxZaet&(Vf%pVdnvKWJn9`%DAxj3ot;v>S$I}jJ$FLBF*~iZ!ZXE zkvui&p}fI0Y=IDX)mm0@tAd|fEHl~J&K}ZX(Mm3cm1UAuwJ42+AO5@HwYfDH7ipIc zmI;1J;J@+aCNG1M`Btf>YT>~c&3j~Qi@Py5JT6;zjx$cvOQW@3oQ>|}GH?TW-E z1R;q^QFjm5W~7f}c3Ww|awg1BAJ^slEV~Pk`Kd`PS$7;SqJZNj->it4DW2l15}xP6 zoCl$kyEF%yJni0(L!Z&14m!1urXh6Btj_5JYt1{#+H8w?5QI%% zo-$KYWNMJVH?Hh@1n7OSu~QhSswL8x0=$<8QG_zepi_`y_79=nK=_ZP_`Em2UI*tyQoB+r{1QYZCpb?2OrgUw#oRH$?^Tj!Req>XiE#~B|~ z+%HB;=ic+R@px4Ld8mwpY;W^A%8%l8$@B@1m5n`TlKI6bz2mp*^^^1mK$COW$HOfp zUGTz-cN9?BGEp}5A!mDFjaiWa2_J2Iq8qj0mXzk; z66JBKRP{p%wN7XobR0YjhAuW9T1Gw3FDvR5dWJ8ElNYF94eF3ebu+QwKjtvVu4L zI9ip#mQ@4uqVdkl-TUQMb^XBJVLW(-$s;Nq;@5gr4`UfLgF$adIhd?rHOa%D);whv z=;krPp~@I+-Z|r#s3yCH+c1US?dnm+C*)r{m+86sTJusLdNu^sqLrfWed^ndHXH`m zd3#cOe3>w-ga(Dus_^ppG9AC>Iq{y%%CK+Cro_sqLCs{VLuK=dev>OL1dis4(PQ5R zcz)>DjEkfV+MO;~>VUlYF00SgfUo~@(&9$Iy2|G0T9BSP?&T22>K46D zL*~j#yJ?)^*%J3!16f)@Y2Z^kS*BzwfAQ7K96rFRIh>#$*$_Io;z>ux@}G98!fWR@ zGTFxv4r~v)Gsd|pF91*-eaZ3Qw1MH$K^7JhWIdX%o$2kCbvGDXy)a?@8T&1dY4`;L z4Kn+f%SSFWE_rpEpL9bnlmYq`D!6F%di<&Hh=+!VI~j)2mfil03T#jJ_s?}VV0_hp z7T9bWxc>Jm2Z0WMU?`Z$xE74Gu~%s{mW!d4uvKCx@WD+gPUQ zV0vQS(Ig++z=EHN)BR44*EDSWIyT~R4$FcF*VEY*8@l=218Q05D2$|fXKFhRgBIEE zdDFB}1dKkoO^7}{5crKX!p?dZWNz$m>1icsXG2N+((x0OIST9Zo^DW_tytvlwXGpn zs8?pJXjEG;T@qrZi%#h93?FP$!&P4JA(&H61tqQi=opRzNpm zkrG}$^t9&XduK*Qa1?355wd8G2CI6QEh@Ua>AsD;7oRUNLPb76m4HG3K?)wF~IyS3`fXuNM>${?wmB zpVz;?6_(Fiadfd{vUCBM*_kt$+F3J+IojI;9L(gc9n3{sEZyzR9o!_mOwFC#tQ{Q~ zP3-`#uK#tP3Q7~Q;4H|wjZHO8h7e4IuBxl&vz2w~D8)w=Wtg31zpZhz%+kzSzL*dV zwp@{WU4i;hJ7c2f1O;7Mz6qRKeASoIv0_bV=i@NMG*l<#+;INk-^`5w@}Dj~;k=|}qM1vq_P z|GpBGe_IKq|LNy9SJhKOQ$c=5L{Dv|Q_lZl=-ky*BFBJLW9&y_C|!vyM~rQx=!vun z?rZJQB5t}Dctmui5i31C_;_}CEn}_W%>oSXtt>@kE1=JW*4*v4tPp;O6 zmAk{)m!)}34pTWg8{i>($%NQ(Tl;QC@J@FfBoc%Gr&m560^kgSfodAFrIjF}aIw)X zoXZ`@IsMkc8_=w%-7`D6Y4e*CG8k%Ud=GXhsTR50jUnm+R*0A(O3UKFg0`K;qp1bl z7``HN=?39ic_kR|^R^~w-*pa?Vj#7|e9F1iRx{GN2?wK!xR1GW!qa=~pjJb-#u1K8 zeR?Y2i-pt}yJq;SCiVHODIvQJX|ZJaT8nO+(?HXbLefulKKgM^B(UIO1r+S=7;kLJ zcH}1J=Px2jsh3Tec&v8Jcbng8;V-`#*UHt?hB(pmOipKwf3Lz8rG$heEB30Sg*2rx zV<|KN86$soN(I!BwO`1n^^uF2*x&vJ$2d$>+`(romzHP|)K_KkO6Hc>_dwMW-M(#S zK(~SiXT1@fvc#U+?|?PniDRm01)f^#55;nhM|wi?oG>yBsa?~?^xTU|fX-R(sTA+5 zaq}-8Tx7zrOy#3*JLIIVsBmHYLdD}!0NP!+ITW+Thn0)8SS!$@)HXwB3tY!fMxc#1 zMp3H?q3eD?u&Njx4;KQ5G>32+GRp1Ee5qMO0lZjaRRu&{W<&~DoJNGkcYF<5(Ab+J zgO>VhBl{okDPn78<%&e2mR{jwVCz5Og;*Z;;3%VvoGo_;HaGLWYF7q#jDX=Z#Ml`H z858YVV$%J|e<1n`%6Vsvq7GmnAV0wW4$5qQ3uR@1i>tW{xrl|ExywIc?fNgYlA?C5 zh$ezAFb5{rQu6i7BSS5*J-|9DQ{6^BVQ{b*lq`xS@RyrsJN?-t=MTMPY;WYeKBCNg z^2|pN!Q^WPJuuO4!|P@jzt&tY1Y8d%FNK5xK(!@`jO2aEA*4 zkO6b|UVBipci?){-Ke=+1;mGlND8)6+P;8sq}UXw2hn;fc7nM>g}GSMWu&v&fqh

iViYT=fZ(|3Ox^$aWPp4a8h24tD<|8-!aK0lHgL$N7Efw}J zVIB!7=T$U`ao1?upi5V4Et*-lTG0XvExbf!ya{cua==$WJyVG(CmA6Of*8E@DSE%L z`V^$qz&RU$7G5mg;8;=#`@rRG`-uS18$0WPN@!v2d{H2sOqP|!(cQ@ zUHo!d>>yFArLPf1q`uBvY32miqShLT1B@gDL4XoVTK&@owOoD)OIHXrYK-a1d$B{v zF^}8D3Y^g%^cnvScOSJR5QNH+BI%d|;J;wWM3~l>${fb8DNPg)wrf|GBP8p%LNGN# z3EaIiItgwtGgT&iYCFy9-LG}bMI|4LdmmJt@V@% zb6B)1kc=T)(|L@0;wr<>=?r04N;E&ef+7C^`wPWtyQe(*pD1pI_&XHy|0gIGHMekd zF_*M4yi6J&Z4LQj65)S zXwdM{SwUo%3SbPwFsHgqF@V|6afT|R6?&S;lw=8% z3}@9B=#JI3@B*#4s!O))~z zc>2_4Q_#&+5V`GFd?88^;c1i7;Vv_I*qt!_Yx*n=;rj!82rrR2rQ8u5(Ejlo{15P% zs~!{%XJ>FmJ})H^I9bn^Re&38H{xA!0l3^89k(oU;bZWXM@kn$#aoS&Y4l^-WEn-fH39Jb9lA%s*WsKJQl?n9B7_~P z-XM&WL7Z!PcoF6_D>V@$CvUIEy=+Z&0kt{szMk=f1|M+r*a43^$$B^MidrT0J;RI` z(?f!O<8UZkm$_Ny$Hth1J#^4ni+im8M9mr&k|3cIgwvjAgjH z8`N&h25xV#v*d$qBX5jkI|xOhQn!>IYZK7l5#^P4M&twe9&Ey@@GxYMxBZq2e7?`q z$~Szs0!g{2fGcp9PZEt|rdQ6bhAgpcLHPz?f-vB?$dc*!9OL?Q8mn7->bFD2Si60* z!O%y)fCdMSV|lkF9w%x~J*A&srMyYY3{=&$}H zGQ4VG_?$2X(0|vT0{=;W$~icCI{b6W{B!Q8xdGhF|D{25G_5_+%s(46lhvNLkik~R z>nr(&C#5wwOzJZQo9m|U<;&Wk!_#q|V>fsmj1g<6%hB{jGoNUPjgJslld>xmODzGjYc?7JSuA?A_QzjDw5AsRgi@Y|Z0{F{!1=!NES-#*f^s4l0Hu zz468))2IY5dmD9pa*(yT5{EyP^G>@ZWumealS-*WeRcZ}B%gxq{MiJ|RyX-^C1V=0 z@iKdrGi1jTe8Ya^x7yyH$kBNvM4R~`fbPq$BzHum-3Zo8C6=KW@||>zsA8-Y9uV5V z#oq-f5L5}V<&wF4@X@<3^C%ptp6+Ce)~hGl`kwj)bsAjmo_GU^r940Z-|`<)oGnh7 zFF0Tde3>ui?8Yj{sF-Z@)yQd~CGZ*w-6p2U<8}JO-sRsVI5dBji`01W8A&3$?}lxBaC&vn0E$c5tW* zX>5(zzZ=qn&!J~KdsPl;P@bmA-Pr8T*)eh_+Dv5=Ma|XSle6t(k8qcgNyar{*ReQ8 zTXwi=8vr>!3Ywr+BhggHDw8ke==NTQVMCK`$69fhzEFB*4+H9LIvdt-#IbhZvpS}} zO3lz;P?zr0*0$%-Rq_y^k(?I{Mk}h@w}cZpMUp|ucs55bcloL2)($u%mXQw({Wzc~ z;6nu5MkjP)0C(@%6Q_I_vsWrfhl7Zpoxw#WoE~r&GOSCz;_ro6i(^hM>I$8y>`!wW z*U^@?B!MMmb89I}2(hcE4zN2G^kwyWCZp5JG>$Ez7zP~D=J^LMjSM)27_0B_X^C(M z`fFT+%DcKlu?^)FCK>QzSnV%IsXVcUFhFdBP!6~se&xxrIxsvySAWu++IrH;FbcY$ z2DWTvSBRfLwdhr0nMx+URA$j3i7_*6BWv#DXfym?ZRDcX9C?cY9sD3q)uBDR3uWg= z(lUIzB)G$Hr!){>E{s4Dew+tb9kvToZp-1&c?y2wn@Z~(VBhqz`cB;{E4(P3N2*nJ z_>~g@;UF2iG{Kt(<1PyePTKahF8<)pozZ*xH~U-kfoAayCwJViIrnqwqO}7{0pHw$ zs2Kx?s#vQr7XZ264>5RNKSL8|Ty^=PsIx^}QqOOcfpGUU4tRkUc|kc7-!Ae6!+B{o~7nFpm3|G5^=0#Bnm6`V}oSQlrX(u%OWnC zoLPy&Q;1Jui&7ST0~#+}I^&?vcE*t47~Xq#YwvA^6^} z`WkC)$AkNub|t@S!$8CBlwbV~?yp&@9h{D|3z-vJXgzRC5^nYm+PyPcgRzAnEi6Q^gslXYRv4nycsy-SJu?lMps-? zV`U*#WnFsdPLL)Q$AmD|0`UaC4ND07+&UmOu!eHruzV|OUox<+Jl|Mr@6~C`T@P%s zW7sgXLF2SSe9Fl^O(I*{9wsFSYb2l%-;&Pi^dpv!{)C3d0AlNY6!4fgmSgj_wQ*7Am7&$z;Jg&wgR-Ih;lUvWS|KTSg!&s_E9_bXBkZvGiC6bFKDWZxsD$*NZ#_8bl zG1P-#@?OQzED7@jlMJTH@V!6k;W>auvft)}g zhoV{7$q=*;=l{O>Q4a@ ziMjf_u*o^PsO)#BjC%0^h>Xp@;5$p{JSYDt)zbb}s{Kbt!T*I@Pk@X0zds6wsefuU zW$XY%yyRGC94=6mf?x+bbA5CDQ2AgW1T-jVAJbm7K(gp+;v6E0WI#kuACgV$r}6L? zd|Tj?^%^*N&b>Dd{Wr$FS2qI#Ucs1yd4N+RBUQiSZGujH`#I)mG&VKoDh=KKFl4=G z&MagXl6*<)$6P}*Tiebpz5L=oMaPrN+caUXRJ`D?=K9!e0f{@D&cZLKN?iNP@X0aF zE(^pl+;*T5qt?1jRC=5PMgV!XNITRLS_=9{CJExaQj;lt!&pdzpK?8p>%Mb+D z?yO*uSung=-`QQ@yX@Hyd4@CI^r{2oiu`%^bNkz+Nkk!IunjwNC|WcqvX~k=><-I3 zDQdbdb|!v+Iz01$w@aMl!R)koD77Xp;eZwzSl-AT zr@Vu{=xvgfq9akRrrM)}=!=xcs+U1JO}{t(avgz`6RqiiX<|hGG1pmop8k6Q+G_mv zJv|RfDheUp2L3=^C=4aCBMBn0aRCU(DQwX-W(RkRwmLeuJYF<0urcaf(=7)JPg<3P zQs!~G)9CT18o!J4{zX{_e}4eS)U-E)0FAt}wEI(c0%HkxgggW;(1E=>J17_hsH^sP z%lT0LGgbUXHx-K*CI-MCrP66UP0PvGqM$MkeLyqHdbgP|_Cm!7te~b8p+e6sQ_3k| zVcwTh6d83ltdnR>D^)BYQpDKlLk3g0Hdcgz2}%qUs9~~Rie)A-BV1mS&naYai#xcZ z(d{8=-LVpTp}2*y)|gR~;qc7fp26}lPcLZ#=JpYcn3AT9(UIdOyg+d(P5T7D&*P}# zQCYplZO5|7+r19%9e`v^vfSS1sbX1c%=w1;oyruXB%Kl$ACgKQ6=qNWLsc=28xJjg zwvsI5-%SGU|3p>&zXVl^vVtQT3o-#$UT9LI@Npz~6=4!>mc431VRNN8od&Ul^+G_kHC`G=6WVWM z%9eWNyy(FTO|A+@x}Ou3CH)oi;t#7rAxdIXfNFwOj_@Y&TGz6P_sqiB`Q6Lxy|Q{`|fgmRG(k+!#b*M+Z9zFce)f-7;?Km5O=LHV9f9_87; zF7%R2B+$?@sH&&-$@tzaPYkw0;=i|;vWdI|Wl3q_Zu>l;XdIw2FjV=;Mq5t1Q0|f< zs08j54Bp`3RzqE=2enlkZxmX6OF+@|2<)A^RNQpBd6o@OXl+i)zO%D4iGiQNuXd+zIR{_lb96{lc~bxsBveIw6umhShTX+3@ZJ=YHh@ zWY3(d0azg;7oHn>H<>?4@*RQbi>SmM=JrHvIG(~BrvI)#W(EAeO6fS+}mxxcc+X~W6&YVl86W9WFSS}Vz-f9vS?XUDBk)3TcF z8V?$4Q)`uKFq>xT=)Y9mMFVTUk*NIA!0$?RP6Ig0TBmUFrq*Q-Agq~DzxjStQyJ({ zBeZ;o5qUUKg=4Hypm|}>>L=XKsZ!F$yNTDO)jt4H0gdQ5$f|d&bnVCMMXhNh)~mN z@_UV6D7MVlsWz+zM+inZZp&P4fj=tm6fX)SG5H>OsQf_I8c~uGCig$GzuwViK54bcgL;VN|FnyQl>Ed7(@>=8$a_UKIz|V6CeVSd2(P z0Uu>A8A+muM%HLFJQ9UZ5c)BSAv_zH#1f02x?h9C}@pN@6{>UiAp>({Fn(T9Q8B z^`zB;kJ5b`>%dLm+Ol}ty!3;8f1XDSVX0AUe5P#@I+FQ-`$(a;zNgz)4x5hz$Hfbg z!Q(z26wHLXko(1`;(BAOg_wShpX0ixfWq3ponndY+u%1gyX)_h=v1zR#V}#q{au6; z!3K=7fQwnRfg6FXtNQmP>`<;!N137paFS%y?;lb1@BEdbvQHYC{976l`cLqn;b8lp zIDY>~m{gDj(wfnK!lpW6pli)HyLEiUrNc%eXTil|F2s(AY+LW5hkKb>TQ3|Q4S9rr zpDs4uK_co6XPsn_z$LeS{K4jFF`2>U`tbgKdyDne`xmR<@6AA+_hPNKCOR-Zqv;xk zu5!HsBUb^!4uJ7v0RuH-7?l?}b=w5lzzXJ~gZcxRKOovSk@|#V+MuX%Y+=;14i*%{)_gSW9(#4%)AV#3__kac1|qUy!uyP{>?U#5wYNq}y$S9pCc zFc~4mgSC*G~j0u#qqp9 z${>3HV~@->GqEhr_Xwoxq?Hjn#=s2;i~g^&Hn|aDKpA>Oc%HlW(KA1?BXqpxB;Ydx)w;2z^MpjJ(Qi(X!$5RC z*P{~%JGDQqojV>2JbEeCE*OEu!$XJ>bWA9Oa_Hd;y)F%MhBRi*LPcdqR8X`NQ&1L# z5#9L*@qxrx8n}LfeB^J{%-?SU{FCwiWyHp682F+|pa+CQa3ZLzBqN1{)h4d6+vBbV zC#NEbQLC;}me3eeYnOG*nXOJZEU$xLZ1<1Y=7r0(-U0P6-AqwMAM`a(Ed#7vJkn6plb4eI4?2y3yOTGmmDQ!z9`wzbf z_OY#0@5=bnep;MV0X_;;SJJWEf^E6Bd^tVJ9znWx&Ks8t*B>AM@?;D4oWUGc z!H*`6d7Cxo6VuyS4Eye&L1ZRhrRmN6Lr`{NL(wDbif|y&z)JN>Fl5#Wi&mMIr5i;x zBx}3YfF>>8EC(fYnmpu~)CYHuHCyr5*`ECap%t@y=jD>!_%3iiE|LN$mK9>- zHdtpy8fGZtkZF?%TW~29JIAfi2jZT8>OA7=h;8T{{k?c2`nCEx9$r zS+*&vt~2o^^J+}RDG@+9&M^K*z4p{5#IEVbz`1%`m5c2};aGt=V?~vIM}ZdPECDI)47|CWBCfDWUbxBCnmYivQ*0Nu_xb*C>~C9(VjHM zxe<*D<#dQ8TlpMX2c@M<9$w!RP$hpG4cs%AI){jp*Sj|*`m)5(Bw*A0$*i-(CA5#%>a)$+jI2C9r6|(>J8InryENI z$NohnxDUB;wAYDwrb*!N3noBTKPpPN}~09SEL18tkG zxgz(RYU_;DPT{l?Q$+eaZaxnsWCA^ds^0PVRkIM%bOd|G2IEBBiz{&^JtNsODs;5z zICt_Zj8wo^KT$7Bg4H+y!Df#3mbl%%?|EXe!&(Vmac1DJ*y~3+kRKAD=Ovde4^^%~ zw<9av18HLyrf*_>Slp;^i`Uy~`mvBjZ|?Ad63yQa#YK`4+c6;pW4?XIY9G1(Xh9WO8{F-Aju+nS9Vmv=$Ac0ienZ+p9*O%NG zMZKy5?%Z6TAJTE?o5vEr0r>f>hb#2w2U3DL64*au_@P!J!TL`oH2r*{>ffu6|A7tv zL4juf$DZ1MW5ZPsG!5)`k8d8c$J$o;%EIL0va9&GzWvkS%ZsGb#S(?{!UFOZ9<$a| zY|a+5kmD5N&{vRqkgY>aHsBT&`rg|&kezoD)gP0fsNYHsO#TRc_$n6Lf1Z{?+DLziXlHrq4sf(!>O{?Tj;Eh@%)+nRE_2VxbN&&%%caU#JDU%vL3}Cb zsb4AazPI{>8H&d=jUaZDS$-0^AxE@utGs;-Ez_F(qC9T=UZX=>ok2k2 ziTn{K?y~a5reD2A)P${NoI^>JXn>`IeArow(41c-Wm~)wiryEP(OS{YXWi7;%dG9v zI?mwu1MxD{yp_rrk!j^cKM)dc4@p4Ezyo%lRN|XyD}}>v=Xoib0gOcdXrQ^*61HNj z=NP|pd>@yfvr-=m{8$3A8TQGMTE7g=z!%yt`8`Bk-0MMwW~h^++;qyUP!J~ykh1GO z(FZ59xuFR$(WE;F@UUyE@Sp>`aVNjyj=Ty>_Vo}xf`e7`F;j-IgL5`1~-#70$9_=uBMq!2&1l zomRgpD58@)YYfvLtPW}{C5B35R;ZVvB<<#)x%srmc_S=A7F@DW8>QOEGwD6suhwCg z>Pa+YyULhmw%BA*4yjDp|2{!T98~<6Yfd(wo1mQ!KWwq0eg+6)o1>W~f~kL<-S+P@$wx*zeI|1t7z#Sxr5 zt6w+;YblPQNplq4Z#T$GLX#j6yldXAqj>4gAnnWtBICUnA&-dtnlh=t0Ho_vEKwV` z)DlJi#!@nkYV#$!)@>udAU*hF?V`2$Hf=V&6PP_|r#Iv*J$9)pF@X3`k;5})9^o4y z&)~?EjX5yX12O(BsFy-l6}nYeuKkiq`u9145&3Ssg^y{5G3Pse z9w(YVa0)N-fLaBq1`P!_#>SS(8fh_5!f{UrgZ~uEdeMJIz7DzI5!NHHqQtm~#CPij z?=N|J>nPR6_sL7!f4hD_|KH`vf8(Wpnj-(gPWH+ZvID}%?~68SwhPTC3u1_cB`otq z)U?6qo!ZLi5b>*KnYHWW=3F!p%h1;h{L&(Q&{qY6)_qxNfbP6E3yYpW!EO+IW3?@J z);4>g4gnl^8klu7uA>eGF6rIGSynacogr)KUwE_R4E5Xzi*Qir@b-jy55-JPC8c~( zo!W8y9OGZ&`xmc8;=4-U9=h{vCqfCNzYirONmGbRQlR`WWlgnY+1wCXbMz&NT~9*| z6@FrzP!LX&{no2!Ln_3|I==_4`@}V?4a;YZKTdw;vT<+K+z=uWbW(&bXEaWJ^W8Td z-3&1bY^Z*oM<=M}LVt>_j+p=2Iu7pZmbXrhQ_k)ysE9yXKygFNw$5hwDn(M>H+e1&9BM5!|81vd%r%vEm zqxY3?F@fb6O#5UunwgAHR9jp_W2zZ}NGp2%mTW@(hz7$^+a`A?mb8|_G*GNMJ) zjqegXQio=i@AINre&%ofexAr95aop5C+0MZ0m-l=MeO8m3epm7U%vZB8+I+C*iNFM z#T3l`gknX;D$-`2XT^Cg*vrv=RH+P;_dfF++cP?B_msQI4j+lt&rX2)3GaJx%W*Nn zkML%D{z5tpHH=dksQ*gzc|}gzW;lwAbxoR07VNgS*-c3d&8J|;@3t^ zVUz*J*&r7DFRuFVDCJDK8V9NN5hvpgGjwx+5n)qa;YCKe8TKtdnh{I7NU9BCN!0dq zczrBk8pE{{@vJa9ywR@mq*J=v+PG;?fwqlJVhijG!3VmIKs>9T6r7MJpC)m!Tc#>g zMtVsU>wbwFJEfwZ{vB|ZlttNe83)$iz`~#8UJ^r)lJ@HA&G#}W&ZH*;k{=TavpjWE z7hdyLZPf*X%Gm}i`Y{OGeeu^~nB8=`{r#TUrM-`;1cBvEd#d!kPqIgYySYhN-*1;L z^byj%Yi}Gx)Wnkosi337BKs}+5H5dth1JA{Ir-JKN$7zC)*}hqeoD(WfaUDPT>0`- z(6sa0AoIqASwF`>hP}^|)a_j2s^PQn*qVC{Q}htR z5-)duBFXT_V56-+UohKXlq~^6uf!6sA#ttk1o~*QEy_Y-S$gAvq47J9Vtk$5oA$Ct zYhYJ@8{hsC^98${!#Ho?4y5MCa7iGnfz}b9jE~h%EAAv~Qxu)_rAV;^cygV~5r_~?l=B`zObj7S=H=~$W zPtI_m%g$`kL_fVUk9J@>EiBH zOO&jtn~&`hIFMS5S`g8w94R4H40mdNUH4W@@XQk1sr17b{@y|JB*G9z1|CrQjd+GX z6+KyURG3;!*BQrentw{B2R&@2&`2}n(z-2&X7#r!{yg@Soy}cRD~j zj9@UBW+N|4HW4AWapy4wfUI- zZ`gSL6DUlgj*f1hSOGXG0IVH8HxK?o2|3HZ;KW{K+yPAlxtb)NV_2AwJm|E)FRs&& z=c^e7bvUsztY|+f^k7NXs$o1EUq>cR7C0$UKi6IooHWlK_#?IWDkvywnzg&ThWo^? z2O_N{5X39#?eV9l)xI(>@!vSB{DLt*oY!K1R8}_?%+0^C{d9a%N4 zoxHVT1&Lm|uDX%$QrBun5e-F`HJ^T$ zmzv)p@4ZHd_w9!%Hf9UYNvGCw2TTTbrj9pl+T9%-_-}L(tES>Or-}Z4F*{##n3~L~TuxjirGuIY#H7{%$E${?p{Q01 zi6T`n;rbK1yIB9jmQNycD~yZq&mbIsFWHo|ZAChSFPQa<(%d8mGw*V3fh|yFoxOOiWJd(qvVb!Z$b88cg->N=qO*4k~6;R==|9ihg&riu#P~s4Oap9O7f%crSr^rljeIfXDEg>wi)&v*a%7zpz<9w z*r!3q9J|390x`Zk;g$&OeN&ctp)VKRpDSV@kU2Q>jtok($Y-*x8_$2piTxun81@vt z!Vj?COa0fg2RPXMSIo26T=~0d`{oGP*eV+$!0I<(4azk&Vj3SiG=Q!6mX0p$z7I}; z9BJUFgT-K9MQQ-0@Z=^7R<{bn2Fm48endsSs`V7_@%8?Bxkqv>BDoVcj?K#dV#uUP zL1ND~?D-|VGKe3Rw_7-Idpht>H6XRLh*U7epS6byiGvJpr%d}XwfusjH9g;Z98H`x zyde%%5mhGOiL4wljCaWCk-&uE4_OOccb9c!ZaWt4B(wYl!?vyzl%7n~QepN&eFUrw zFIOl9c({``6~QD+43*_tzP{f2x41h(?b43^y6=iwyB)2os5hBE!@YUS5?N_tXd=h( z)WE286Fbd>R4M^P{!G)f;h<3Q>Fipuy+d2q-)!RyTgt;wr$(?9ox3;q+{E*ZQHhOn;lM`cjnu9 zXa48ks-v(~b*;MAI<>YZH(^NV8vjb34beE<_cwKlJoR;k6lJNSP6v}uiyRD?|0w+X@o1ONrH8a$fCxXpf? z?$DL0)7|X}Oc%h^zrMKWc-NS9I0Utu@>*j}b@tJ=ixQSJ={4@854wzW@E>VSL+Y{i z#0b=WpbCZS>kUCO_iQz)LoE>P5LIG-hv9E+oG}DtlIDF>$tJ1aw9^LuhLEHt?BCj& z(O4I8v1s#HUi5A>nIS-JK{v!7dJx)^Yg%XjNmlkWAq2*cv#tHgz`Y(bETc6CuO1VkN^L-L3j_x<4NqYb5rzrLC-7uOv z!5e`GZt%B782C5-fGnn*GhDF$%(qP<74Z}3xx+{$4cYKy2ikxI7B2N+2r07DN;|-T->nU&!=Cm#rZt%O_5c&1Z%nlWq3TKAW0w zQqemZw_ue--2uKQsx+niCUou?HjD`xhEjjQd3%rrBi82crq*~#uA4+>vR<_S{~5ce z-2EIl?~s z1=GVL{NxP1N3%=AOaC}j_Fv=ur&THz zyO!d9kHq|c73kpq`$+t+8Bw7MgeR5~`d7ChYyGCBWSteTB>8WAU(NPYt2Dk`@#+}= zI4SvLlyk#pBgVigEe`?NG*vl7V6m+<}%FwPV=~PvvA)=#ths==DRTDEYh4V5}Cf$z@#;< zyWfLY_5sP$gc3LLl2x+Ii)#b2nhNXJ{R~vk`s5U7Nyu^3yFg&D%Txwj6QezMX`V(x z=C`{76*mNb!qHHs)#GgGZ_7|vkt9izl_&PBrsu@}L`X{95-2jf99K)0=*N)VxBX2q z((vkpP2RneSIiIUEnGb?VqbMb=Zia+rF~+iqslydE34cSLJ&BJW^3knX@M;t*b=EA zNvGzv41Ld_T+WT#XjDB840vovUU^FtN_)G}7v)1lPetgpEK9YS^OWFkPoE{ovj^=@ zO9N$S=G$1ecndT_=5ehth2Lmd1II-PuT~C9`XVePw$y8J#dpZ?Tss<6wtVglm(Ok7 z3?^oi@pPio6l&!z8JY(pJvG=*pI?GIOu}e^EB6QYk$#FJQ%^AIK$I4epJ+9t?KjqA+bkj&PQ*|vLttme+`9G=L% ziadyMw_7-M)hS(3E$QGNCu|o23|%O+VN7;Qggp?PB3K-iSeBa2b}V4_wY`G1Jsfz4 z9|SdB^;|I8E8gWqHKx!vj_@SMY^hLEIbSMCuE?WKq=c2mJK z8LoG-pnY!uhqFv&L?yEuxo{dpMTsmCn)95xanqBrNPTgXP((H$9N${Ow~Is-FBg%h z53;|Y5$MUN)9W2HBe2TD`ct^LHI<(xWrw}$qSoei?}s)&w$;&!14w6B6>Yr6Y8b)S z0r71`WmAvJJ`1h&poLftLUS6Ir zC$bG9!Im_4Zjse)#K=oJM9mHW1{%l8sz$1o?ltdKlLTxWWPB>Vk22czVt|1%^wnN@*!l)}?EgtvhC>vlHm^t+ogpgHI1_$1ox9e;>0!+b(tBrmXRB`PY1vp-R**8N7 zGP|QqI$m(Rdu#=(?!(N}G9QhQ%o!aXE=aN{&wtGP8|_qh+7a_j_sU5|J^)vxq;# zjvzLn%_QPHZZIWu1&mRAj;Sa_97p_lLq_{~j!M9N^1yp3U_SxRqK&JnR%6VI#^E12 z>CdOVI^_9aPK2eZ4h&^{pQs}xsijXgFYRIxJ~N7&BB9jUR1fm!(xl)mvy|3e6-B3j zJn#ajL;bFTYJ2+Q)tDjx=3IklO@Q+FFM}6UJr6km7hj7th9n_&JR7fnqC!hTZoM~T zBeaVFp%)0cbPhejX<8pf5HyRUj2>aXnXBqDJe73~J%P(2C?-RT{c3NjE`)om! zl$uewSgWkE66$Kb34+QZZvRn`fob~Cl9=cRk@Es}KQm=?E~CE%spXaMO6YmrMl%9Q zlA3Q$3|L1QJ4?->UjT&CBd!~ru{Ih^in&JXO=|<6J!&qp zRe*OZ*cj5bHYlz!!~iEKcuE|;U4vN1rk$xq6>bUWD*u(V@8sG^7>kVuo(QL@Ki;yL zWC!FT(q{E8#on>%1iAS0HMZDJg{Z{^!De(vSIq&;1$+b)oRMwA3nc3mdTSG#3uYO_ z>+x;7p4I;uHz?ZB>dA-BKl+t-3IB!jBRgdvAbW!aJ(Q{aT>+iz?91`C-xbe)IBoND z9_Xth{6?(y3rddwY$GD65IT#f3<(0o#`di{sh2gm{dw*#-Vnc3r=4==&PU^hCv$qd zjw;>i&?L*Wq#TxG$mFIUf>eK+170KG;~+o&1;Tom9}}mKo23KwdEM6UonXgc z!6N(@k8q@HPw{O8O!lAyi{rZv|DpgfU{py+j(X_cwpKqcalcqKIr0kM^%Br3SdeD> zHSKV94Yxw;pjzDHo!Q?8^0bb%L|wC;4U^9I#pd5O&eexX+Im{ z?jKnCcsE|H?{uGMqVie_C~w7GX)kYGWAg%-?8|N_1#W-|4F)3YTDC+QSq1s!DnOML3@d`mG%o2YbYd#jww|jD$gotpa)kntakp#K;+yo-_ZF9qrNZw<%#C zuPE@#3RocLgPyiBZ+R_-FJ_$xP!RzWm|aN)S+{$LY9vvN+IW~Kf3TsEIvP+B9Mtm! zpfNNxObWQpLoaO&cJh5>%slZnHl_Q~(-Tfh!DMz(dTWld@LG1VRF`9`DYKhyNv z2pU|UZ$#_yUx_B_|MxUq^glT}O5Xt(Vm4Mr02><%C)@v;vPb@pT$*yzJ4aPc_FZ3z z3}PLoMBIM>q_9U2rl^sGhk1VUJ89=*?7|v`{!Z{6bqFMq(mYiA?%KbsI~JwuqVA9$H5vDE+VocjX+G^%bieqx->s;XWlKcuv(s%y%D5Xbc9+ zc(_2nYS1&^yL*ey664&4`IoOeDIig}y-E~_GS?m;D!xv5-xwz+G`5l6V+}CpeJDi^ z%4ed$qowm88=iYG+(`ld5Uh&>Dgs4uPHSJ^TngXP_V6fPyl~>2bhi20QB%lSd#yYn zO05?KT1z@?^-bqO8Cg`;ft>ilejsw@2%RR7;`$Vs;FmO(Yr3Fp`pHGr@P2hC%QcA|X&N2Dn zYf`MqXdHi%cGR@%y7Rg7?d3?an){s$zA{!H;Ie5exE#c~@NhQUFG8V=SQh%UxUeiV zd7#UcYqD=lk-}sEwlpu&H^T_V0{#G?lZMxL7ih_&{(g)MWBnCZxtXg znr#}>U^6!jA%e}@Gj49LWG@*&t0V>Cxc3?oO7LSG%~)Y5}f7vqUUnQ;STjdDU}P9IF9d9<$;=QaXc zL1^X7>fa^jHBu_}9}J~#-oz3Oq^JmGR#?GO7b9a(=R@fw@}Q{{@`Wy1vIQ#Bw?>@X z-_RGG@wt|%u`XUc%W{J z>iSeiz8C3H7@St3mOr_mU+&bL#Uif;+Xw-aZdNYUpdf>Rvu0i0t6k*}vwU`XNO2he z%miH|1tQ8~ZK!zmL&wa3E;l?!!XzgV#%PMVU!0xrDsNNZUWKlbiOjzH-1Uoxm8E#r`#2Sz;-o&qcqB zC-O_R{QGuynW14@)7&@yw1U}uP(1cov)twxeLus0s|7ayrtT8c#`&2~Fiu2=R;1_4bCaD=*E@cYI>7YSnt)nQc zohw5CsK%m?8Ack)qNx`W0_v$5S}nO|(V|RZKBD+btO?JXe|~^Qqur%@eO~<8-L^9d z=GA3-V14ng9L29~XJ>a5k~xT2152zLhM*@zlp2P5Eu}bywkcqR;ISbas&#T#;HZSf z2m69qTV(V@EkY(1Dk3`}j)JMo%ZVJ*5eB zYOjIisi+igK0#yW*gBGj?@I{~mUOvRFQR^pJbEbzFxTubnrw(Muk%}jI+vXmJ;{Q6 zrSobKD>T%}jV4Ub?L1+MGOD~0Ir%-`iTnWZN^~YPrcP5y3VMAzQ+&en^VzKEb$K!Q z<7Dbg&DNXuow*eD5yMr+#08nF!;%4vGrJI++5HdCFcGLfMW!KS*Oi@=7hFwDG!h2< zPunUEAF+HncQkbfFj&pbzp|MU*~60Z(|Ik%Tn{BXMN!hZOosNIseT?R;A`W?=d?5X zK(FB=9mZusYahp|K-wyb={rOpdn=@;4YI2W0EcbMKyo~-#^?h`BA9~o285%oY zfifCh5Lk$SY@|2A@a!T2V+{^!psQkx4?x0HSV`(w9{l75QxMk!)U52Lbhn{8ol?S) zCKo*7R(z!uk<6*qO=wh!Pul{(qq6g6xW;X68GI_CXp`XwO zxuSgPRAtM8K7}5E#-GM!*ydOOG_{A{)hkCII<|2=ma*71ci_-}VPARm3crFQjLYV! z9zbz82$|l01mv`$WahE2$=fAGWkd^X2kY(J7iz}WGS z@%MyBEO=A?HB9=^?nX`@nh;7;laAjs+fbo!|K^mE!tOB>$2a_O0y-*uaIn8k^6Y zSbuv;5~##*4Y~+y7Z5O*3w4qgI5V^17u*ZeupVGH^nM&$qmAk|anf*>r zWc5CV;-JY-Z@Uq1Irpb^O`L_7AGiqd*YpGUShb==os$uN3yYvb`wm6d=?T*it&pDk zo`vhw)RZX|91^^Wa_ti2zBFyWy4cJu#g)_S6~jT}CC{DJ_kKpT`$oAL%b^!2M;JgT zM3ZNbUB?}kP(*YYvXDIH8^7LUxz5oE%kMhF!rnPqv!GiY0o}NR$OD=ITDo9r%4E>E0Y^R(rS^~XjWyVI6 zMOR5rPXhTp*G*M&X#NTL`Hu*R+u*QNoiOKg4CtNPrjgH>c?Hi4MUG#I917fx**+pJfOo!zFM&*da&G_x)L(`k&TPI*t3e^{crd zX<4I$5nBQ8Ax_lmNRa~E*zS-R0sxkz`|>7q_?*e%7bxqNm3_eRG#1ae3gtV9!fQpY z+!^a38o4ZGy9!J5sylDxZTx$JmG!wg7;>&5H1)>f4dXj;B+@6tMlL=)cLl={jLMxY zbbf1ax3S4>bwB9-$;SN2?+GULu;UA-35;VY*^9Blx)Jwyb$=U!D>HhB&=jSsd^6yw zL)?a|>GxU!W}ocTC(?-%z3!IUhw^uzc`Vz_g>-tv)(XA#JK^)ZnC|l1`@CdX1@|!| z_9gQ)7uOf?cR@KDp97*>6X|;t@Y`k_N@)aH7gY27)COv^P3ya9I{4z~vUjLR9~z1Z z5=G{mVtKH*&$*t0@}-i_v|3B$AHHYale7>E+jP`ClqG%L{u;*ff_h@)al?RuL7tOO z->;I}>%WI{;vbLP3VIQ^iA$4wl6@0sDj|~112Y4OFjMs`13!$JGkp%b&E8QzJw_L5 zOnw9joc0^;O%OpF$Qp)W1HI!$4BaXX84`%@#^dk^hFp^pQ@rx4g(8Xjy#!X%+X5Jd@fs3amGT`}mhq#L97R>OwT5-m|h#yT_-v@(k$q7P*9X~T*3)LTdzP!*B} z+SldbVWrrwQo9wX*%FyK+sRXTa@O?WM^FGWOE?S`R(0P{<6p#f?0NJvnBia?k^fX2 zNQs7K-?EijgHJY}&zsr;qJ<*PCZUd*x|dD=IQPUK_nn)@X4KWtqoJNHkT?ZWL_hF? zS8lp2(q>;RXR|F;1O}EE#}gCrY~#n^O`_I&?&z5~7N;zL0)3Tup`%)oHMK-^r$NT% zbFg|o?b9w(q@)6w5V%si<$!U<#}s#x@0aX-hP>zwS#9*75VXA4K*%gUc>+yzupTDBOKH8WR4V0pM(HrfbQ&eJ79>HdCvE=F z|J>s;;iDLB^3(9}?biKbxf1$lI!*Z%*0&8UUq}wMyPs_hclyQQi4;NUY+x2qy|0J; zhn8;5)4ED1oHwg+VZF|80<4MrL97tGGXc5Sw$wAI#|2*cvQ=jB5+{AjMiDHmhUC*a zlmiZ`LAuAn_}hftXh;`Kq0zblDk8?O-`tnilIh|;3lZp@F_osJUV9`*R29M?7H{Fy z`nfVEIDIWXmU&YW;NjU8)EJpXhxe5t+scf|VXM!^bBlwNh)~7|3?fWwo_~ZFk(22% zTMesYw+LNx3J-_|DM~`v93yXe=jPD{q;li;5PD?Dyk+b? zo21|XpT@)$BM$%F=P9J19Vi&1#{jM3!^Y&fr&_`toi`XB1!n>sbL%U9I5<7!@?t)~ z;&H%z>bAaQ4f$wIzkjH70;<8tpUoxzKrPhn#IQfS%9l5=Iu))^XC<58D!-O z{B+o5R^Z21H0T9JQ5gNJnqh#qH^na|z92=hONIM~@_iuOi|F>jBh-?aA20}Qx~EpDGElELNn~|7WRXRFnw+Wdo`|# zBpU=Cz3z%cUJ0mx_1($X<40XEIYz(`noWeO+x#yb_pwj6)R(__%@_Cf>txOQ74wSJ z0#F3(zWWaR-jMEY$7C*3HJrohc79>MCUu26mfYN)f4M~4gD`}EX4e}A!U}QV8!S47 z6y-U-%+h`1n`*pQuKE%Av0@)+wBZr9mH}@vH@i{v(m-6QK7Ncf17x_D=)32`FOjjo zg|^VPf5c6-!FxN{25dvVh#fog=NNpXz zfB$o+0jbRkHH{!TKhE709f+jI^$3#v1Nmf80w`@7-5$1Iv_`)W^px8P-({xwb;D0y z7LKDAHgX<84?l!I*Dvi2#D@oAE^J|g$3!)x1Ua;_;<@#l1fD}lqU2_tS^6Ht$1Wl} zBESo7o^)9-Tjuz$8YQSGhfs{BQV6zW7dA?0b(Dbt=UnQs&4zHfe_sj{RJ4uS-vQpC zX;Bbsuju4%!o8?&m4UZU@~ZZjeFF6ex2ss5_60_JS_|iNc+R0GIjH1@Z z=rLT9%B|WWgOrR7IiIwr2=T;Ne?30M!@{%Qf8o`!>=s<2CBpCK_TWc(DX51>e^xh8 z&@$^b6CgOd7KXQV&Y4%}_#uN*mbanXq(2=Nj`L7H7*k(6F8s6{FOw@(DzU`4-*77{ zF+dxpv}%mFpYK?>N_2*#Y?oB*qEKB}VoQ@bzm>ptmVS_EC(#}Lxxx730trt0G)#$b zE=wVvtqOct1%*9}U{q<)2?{+0TzZzP0jgf9*)arV)*e!f`|jgT{7_9iS@e)recI#z zbzolURQ+TOzE!ymqvBY7+5NnAbWxvMLsLTwEbFqW=CPyCsmJ}P1^V30|D5E|p3BC5 z)3|qgw@ra7aXb-wsa|l^in~1_fm{7bS9jhVRkYVO#U{qMp z)Wce+|DJ}4<2gp8r0_xfZpMo#{Hl2MfjLcZdRB9(B(A(f;+4s*FxV{1F|4d`*sRNd zp4#@sEY|?^FIJ;tmH{@keZ$P(sLh5IdOk@k^0uB^BWr@pk6mHy$qf&~rI>P*a;h0C{%oA*i!VjWn&D~O#MxN&f@1Po# zKN+ zrGrkSjcr?^R#nGl<#Q722^wbYcgW@{+6CBS<1@%dPA8HC!~a`jTz<`g_l5N1M@9wn9GOAZ>nqNgq!yOCbZ@1z`U_N`Z>}+1HIZxk*5RDc&rd5{3qjRh8QmT$VyS;jK z;AF+r6XnnCp=wQYoG|rT2@8&IvKq*IB_WvS%nt%e{MCFm`&W*#LXc|HrD?nVBo=(8*=Aq?u$sDA_sC_RPDUiQ+wnIJET8vx$&fxkW~kP9qXKt zozR)@xGC!P)CTkjeWvXW5&@2?)qt)jiYWWBU?AUtzAN}{JE1I)dfz~7$;}~BmQF`k zpn11qmObXwRB8&rnEG*#4Xax3XBkKlw(;tb?Np^i+H8m(Wyz9k{~ogba@laiEk;2! zV*QV^6g6(QG%vX5Um#^sT&_e`B1pBW5yVth~xUs#0}nv?~C#l?W+9Lsb_5)!71rirGvY zTIJ$OPOY516Y|_014sNv+Z8cc5t_V=i>lWV=vNu#!58y9Zl&GsMEW#pPYPYGHQ|;vFvd*9eM==$_=vc7xnyz0~ zY}r??$<`wAO?JQk@?RGvkWVJlq2dk9vB(yV^vm{=NVI8dhsX<)O(#nr9YD?I?(VmQ z^r7VfUBn<~p3()8yOBjm$#KWx!5hRW)5Jl7wY@ky9lNM^jaT##8QGVsYeaVywmpv>X|Xj7gWE1Ezai&wVLt3p)k4w~yrskT-!PR!kiyQlaxl(( zXhF%Q9x}1TMt3~u@|#wWm-Vq?ZerK={8@~&@9r5JW}r#45#rWii};t`{5#&3$W)|@ zbAf2yDNe0q}NEUvq_Quq3cTjcw z@H_;$hu&xllCI9CFDLuScEMg|x{S7GdV8<&Mq=ezDnRZAyX-8gv97YTm0bg=d)(>N z+B2FcqvI9>jGtnK%eO%y zoBPkJTk%y`8TLf4)IXPBn`U|9>O~WL2C~C$z~9|0m*YH<-vg2CD^SX#&)B4ngOSG$ zV^wmy_iQk>dfN@Pv(ckfy&#ak@MLC7&Q6Ro#!ezM*VEh`+b3Jt%m(^T&p&WJ2Oqvj zs-4nq0TW6cv~(YI$n0UkfwN}kg3_fp?(ijSV#tR9L0}l2qjc7W?i*q01=St0eZ=4h zyGQbEw`9OEH>NMuIe)hVwYHsGERWOD;JxEiO7cQv%pFCeR+IyhwQ|y@&^24k+|8fD zLiOWFNJ2&vu2&`Jv96_z-Cd5RLgmeY3*4rDOQo?Jm`;I_(+ejsPM03!ly!*Cu}Cco zrQSrEDHNyzT(D5s1rZq!8#?f6@v6dB7a-aWs(Qk>N?UGAo{gytlh$%_IhyL7h?DLXDGx zgxGEBQoCAWo-$LRvM=F5MTle`M})t3vVv;2j0HZY&G z22^iGhV@uaJh(XyyY%} zd4iH_UfdV#T=3n}(Lj^|n;O4|$;xhu*8T3hR1mc_A}fK}jfZ7LX~*n5+`8N2q#rI$ z@<_2VANlYF$vIH$ zl<)+*tIWW78IIINA7Rr7i{<;#^yzxoLNkXL)eSs=%|P>$YQIh+ea_3k z_s7r4%j7%&*NHSl?R4k%1>Z=M9o#zxY!n8sL5>BO-ZP;T3Gut>iLS@U%IBrX6BA3k z)&@q}V8a{X<5B}K5s(c(LQ=%v1ocr`t$EqqY0EqVjr65usa=0bkf|O#ky{j3)WBR(((L^wmyHRzoWuL2~WTC=`yZ zn%VX`L=|Ok0v7?s>IHg?yArBcync5rG#^+u)>a%qjES%dRZoIyA8gQ;StH z1Ao7{<&}6U=5}4v<)1T7t!J_CL%U}CKNs-0xWoTTeqj{5{?Be$L0_tk>M9o8 zo371}S#30rKZFM{`H_(L`EM9DGp+Mifk&IP|C2Zu_)Ghr4Qtpmkm1osCf@%Z$%t+7 zYH$Cr)Ro@3-QDeQJ8m+x6%;?YYT;k6Z0E-?kr>x33`H%*ueBD7Zx~3&HtWn0?2Wt} zTG}*|v?{$ajzt}xPzV%lL1t-URi8*Zn)YljXNGDb>;!905Td|mpa@mHjIH%VIiGx- zd@MqhpYFu4_?y5N4xiHn3vX&|e6r~Xt> zZG`aGq|yTNjv;9E+Txuoa@A(9V7g?1_T5FzRI;!=NP1Kqou1z5?%X~Wwb{trRfd>i z8&y^H)8YnKyA_Fyx>}RNmQIczT?w2J4SNvI{5J&}Wto|8FR(W;Qw#b1G<1%#tmYzQ zQ2mZA-PAdi%RQOhkHy9Ea#TPSw?WxwL@H@cbkZwIq0B!@ns}niALidmn&W?!Vd4Gj zO7FiuV4*6Mr^2xlFSvM;Cp_#r8UaqIzHJQg_z^rEJw&OMm_8NGAY2)rKvki|o1bH~ z$2IbfVeY2L(^*rMRU1lM5Y_sgrDS`Z??nR2lX;zyR=c%UyGb*%TC-Dil?SihkjrQy~TMv6;BMs7P8il`H7DmpVm@rJ;b)hW)BL)GjS154b*xq-NXq2cwE z^;VP7ua2pxvCmxrnqUYQMH%a%nHmwmI33nJM(>4LznvY*k&C0{8f*%?zggpDgkuz&JBx{9mfb@wegEl2v!=}Sq2Gaty0<)UrOT0{MZtZ~j5y&w zXlYa_jY)I_+VA-^#mEox#+G>UgvM!Ac8zI<%JRXM_73Q!#i3O|)lOP*qBeJG#BST0 zqohi)O!|$|2SeJQo(w6w7%*92S})XfnhrH_Z8qe!G5>CglP=nI7JAOW?(Z29;pXJ9 zR9`KzQ=WEhy*)WH>$;7Cdz|>*i>=##0bB)oU0OR>>N<21e4rMCHDemNi2LD>Nc$;& zQRFthpWniC1J6@Zh~iJCoLOxN`oCKD5Q4r%ynwgUKPlIEd#?QViIqovY|czyK8>6B zSP%{2-<;%;1`#0mG^B(8KbtXF;Nf>K#Di72UWE4gQ%(_26Koiad)q$xRL~?pN71ZZ zujaaCx~jXjygw;rI!WB=xrOJO6HJ!!w}7eiivtCg5K|F6$EXa)=xUC za^JXSX98W`7g-tm@uo|BKj39Dl;sg5ta;4qjo^pCh~{-HdLl6qI9Ix6f$+qiZ$}s= zNguKrU;u+T@ko(Vr1>)Q%h$?UKXCY>3se%&;h2osl2D zE4A9bd7_|^njDd)6cI*FupHpE3){4NQ*$k*cOWZ_?CZ>Z4_fl@n(mMnYK62Q1d@+I zr&O))G4hMihgBqRIAJkLdk(p(D~X{-oBUA+If@B}j& zsHbeJ3RzTq96lB7d($h$xTeZ^gP0c{t!Y0c)aQE;$FY2!mACg!GDEMKXFOPI^)nHZ z`aSPJpvV0|bbrzhWWkuPURlDeN%VT8tndV8?d)eN*i4I@u zVKl^6{?}A?P)Fsy?3oi#clf}L18t;TjNI2>eI&(ezDK7RyqFxcv%>?oxUlonv(px) z$vnPzRH`y5A(x!yOIfL0bmgeMQB$H5wenx~!ujQK*nUBW;@Em&6Xv2%s(~H5WcU2R z;%Nw<$tI)a`Ve!>x+qegJnQsN2N7HaKzrFqM>`6R*gvh%O*-%THt zrB$Nk;lE;z{s{r^PPm5qz(&lM{sO*g+W{sK+m3M_z=4=&CC>T`{X}1Vg2PEfSj2x_ zmT*(x;ov%3F?qoEeeM>dUn$a*?SIGyO8m806J1W1o+4HRhc2`9$s6hM#qAm zChQ87b~GEw{ADfs+5}FJ8+|bIlIv(jT$Ap#hSHoXdd9#w<#cA<1Rkq^*EEkknUd4& zoIWIY)sAswy6fSERVm&!SO~#iN$OgOX*{9@_BWFyJTvC%S++ilSfCrO(?u=Dc?CXZ zzCG&0yVR{Z`|ZF0eEApWEo#s9osV>F{uK{QA@BES#&;#KsScf>y zvs?vIbI>VrT<*!;XmQS=bhq%46-aambZ(8KU-wOO2=en~D}MCToB_u;Yz{)1ySrPZ z@=$}EvjTdzTWU7c0ZI6L8=yP+YRD_eMMos}b5vY^S*~VZysrkq<`cK3>>v%uy7jgq z0ilW9KjVDHLv0b<1K_`1IkbTOINs0=m-22c%M~l=^S}%hbli-3?BnNq?b`hx^HX2J zIe6ECljRL0uBWb`%{EA=%!i^4sMcj+U_TaTZRb+~GOk z^ZW!nky0n*Wb*r+Q|9H@ml@Z5gU&W`(z4-j!OzC1wOke`TRAYGZVl$PmQ16{3196( zO*?`--I}Qf(2HIwb2&1FB^!faPA2=sLg(@6P4mN)>Dc3i(B0;@O-y2;lM4akD>@^v z=u>*|!s&9zem70g7zfw9FXl1bpJW(C#5w#uy5!V?Q(U35A~$dR%LDVnq@}kQm13{} zd53q3N(s$Eu{R}k2esbftfjfOITCL;jWa$}(mmm}d(&7JZ6d3%IABCapFFYjdEjdK z&4Edqf$G^MNAtL=uCDRs&Fu@FXRgX{*0<(@c3|PNHa>L%zvxWS={L8%qw`STm+=Rd zA}FLspESSIpE_^41~#5yI2bJ=9`oc;GIL!JuW&7YetZ?0H}$$%8rW@*J37L-~Rsx!)8($nI4 zZhcZ2^=Y+p4YPl%j!nFJA|*M^gc(0o$i3nlphe+~-_m}jVkRN{spFs(o0ajW@f3K{ zDV!#BwL322CET$}Y}^0ixYj2w>&Xh12|R8&yEw|wLDvF!lZ#dOTHM9pK6@Nm-@9Lnng4ZHBgBSrr7KI8YCC9DX5Kg|`HsiwJHg2(7#nS;A{b3tVO?Z% za{m5b3rFV6EpX;=;n#wltDv1LE*|g5pQ+OY&*6qCJZc5oDS6Z6JD#6F)bWxZSF@q% z+1WV;m!lRB!n^PC>RgQCI#D1br_o^#iPk>;K2hB~0^<~)?p}LG%kigm@moD#q3PE+ zA^Qca)(xnqw6x>XFhV6ku9r$E>bWNrVH9fum0?4s?Rn2LG{Vm_+QJHse6xa%nzQ?k zKug4PW~#Gtb;#5+9!QBgyB@q=sk9=$S{4T>wjFICStOM?__fr+Kei1 z3j~xPqW;W@YkiUM;HngG!;>@AITg}vAE`M2Pj9Irl4w1fo4w<|Bu!%rh%a(Ai^Zhi zs92>v5;@Y(Zi#RI*ua*h`d_7;byQSa*v9E{2x$<-_=5Z<7{%)}4XExANcz@rK69T0x3%H<@frW>RA8^swA+^a(FxK| zFl3LD*ImHN=XDUkrRhp6RY5$rQ{bRgSO*(vEHYV)3Mo6Jy3puiLmU&g82p{qr0F?ohmbz)f2r{X2|T2 z$4fdQ=>0BeKbiVM!e-lIIs8wVTuC_m7}y4A_%ikI;Wm5$9j(^Y z(cD%U%k)X>_>9~t8;pGzL6L-fmQO@K; zo&vQzMlgY95;1BSkngY)e{`n0!NfVgf}2mB3t}D9@*N;FQ{HZ3Pb%BK6;5#-O|WI( zb6h@qTLU~AbVW#_6?c!?Dj65Now7*pU{h!1+eCV^KCuPAGs28~3k@ueL5+u|Z-7}t z9|lskE`4B7W8wMs@xJa{#bsCGDFoRSNSnmNYB&U7 zVGKWe%+kFB6kb)e;TyHfqtU6~fRg)f|>=5(N36)0+C z`hv65J<$B}WUc!wFAb^QtY31yNleq4dzmG`1wHTj=c*=hay9iD071Hc?oYoUk|M*_ zU1GihAMBsM@5rUJ(qS?9ZYJ6@{bNqJ`2Mr+5#hKf?doa?F|+^IR!8lq9)wS3tF_9n zW_?hm)G(M+MYb?V9YoX^_mu5h-LP^TL^!Q9Z7|@sO(rg_4+@=PdI)WL(B7`!K^ND- z-uIuVDCVEdH_C@c71YGYT^_Scf_dhB8Z2Xy6vGtBSlYud9vggOqv^L~F{BraSE_t} zIkP+Hp2&nH^-MNEs}^`oMLy11`PQW$T|K(`Bu*(f@)mv1-qY(_YG&J2M2<7k;;RK~ zL{Fqj9yCz8(S{}@c)S!65aF<=&eLI{hAMErCx&>i7OeDN>okvegO87OaG{Jmi<|}D zaT@b|0X{d@OIJ7zvT>r+eTzgLq~|Dpu)Z&db-P4z*`M$UL51lf>FLlq6rfG)%doyp z)3kk_YIM!03eQ8Vu_2fg{+osaEJPtJ-s36R+5_AEG12`NG)IQ#TF9c@$99%0iye+ zUzZ57=m2)$D(5Nx!n)=5Au&O0BBgwxIBaeI(mro$#&UGCr<;C{UjJVAbVi%|+WP(a zL$U@TYCxJ=1{Z~}rnW;7UVb7+ZnzgmrogDxhjLGo>c~MiJAWs&&;AGg@%U?Y^0JhL ze(x6Z74JG6FlOFK(T}SXQfhr}RIFl@QXKnIcXYF)5|V~e-}suHILKT-k|<*~Ij|VF zC;t@=uj=hot~*!C68G8hTA%8SzOfETOXQ|3FSaIEjvBJp(A)7SWUi5!Eu#yWgY+;n zlm<$+UDou*V+246_o#V4kMdto8hF%%Lki#zPh}KYXmMf?hrN0;>Mv%`@{0Qn`Ujp) z=lZe+13>^Q!9zT);H<(#bIeRWz%#*}sgUX9P|9($kexOyKIOc`dLux}c$7It4u|Rl z6SSkY*V~g_B-hMPo_ak>>z@AVQ(_N)VY2kB3IZ0G(iDUYw+2d7W^~(Jq}KY=JnWS( z#rzEa&0uNhJ>QE8iiyz;n2H|SV#Og+wEZv=f2%1ELX!SX-(d3tEj$5$1}70Mp<&eI zCkfbByL7af=qQE@5vDVxx1}FSGt_a1DoE3SDI+G)mBAna)KBG4p8Epxl9QZ4BfdAN zFnF|Y(umr;gRgG6NLQ$?ZWgllEeeq~z^ZS7L?<(~O&$5|y)Al^iMKy}&W+eMm1W z7EMU)u^ke(A1#XCV>CZ71}P}0x)4wtHO8#JRG3MA-6g=`ZM!FcICCZ{IEw8Dm2&LQ z1|r)BUG^0GzI6f946RrBlfB1Vs)~8toZf~7)+G;pv&XiUO(%5bm)pl=p>nV^o*;&T z;}@oZSibzto$arQgfkp|z4Z($P>dTXE{4O=vY0!)kDO* zGF8a4wq#VaFpLfK!iELy@?-SeRrdz%F*}hjKcA*y@mj~VD3!it9lhRhX}5YOaR9$} z3mS%$2Be7{l(+MVx3 z(4?h;P!jnRmX9J9sYN#7i=iyj_5q7n#X(!cdqI2lnr8T$IfOW<_v`eB!d9xY1P=2q&WtOXY=D9QYteP)De?S4}FK6#6Ma z=E*V+#s8>L;8aVroK^6iKo=MH{4yEZ_>N-N z`(|;aOATba1^asjxlILk<4}f~`39dBFlxj>Dw(hMYKPO3EEt1@S`1lxFNM+J@uB7T zZ8WKjz7HF1-5&2=l=fqF-*@>n5J}jIxdDwpT?oKM3s8Nr`x8JnN-kCE?~aM1H!hAE z%%w(3kHfGwMnMmNj(SU(w42OrC-euI>Dsjk&jz3ts}WHqmMpzQ3vZrsXrZ|}+MHA7 z068obeXZTsO*6RS@o3x80E4ok``rV^Y3hr&C1;|ZZ0|*EKO`$lECUYG2gVFtUTw)R z4Um<0ZzlON`zTdvVdL#KFoMFQX*a5wM0Czp%wTtfK4Sjs)P**RW&?lP$(<}q%r68Z zS53Y!d@&~ne9O)A^tNrXHhXBkj~$8j%pT1%%mypa9AW5E&s9)rjF4@O3ytH{0z6riz|@< zB~UPh*wRFg2^7EbQrHf0y?E~dHlkOxof_a?M{LqQ^C!i2dawHTPYUE=X@2(3<=OOxs8qn_(y>pU>u^}3y&df{JarR0@VJn0f+U%UiF=$Wyq zQvnVHESil@d|8&R<%}uidGh7@u^(%?$#|&J$pvFC-n8&A>utA=n3#)yMkz+qnG3wd zP7xCnF|$9Dif@N~L)Vde3hW8W!UY0BgT2v(wzp;tlLmyk2%N|0jfG$%<;A&IVrOI< z!L)o>j>;dFaqA3pL}b-Je(bB@VJ4%!JeX@3x!i{yIeIso^=n?fDX`3bU=eG7sTc%g%ye8$v8P@yKE^XD=NYxTb zbf!Mk=h|otpqjFaA-vs5YOF-*GwWPc7VbaOW&stlANnCN8iftFMMrUdYNJ_Bnn5Vt zxfz@Ah|+4&P;reZxp;MmEI7C|FOv8NKUm8njF7Wb6Gi7DeODLl&G~}G4be&*Hi0Qw z5}77vL0P+7-B%UL@3n1&JPxW^d@vVwp?u#gVcJqY9#@-3X{ok#UfW3<1fb%FT`|)V~ggq z(3AUoUS-;7)^hCjdT0Kf{i}h)mBg4qhtHHBti=~h^n^OTH5U*XMgDLIR@sre`AaB$ zg)IGBET_4??m@cx&c~bA80O7B8CHR7(LX7%HThkeC*@vi{-pL%e)yXp!B2InafbDF zjPXf1mko3h59{lT6EEbxKO1Z5GF71)WwowO6kY|6tjSVSWdQ}NsK2x{>i|MKZK8%Q zfu&_0D;CO-Jg0#YmyfctyJ!mRJp)e#@O0mYdp|8x;G1%OZQ3Q847YWTyy|%^cpA;m zze0(5p{tMu^lDkpe?HynyO?a1$_LJl2L&mpeKu%8YvgRNr=%2z${%WThHG=vrWY@4 zsA`OP#O&)TetZ>s%h!=+CE15lOOls&nvC~$Qz0Ph7tHiP;O$i|eDwpT{cp>+)0-|; zY$|bB+Gbel>5aRN3>c0x)4U=|X+z+{ zn*_p*EQoquRL+=+p;=lm`d71&1NqBz&_ph)MXu(Nv6&XE7(RsS)^MGj5Q?Fwude-(sq zjJ>aOq!7!EN>@(fK7EE#;i_BGvli`5U;r!YA{JRodLBc6-`n8K+Fjgwb%sX;j=qHQ z7&Tr!)!{HXoO<2BQrV9Sw?JRaLXV8HrsNevvnf>Y-6|{T!pYLl7jp$-nEE z#X!4G4L#K0qG_4Z;Cj6=;b|Be$hi4JvMH!-voxqx^@8cXp`B??eFBz2lLD8RRaRGh zn7kUfy!YV~p(R|p7iC1Rdgt$_24i0cd-S8HpG|`@my70g^y`gu%#Tf_L21-k?sRRZHK&at(*ED0P8iw{7?R$9~OF$Ko;Iu5)ur5<->x!m93Eb zFYpIx60s=Wxxw=`$aS-O&dCO_9?b1yKiPCQmSQb>T)963`*U+Ydj5kI(B(B?HNP8r z*bfSBpSu)w(Z3j7HQoRjUG(+d=IaE~tv}y14zHHs|0UcN52fT8V_<@2ep_ee{QgZG zmgp8iv4V{k;~8@I%M3<#B;2R>Ef(Gg_cQM7%}0s*^)SK6!Ym+~P^58*wnwV1BW@eG z4sZLqsUvBbFsr#8u7S1r4teQ;t)Y@jnn_m5jS$CsW1um!p&PqAcc8!zyiXHVta9QC zY~wCwCF0U%xiQPD_INKtTb;A|Zf29(mu9NI;E zc-e>*1%(LSXB`g}kd`#}O;veb<(sk~RWL|f3ljxCnEZDdNSTDV6#Td({6l&y4IjKF z^}lIUq*ZUqgTPumD)RrCN{M^jhY>E~1pn|KOZ5((%F)G|*ZQ|r4zIbrEiV%42hJV8 z3xS)=!X1+=olbdGJ=yZil?oXLct8FM{(6ikLL3E%=q#O6(H$p~gQu6T8N!plf!96| z&Q3=`L~>U0zZh;z(pGR2^S^{#PrPxTRHD1RQOON&f)Siaf`GLj#UOk&(|@0?zm;Sx ztsGt8=29-MZs5CSf1l1jNFtNt5rFNZxJPvkNu~2}7*9468TWm>nN9TP&^!;J{-h)_ z7WsHH9|F%I`Pb!>KAS3jQWKfGivTVkMJLO-HUGM_a4UQ_%RgL6WZvrW+Z4ujZn;y@ zz9$=oO!7qVTaQAA^BhX&ZxS*|5dj803M=k&2%QrXda`-Q#IoZL6E(g+tN!6CA!CP* zCpWtCujIea)ENl0liwVfj)Nc<9mV%+e@=d`haoZ*`B7+PNjEbXBkv=B+Pi^~L#EO$D$ZqTiD8f<5$eyb54-(=3 zh)6i8i|jp(@OnRrY5B8t|LFXFQVQ895n*P16cEKTrT*~yLH6Z4e*bZ5otpRDri&+A zfNbK1D5@O=sm`fN=WzWyse!za5n%^+6dHPGX#8DyIK>?9qyX}2XvBWVqbP%%D)7$= z=#$WulZlZR<{m#gU7lwqK4WS1Ne$#_P{b17qe$~UOXCl>5b|6WVh;5vVnR<%d+Lnp z$uEmML38}U4vaW8>shm6CzB(Wei3s#NAWE3)a2)z@i{4jTn;;aQS)O@l{rUM`J@K& l00vQ5JBs~;vo!vr%%-k{2_Fq1Mn4QF81S)AQ99zk{{c4yR+0b! literal 0 HcmV?d00001 diff --git a/infra/infra-s3/gradle/wrapper/gradle-wrapper.properties b/infra/infra-s3/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/infra/infra-s3/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/infra/infra-s3/src/main/kotlin/com/kw/infras3/service/S3Service.kt b/infra/infra-s3/src/main/kotlin/com/kw/infras3/service/S3Service.kt new file mode 100644 index 0000000..c84d298 --- /dev/null +++ b/infra/infra-s3/src/main/kotlin/com/kw/infras3/service/S3Service.kt @@ -0,0 +1,35 @@ +package com.kw.infras3.service + +import io.awspring.cloud.s3.ObjectMetadata +import io.awspring.cloud.s3.S3Resource +import io.awspring.cloud.s3.S3Template +import org.springframework.beans.factory.annotation.Value +import org.springframework.stereotype.Service +import org.springframework.util.StringUtils +import org.springframework.web.multipart.MultipartFile +import java.io.IOException +import java.util.* + + +@Service +class S3Service ( + @Value("\${aws.s3.bucket}") private val bucket: String, + private val s3Template: S3Template) { + + @Throws(IOException::class) + fun uploadImage(image: MultipartFile): String { + val originalFilename: String? = image.getOriginalFilename() // 클라이언트가 전송한 파일 이름 + val extension: String? = StringUtils.getFilenameExtension(originalFilename) // 파일 확장자 + val uuidImageName = UUID.randomUUID().toString() + "." + extension // 파일 이름 중복 방지 + + // S3에 파일 업로드 + val s3Resource: S3Resource = s3Template.upload( + bucket, + uuidImageName, + image.getInputStream(), + ObjectMetadata.builder().contentType(extension).build() + ) + + return s3Resource.getURL().toString() + } +} diff --git a/infra/infra-security/build.gradle.kts b/infra/infra-security/build.gradle.kts new file mode 100644 index 0000000..b30ea7f --- /dev/null +++ b/infra/infra-security/build.gradle.kts @@ -0,0 +1,31 @@ +import org.springframework.boot.gradle.tasks.bundling.BootJar + +val jar: Jar by tasks +val bootJar: BootJar by tasks + +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +bootJar.enabled = false +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar.enabled = true + +dependencies { + implementation(project(":data")) + implementation(project(":infra:infra-redis")) + + implementation("org.springframework.boot:spring-boot-starter-web") + + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + + // security + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") + implementation("io.jsonwebtoken:jjwt-api:0.12.3") + implementation("io.jsonwebtoken:jjwt-impl:0.12.3") + implementation("io.jsonwebtoken:jjwt-jackson:0.12.3") + + // redis + implementation("org.springframework.boot:spring-boot-starter-data-redis") + + // swagger + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0") +} diff --git a/infra/infra-security/gradle/wrapper/gradle-wrapper.jar b/infra/infra-security/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/infra/infra-security/gradle/wrapper/gradle-wrapper.properties b/infra/infra-security/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/infra/infra-security/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/SecurityModuleConfig.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/SecurityModuleConfig.kt new file mode 100644 index 0000000..0d07174 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/SecurityModuleConfig.kt @@ -0,0 +1,13 @@ +package com.kw.infrasecurity.config + +import org.springframework.context.annotation.ComponentScan +import org.springframework.context.annotation.Configuration +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories + + +@Configuration +@EnableRedisRepositories(basePackages = ["com.kw"]) +@ComponentScan(basePackages = ["com.kw"]) +class SecurityModuleConfig + + diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/WebSecurityConfig.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/WebSecurityConfig.kt new file mode 100644 index 0000000..d89fe0b --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/config/WebSecurityConfig.kt @@ -0,0 +1,135 @@ +package com.kw.infrasecurity.config + +import com.kw.infrasecurity.jwt.JwtAccessDeniedHandler +import com.kw.infrasecurity.jwt.JwtAuthenticationEntryPoint +import com.kw.infrasecurity.jwt.JwtAuthenticationFilter +import com.kw.infrasecurity.oauth.OAuth2SuccessHandler +import com.kw.infrasecurity.oauth.OAuth2UserService +import org.springframework.beans.factory.annotation.Value +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.http.HttpMethod.* +import org.springframework.security.config.annotation.web.AuthorizeHttpRequestsDsl +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.annotation.web.invoke +import org.springframework.security.config.http.SessionCreationPolicy +import org.springframework.security.web.SecurityFilterChain +import org.springframework.security.web.authentication.logout.LogoutFilter +import org.springframework.web.cors.CorsConfiguration +import org.springframework.web.cors.CorsConfigurationSource +import org.springframework.web.cors.CorsUtils +import org.springframework.web.cors.UrlBasedCorsConfigurationSource + +@Configuration +@EnableWebSecurity +class WebSecurityConfig( + val jwtAuthenticationFilter: JwtAuthenticationFilter, + val jwtAccessDeniedHandler: JwtAccessDeniedHandler, + val jwtAuthenticationEntryPoint: JwtAuthenticationEntryPoint, + val oAuth2SuccessHandler: OAuth2SuccessHandler, + val oAuth2UserService: OAuth2UserService, + @Value("\${allowed-origins}") private val allowedOrigins: String, +) { + + @Bean + fun filterChain(http: HttpSecurity): SecurityFilterChain { + http.invoke { + headers { frameOptions { disable() } } + csrf { disable() } + anonymous { disable() } + formLogin { disable() } + httpBasic { disable() } + logout { disable() } + sessionManagement { SessionCreationPolicy.STATELESS } + + cors { + configurationSource = corsConfigurationSource() + } + + addFilterAfter(jwtAuthenticationFilter) + exceptionHandling { + authenticationEntryPoint = jwtAuthenticationEntryPoint + accessDeniedHandler = jwtAccessDeniedHandler + } + + oauth2Login { + authenticationSuccessHandler = oAuth2SuccessHandler + userInfoEndpoint { + userService = oAuth2UserService + } + } + + authorizeHttpRequests { + authorize(CorsUtils::isPreFlightRequest, permitAll) + +// bundleRequests() +// claimRequests() +// tagRequests() +// questionRequests() +// memberRequests() + + authorize(anyRequest, permitAll) + } + } + + return http.build() + } + + private fun AuthorizeHttpRequestsDsl.memberRequests() { + authorize(GET, "/api/v1/members/me", hasRole("USER")) + authorize(PATCH, "/api/v1/members/me/nickname", hasRole("USER")) + authorize(PATCH, "/api/v1/members/me/sns", hasRole("USER")) + authorize(PATCH, "/api/v1/members/me/tags", hasRole("USER")) + authorize(PATCH, "/api/v1/members/me", hasRole("USER")) + authorize(PATCH, "/api/v1/members/me/profile-image", hasRole("USER")) + + authorize(GET, "/api/v1/members/{id}", permitAll) + } + + private fun AuthorizeHttpRequestsDsl.questionRequests() { + authorize(POST, "/api/*/questions", hasRole("USER")) + authorize(PATCH, "/api/*/questions/{id}", hasRole("USER")) + authorize(DELETE, "/api/*/questions/{id}", hasRole("USER")) + authorize(POST, "/api/*/questions/{id}/report", hasRole("USER")) + + authorize(GET, "/api/*/questions/search", permitAll) + } + + private fun AuthorizeHttpRequestsDsl.tagRequests() { + authorize(GET, "/api/*/tags", permitAll) + } + + private fun AuthorizeHttpRequestsDsl.claimRequests() { + authorize(POST, "/api/*/claims", hasRole("USER")) + } + + private fun AuthorizeHttpRequestsDsl.bundleRequests() { + authorize(POST, "/api/*/bundles", hasRole("USER")) + authorize(POST, "/api/*/bundles", hasRole("USER")) + authorize(PATCH, "/api/*/bundles/bundle-order", hasRole("USER")) + authorize(GET, "/api/*/bundles/my", hasRole("USER")) + authorize(GET, "/api/*/bundles/{id}", hasRole("USER")) + authorize(PATCH, "/api/*/bundles/{id}", hasRole("USER")) + authorize(DELETE, "/api/*/bundles/{id}", hasRole("USER")) + authorize(POST, "/api/*/bundles/{id}/scrape", hasRole("USER")) + authorize(PATCH, "/api/*/bundles/{id}/question-order", hasRole("USER")) + authorize(POST, "/api/*/bundles/questions", hasRole("USER")) + authorize(DELETE, "/api/*/bundles/{id}/questions", hasRole("USER")) + + authorize(GET, "/api/*/bundles/search", permitAll) + } + + @Bean + fun corsConfigurationSource(): CorsConfigurationSource { + val configuration = CorsConfiguration() + + configuration.allowedOriginPatterns = allowedOrigins.split(",").map { it.trim() } + configuration.allowCredentials = true + configuration.allowedHeaders = listOf("*") + configuration.allowedMethods = listOf("HEAD", "GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") + val source = UrlBasedCorsConfigurationSource() + source.registerCorsConfiguration("/**", configuration) + return source + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAccessDeniedHandler.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAccessDeniedHandler.kt new file mode 100644 index 0000000..aa14c78 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAccessDeniedHandler.kt @@ -0,0 +1,21 @@ +package com.kw.infrasecurity.jwt + +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.security.access.AccessDeniedException +import org.springframework.security.web.access.AccessDeniedHandler +import org.springframework.stereotype.Component +import org.springframework.web.servlet.HandlerExceptionResolver + +@Component +class JwtAccessDeniedHandler(@Qualifier("handlerExceptionResolver") val resolver: HandlerExceptionResolver) : AccessDeniedHandler { + + override fun handle( + request: HttpServletRequest?, + response: HttpServletResponse?, + accessDeniedException: AccessDeniedException? + ) { + resolver.resolveException(request!!, response!!, null, accessDeniedException!!) + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationEntryPoint.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationEntryPoint.kt new file mode 100644 index 0000000..32741e5 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationEntryPoint.kt @@ -0,0 +1,24 @@ +package com.kw.infrasecurity.jwt + +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.beans.factory.annotation.Qualifier +import org.springframework.security.core.AuthenticationException +import org.springframework.security.web.AuthenticationEntryPoint +import org.springframework.stereotype.Component +import org.springframework.web.servlet.HandlerExceptionResolver + +@Component +class JwtAuthenticationEntryPoint(@Qualifier("handlerExceptionResolver") val resolver: HandlerExceptionResolver) : AuthenticationEntryPoint { + + override fun commence( + request: HttpServletRequest?, + response: HttpServletResponse?, + authException: AuthenticationException? + ) { + resolver.resolveException( + request!!, response!!, null, + (request.getAttribute("exception") as Exception) + ) + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationFilter.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationFilter.kt new file mode 100644 index 0000000..077894a --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtAuthenticationFilter.kt @@ -0,0 +1,42 @@ +package com.kw.infrasecurity.jwt + +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.security.access.AccessDeniedException +import org.springframework.security.core.context.SecurityContextHolder +import org.springframework.stereotype.Component +import org.springframework.util.StringUtils +import org.springframework.web.filter.OncePerRequestFilter + +@Component +class JwtAuthenticationFilter(private val tokenProvider: JwtTokenProvider) : OncePerRequestFilter() { + override fun doFilterInternal( + request: HttpServletRequest, + response: HttpServletResponse, + filterChain: FilterChain + ) { + if (SecurityContextHolder.getContext().authentication == null) { + val accessToken = resolveToken(request) + if (accessToken != null) { + try { + tokenProvider.validateAccessToken(accessToken) + val authentication = tokenProvider.getAuthentication(accessToken) + SecurityContextHolder.getContext().authentication = authentication + } catch (e: Exception) { + request.setAttribute("exception", e) + } + } else { + request.setAttribute("exception", AccessDeniedException("요청이 거부되었습니다")) + } + } + filterChain.doFilter(request, response) + } + + private fun resolveToken(request: HttpServletRequest): String? { + val authorizationHeader = request.getHeader("Authorization") + return if (StringUtils.hasText(authorizationHeader) && authorizationHeader.startsWith("Bearer")) { + authorizationHeader.substring(7) + } else null + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtTokenProvider.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtTokenProvider.kt new file mode 100644 index 0000000..b3053d4 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/jwt/JwtTokenProvider.kt @@ -0,0 +1,96 @@ +package com.kw.infrasecurity.jwt + +import com.kw.infrasecurity.oauth.OAuth2UserDetails +import io.jsonwebtoken.Claims +import io.jsonwebtoken.ExpiredJwtException +import io.jsonwebtoken.Jwts +import io.jsonwebtoken.io.Decoders +import io.jsonwebtoken.security.Keys +import org.springframework.beans.factory.annotation.Value +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken +import org.springframework.security.core.Authentication +import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.stereotype.Component +import java.time.Instant +import java.util.* +import java.util.stream.Collectors +import javax.crypto.SecretKey + +@Component +class JwtTokenProvider(@Value("\${jwt.expiry-seconds}") + val expirySeconds : Int, + @Value("\${jwt.refresh-expiry-seconds}") + val refreshExpirySeconds : Int, + @Value("\${jwt.secret-key}") + val secretKey : String + ) { + fun generateAccessToken(userDetails : OAuth2UserDetails) : String { + val expirationTime = Instant.now().plusSeconds(expirySeconds!!.toLong()) + + val authorities = userDetails.getAuthorities().stream() + .map { authority: GrantedAuthority -> authority.authority } + .collect(Collectors.joining(",")) + + return Jwts.builder() + .claim("id", userDetails.id) + .subject(userDetails.username) + .issuedAt(Date.from(Instant.now())) + .expiration(Date.from(expirationTime)) + .claim("authorities", authorities) + .signWith(getKey()) + .compact() + } + + fun generateRefreshToken(): String { + val expirationTime = Instant.now().plusSeconds(refreshExpirySeconds!!.toLong()) + return Jwts.builder() + .issuedAt(Date.from(Instant.now())) + .expiration(Date.from(expirationTime)) + .signWith(getKey()) + .compact() + } + + fun getAuthentication(accessToken: String?): Authentication? { + val claims = parseClaims(accessToken!!) + val authorities = + Arrays.stream(claims!!["authorities"].toString().split(",".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray()) + .map { role: String? -> + SimpleGrantedAuthority( + role + ) + } + .toList() + + val id = claims["id"] as Int + val convertedId = id.toLong() + val principal = OAuth2UserDetails( + convertedId, + claims.subject, + authorities + ) + return UsernamePasswordAuthenticationToken(principal, "", authorities) + } + + + fun validateAccessToken(token: String?) { + Jwts.parser().verifyWith(getKey()).build().parse(token) + } + + private fun parseClaims(accessToken: String): Claims? { + return try { + Jwts.parser() + .verifyWith(getKey()) + .build() + .parseSignedClaims(accessToken) + .payload + } catch (e: ExpiredJwtException) { + e.claims + } + } + + private fun getKey(): SecretKey { + return Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey)) + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2SuccessHandler.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2SuccessHandler.kt new file mode 100644 index 0000000..ec80827 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2SuccessHandler.kt @@ -0,0 +1,71 @@ +package com.kw.infrasecurity.oauth + +import com.kw.data.domain.member.Member +import com.kw.data.domain.member.repository.MemberRepository +import com.kw.infraredis.repository.RedisRefreshTokenRepository +import com.kw.infrasecurity.jwt.JwtTokenProvider +import com.kw.infrasecurity.util.HttpResponseUtil +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.security.core.Authentication +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.oauth2.core.user.DefaultOAuth2User +import org.springframework.security.web.authentication.AuthenticationSuccessHandler +import org.springframework.stereotype.Component +import org.springframework.transaction.annotation.Transactional + +@Component +@Transactional +class OAuth2SuccessHandler(private val jwtTokenProvider: JwtTokenProvider, + private val memberRepository: MemberRepository, + private val redisRefreshTokenRepository: RedisRefreshTokenRepository, + private val httpResponseUtil: HttpResponseUtil) : AuthenticationSuccessHandler { + + override fun onAuthenticationSuccess( + request: HttpServletRequest?, + response: HttpServletResponse?, + authentication: Authentication? + ) { + val principal = authentication!!.principal as DefaultOAuth2User + val email = principal.getAttribute("email") + + var member = Member(email = email!!) + var isSignUp = false + if(isMember(email)){ + member = getMember(email) + } + else { + member = createMember(member) + isSignUp = true + } + val authorities = member.memberRoles.map { memberRole -> + SimpleGrantedAuthority(memberRole.toString()) + }.toMutableList() + + val oAuth2UserDetails = OAuth2UserDetails( + id = member.id!!, + email = email, + authorities = authorities + ) + + val accessToken = jwtTokenProvider.generateAccessToken(oAuth2UserDetails) + val refreshToken = jwtTokenProvider.generateRefreshToken() + + redisRefreshTokenRepository.save(refreshToken = refreshToken, memberId = member.id!!) + + response!!.addHeader("Authorization", "Bearer $accessToken") + httpResponseUtil.writeResponse(response!!, accessToken, refreshToken, isSignUp) + } + + private fun getMember(email : String) : Member { + return memberRepository.findMemberByEmail(email) ?: throw RuntimeException("회원이 존재하지 않습니다") + } + + private fun createMember(member : Member) : Member { + return memberRepository.save(member) + } + + private fun isMember(email : String) : Boolean { + return memberRepository.findMemberByEmail(email) != null + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserDetails.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserDetails.kt new file mode 100644 index 0000000..d7d26b7 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserDetails.kt @@ -0,0 +1,42 @@ +package com.kw.infrasecurity.oauth + +import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.core.userdetails.UserDetails + +class OAuth2UserDetails(id : Long, + email : String, + authorities: MutableList) : UserDetails { + + val id : Long = id + val email : String = email + val authorities: MutableList = authorities + + override fun getAuthorities(): MutableCollection { + return authorities + } + + override fun getPassword(): String? { + return null + } + + override fun getUsername(): String? { + return email + } + + override fun isAccountNonExpired(): Boolean { + return true + } + + override fun isAccountNonLocked(): Boolean { + return true + } + + override fun isCredentialsNonExpired(): Boolean { + return true + } + + override fun isEnabled(): Boolean { + return true + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserService.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserService.kt new file mode 100644 index 0000000..4bbb219 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/oauth/OAuth2UserService.kt @@ -0,0 +1,22 @@ +package com.kw.infrasecurity.oauth + +import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest +import org.springframework.security.oauth2.core.user.DefaultOAuth2User +import org.springframework.security.oauth2.core.user.OAuth2User +import org.springframework.stereotype.Service + +@Service +class OAuth2UserService : DefaultOAuth2UserService(){ + override fun loadUser(userRequest: OAuth2UserRequest?): OAuth2User { + val registrationId = userRequest!!.clientRegistration.registrationId + + val attributes: MutableMap + val oAuth2User = super.loadUser(userRequest) + attributes = HashMap(oAuth2User.attributes) + + attributes["provider"] = registrationId + + return DefaultOAuth2User(emptyList(), attributes, "provider") + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMember.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMember.kt new file mode 100644 index 0000000..ade8552 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMember.kt @@ -0,0 +1,9 @@ +package com.kw.infrasecurity.resolver + +import io.swagger.v3.oas.annotations.Parameter + +@Parameter(hidden = true) +@Retention(value = AnnotationRetention.RUNTIME) +@Target(AnnotationTarget.VALUE_PARAMETER) +annotation class AuthToMember { +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMemberArgumentResolver.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMemberArgumentResolver.kt new file mode 100644 index 0000000..2e47887 --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/resolver/AuthToMemberArgumentResolver.kt @@ -0,0 +1,55 @@ +package com.kw.infrasecurity.resolver + +import com.kw.data.domain.member.Member +import com.kw.data.domain.member.repository.MemberRepository +import com.kw.infrasecurity.oauth.OAuth2UserDetails +import org.springframework.core.MethodParameter +import org.springframework.security.core.context.SecurityContextHolder +import org.springframework.security.oauth2.core.user.DefaultOAuth2User +import org.springframework.stereotype.Component +import org.springframework.transaction.annotation.Transactional +import org.springframework.web.bind.support.WebDataBinderFactory +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.web.method.support.HandlerMethodArgumentResolver +import org.springframework.web.method.support.ModelAndViewContainer + +@Component +@Transactional +class AuthToMemberArgumentResolver(val memberRepository: MemberRepository) : HandlerMethodArgumentResolver { + override fun supportsParameter(parameter: MethodParameter): Boolean { + val hasParameterAnnotation = parameter.hasParameterAnnotation(AuthToMember::class.java) + val hasLongParameterType = parameter.parameterType.isAssignableFrom(Member::class.java) + return hasParameterAnnotation && hasLongParameterType + } + + override fun resolveArgument( + parameter: MethodParameter, + mavContainer: ModelAndViewContainer?, + webRequest: NativeWebRequest, + binderFactory: WebDataBinderFactory? + ): Any? { + val authentication = SecurityContextHolder.getContext().authentication ?: throw IllegalArgumentException("접근이 거부되었습니다.") + + val userDetails = authentication.principal + var email: String = "" + + if(userDetails is DefaultOAuth2User){ + email = userDetails.getAttribute("email").toString() + } + else if(userDetails is OAuth2UserDetails) { + email = userDetails.email + } + + val member = memberRepository.findMemberByEmail(email) ?: throw IllegalArgumentException("존재하지 않는 회원입니다.") + + isMemberWithdraw(member) + + return member + } + + private fun isMemberWithdraw(member: Member) { + if (member.deletedAt != null) { + throw IllegalArgumentException("탈퇴한 회원입니다.") + } + } +} diff --git a/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/util/HttpResponseUtil.kt b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/util/HttpResponseUtil.kt new file mode 100644 index 0000000..5b936cd --- /dev/null +++ b/infra/infra-security/src/main/kotlin/com/kw/infrasecurity/util/HttpResponseUtil.kt @@ -0,0 +1,24 @@ +package com.kw.infrasecurity.util + +import jakarta.servlet.http.HttpServletResponse +import org.springframework.beans.factory.annotation.Value +import org.springframework.stereotype.Component + +@Component +class HttpResponseUtil(@Value("\${client-redirect-url}") val REDIRECT_URL: String) { + + fun writeResponse(response : HttpServletResponse, accessToken : String, refreshToken : String, isSignUp : Boolean) { + var redirectUrl = REDIRECT_URL + if(isSignUp) { + redirectUrl += "/register" + } + else { + redirectUrl += "/auth" + } + val sb = StringBuffer(redirectUrl) + sb.append("?").append("access-token=").append(accessToken) + sb.append("&").append("refresh-token=").append(refreshToken) + + response.sendRedirect(sb.toString()) + } +} diff --git a/server/api/build.gradle.kts b/server/api/build.gradle.kts index 82590d9..2049184 100644 --- a/server/api/build.gradle.kts +++ b/server/api/build.gradle.kts @@ -10,8 +10,24 @@ jar.enabled = false dependencies { implementation(project(":data")) + implementation(project(":infra:infra-security")) + implementation(project(":infra:infra-redis")) + implementation(project(":infra:infra-s3")) implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-validation") + implementation("io.github.oshai:kotlin-logging-jvm:6.0.3") + + // security + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") + implementation("io.jsonwebtoken:jjwt-api:0.12.3") + implementation("io.jsonwebtoken:jjwt-impl:0.12.3") + implementation("io.jsonwebtoken:jjwt-jackson:0.12.3") + + // swagger + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0") + } diff --git a/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt b/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt index edd3627..4428326 100644 --- a/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt +++ b/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt @@ -2,8 +2,9 @@ package com.kw.api import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication +import org.springframework.context.annotation.ComponentScan -@SpringBootApplication +@SpringBootApplication(scanBasePackages = arrayOf("com.kw")) class ApiApplication fun main(args: Array) { diff --git a/server/api/src/main/kotlin/com/kw/api/common/controller/ApiController.kt b/server/api/src/main/kotlin/com/kw/api/common/controller/ApiController.kt new file mode 100644 index 0000000..ddc6513 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/controller/ApiController.kt @@ -0,0 +1,16 @@ +package com.kw.api.common.controller + +import io.swagger.v3.oas.annotations.tags.Tag +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RestController + +@Tag(name = "공통") +@RestController +class ApiController { + + @GetMapping("/health-check") + fun healthCheck(): String { + return "OK" + } + +} diff --git a/server/api/src/main/kotlin/com/kw/api/common/dto/PageResponse.kt b/server/api/src/main/kotlin/com/kw/api/common/dto/PageResponse.kt new file mode 100644 index 0000000..e36720c --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/dto/PageResponse.kt @@ -0,0 +1,4 @@ +package com.kw.api.common.dto + +data class PageResponse(val currentPage : Long, + val lastPage : Long) diff --git a/server/api/src/main/kotlin/com/kw/api/common/dto/request/PageCondition.kt b/server/api/src/main/kotlin/com/kw/api/common/dto/request/PageCondition.kt new file mode 100644 index 0000000..b78ae99 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/dto/request/PageCondition.kt @@ -0,0 +1,24 @@ +package com.kw.api.common.dto.request + +data class PageCondition( + val page: Int = DEFAULT_PAGE, + val size: Int = DEFAULT_SIZE +) { + companion object { + private const val DEFAULT_PAGE = 1 + private const val DEFAULT_SIZE = 10 + } + + init { + require(isValidPage(page)) { "Invalid page value: $page" } + require(isValidSize(size)) { "Invalid size value: $size" } + } + + private fun isValidPage(page: Int?): Boolean { + return page != null && page > 0 + } + + private fun isValidSize(size: Int?): Boolean { + return size != null && size > 0 + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/common/dto/response/ErrorResponse.kt b/server/api/src/main/kotlin/com/kw/api/common/dto/response/ErrorResponse.kt new file mode 100644 index 0000000..52a1c03 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/dto/response/ErrorResponse.kt @@ -0,0 +1,12 @@ +package com.kw.api.common.dto.response + +class ErrorResponse( + val code: String, + val message: String, + val validations: MutableMap = mutableMapOf() +) { + fun addValidation(key: String, value: String) { + validations[key] = value + } + +} diff --git a/server/api/src/main/kotlin/com/kw/api/common/dto/response/PageResponse.kt b/server/api/src/main/kotlin/com/kw/api/common/dto/response/PageResponse.kt new file mode 100644 index 0000000..45889ba --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/dto/response/PageResponse.kt @@ -0,0 +1,21 @@ +package com.kw.api.common.dto.response + +import org.springframework.data.domain.Page + +data class PageResponse( + val totalPages: Int, + val currentPage: Int, + val pageSize: Int, + val content: List +) { + companion object { + fun from(page: Page): PageResponse { + return PageResponse( + totalPages = page.totalPages, + currentPage = page.pageable.pageNumber + 1, + pageSize = page.pageable.pageSize, + content = page.content + ) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/common/exception/ApiErrorCode.kt b/server/api/src/main/kotlin/com/kw/api/common/exception/ApiErrorCode.kt new file mode 100644 index 0000000..853cfac --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/exception/ApiErrorCode.kt @@ -0,0 +1,39 @@ +package com.kw.api.common.exception + +import org.springframework.http.HttpStatus + +enum class ApiErrorCode( + val status: HttpStatus, + val code: String, + val message: String +) { + + // bundle + FORBIDDEN_BUNDLE(HttpStatus.FORBIDDEN, "FORBIDDEN_BUNDLE", "비공개 꾸러미입니다."), + NOT_FOUND_BUNDLE(HttpStatus.NOT_FOUND, "NOT_FOUND_BUNDLE", "존재하지 않는 꾸러미입니다."), + INCLUDE_INVALID_BUNDLE(HttpStatus.NOT_FOUND, "INCLUDE_INVALID_BUNDLE", "권한이 없거나 존재하지 않는 꾸러미가 포함되어 있습니다."), + + // question + NOT_FOUND_QUESTION(HttpStatus.NOT_FOUND, "NOT_FOUND_QUESTION", "존재하지 않는 질문입니다."), + INCLUDE_NOT_FOUND_QUESTION(HttpStatus.NOT_FOUND, "INCLUDE_NOT_FOUND_QUESTION", "존재하지 않는 질문이 포함되어 있습니다."), + OVER_QUESTION_LIMIT(HttpStatus.BAD_REQUEST, "OVER_QUESTION_LIMIT", "질문은 최대 100개까지 등록할 수 있습니다."), + + // tag + INCLUDE_NOT_FOUND_TAG(HttpStatus.NOT_FOUND, "INCLUDE_NOT_FOUND_TAG", "존재하지 않는 태그가 포함되어 있습니다."), + + // member + NOT_FOUND_MEMBER(HttpStatus.NOT_FOUND, "NOT_FOUND_MEMBER", "존재하지 않는 회원입니다."), + NICKNAME_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, "NICKNAME_ALREADY_EXISTS", "이미 존재하는 닉네임입니다."), + MEMBER_WITHDRAWN(HttpStatus.BAD_REQUEST, "MEMBER_WITHDRAWN", "탈퇴한 회원입니다."), + + // auth + REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "REFRESH_TOKEN_EXPIRED", "리프레시 토큰이 만료되었습니다. 다시 로그인 해주세요."), + ACCESS_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "401/0002", "어세스 토큰이 만료되었으니 재발급 해주세요"), + ACCESS_TOKEN_MALFORMED(HttpStatus.UNAUTHORIZED, "401/0003", "올바르지 않은 토큰입니다."), + ACCESS_DENIED(HttpStatus.FORBIDDEN, "403/0001", "접근이 거부되었습니다."), + + // common + BAD_REQUEST(HttpStatus.BAD_REQUEST, "BAD_REQUEST", "잘못된 요청입니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, "FORBIDDEN", "권한이 없습니다."), + +} diff --git a/server/api/src/main/kotlin/com/kw/api/common/exception/ApiException.kt b/server/api/src/main/kotlin/com/kw/api/common/exception/ApiException.kt new file mode 100644 index 0000000..bdc1d1f --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/exception/ApiException.kt @@ -0,0 +1,16 @@ +package com.kw.api.common.exception + +import com.kw.api.common.dto.response.ErrorResponse +import org.springframework.http.HttpStatus + +class ApiException(private val errorCode: ApiErrorCode) : RuntimeException() { + + fun getErrorResponse(): ErrorResponse { + return ErrorResponse(this.errorCode.code, this.errorCode.message) + } + + fun getStatus(): HttpStatus { + return this.errorCode.status + } + +} diff --git a/server/api/src/main/kotlin/com/kw/api/common/exception/ApiExceptionHandler.kt b/server/api/src/main/kotlin/com/kw/api/common/exception/ApiExceptionHandler.kt new file mode 100644 index 0000000..87c0e7f --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/common/exception/ApiExceptionHandler.kt @@ -0,0 +1,99 @@ +package com.kw.api.common.exception + +import com.kw.api.common.dto.response.ErrorResponse +import io.github.oshai.kotlinlogging.KotlinLogging +import io.jsonwebtoken.ExpiredJwtException +import io.jsonwebtoken.MalformedJwtException +import org.springframework.http.HttpHeaders +import org.springframework.http.HttpStatusCode +import org.springframework.http.ResponseEntity +import org.springframework.http.converter.HttpMessageNotReadableException +import org.springframework.web.bind.MethodArgumentNotValidException +import org.springframework.web.bind.annotation.ExceptionHandler +import org.springframework.web.bind.annotation.RestControllerAdvice +import org.springframework.web.context.request.WebRequest +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler +import java.security.SignatureException + +private val logger = KotlinLogging.logger {} + +@RestControllerAdvice("com.kw") +class ApiExceptionHandler : ResponseEntityExceptionHandler() { + + override fun handleHttpMessageNotReadable( + ex: HttpMessageNotReadableException, + headers: HttpHeaders, + status: HttpStatusCode, + request: WebRequest + ): ResponseEntity? { + logger.warn(ex.message, ex) + val errorCode = ApiErrorCode.BAD_REQUEST + val errorResponse = ErrorResponse(errorCode.code, ex.message ?: errorCode.message) + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + override fun handleMethodArgumentNotValid( + ex: MethodArgumentNotValidException, + headers: HttpHeaders, + status: HttpStatusCode, + request: WebRequest + ): ResponseEntity? { + logger.warn(ex.message, ex) + + val errorCode = ApiErrorCode.BAD_REQUEST + val errorResponse = ErrorResponse(errorCode.code, errorCode.message) + + ex.bindingResult.fieldErrors.forEach { + errorResponse.addValidation(it.field, it.defaultMessage!!) + } + + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + @ExceptionHandler(AccessDeniedException::class) + protected fun handleAccessDeniedException(ex: AccessDeniedException): ResponseEntity { + logger.warn(ex.message, ex) + val errorCode = ApiErrorCode.ACCESS_DENIED + val errorResponse = ErrorResponse(errorCode.code, ex.message ?: errorCode.message) + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + @ExceptionHandler(SignatureException::class) + protected fun handleSignatureException(ex: SignatureException): ResponseEntity { + logger.warn(ex.message, ex) + val errorCode = ApiErrorCode.ACCESS_TOKEN_MALFORMED + val errorResponse = ErrorResponse(errorCode.code, ex.message ?: errorCode.message) + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + @ExceptionHandler(MalformedJwtException::class) + protected fun handleMalformedJwtException(ex: MalformedJwtException): ResponseEntity { + logger.warn(ex.message, ex) + val errorCode = ApiErrorCode.ACCESS_TOKEN_MALFORMED + val errorResponse = ErrorResponse(errorCode.code, ex.message ?: errorCode.message) + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + @ExceptionHandler(ExpiredJwtException::class) + protected fun handleExpiredJwtException(ex: ExpiredJwtException): ResponseEntity { + logger.warn(ex.message, ex) + val errorCode = ApiErrorCode.ACCESS_TOKEN_EXPIRED + val errorResponse = ErrorResponse(errorCode.code, ex.message ?: errorCode.message) + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + @ExceptionHandler(IllegalArgumentException::class) + protected fun handleIllegalArgumentException(ex: IllegalArgumentException): ResponseEntity { + logger.warn(ex.message, ex) + val errorCode = ApiErrorCode.BAD_REQUEST + val errorResponse = ErrorResponse(errorCode.code, ex.message ?: errorCode.message) + return ResponseEntity.status(errorCode.status).body(errorResponse) + } + + @ExceptionHandler(ApiException::class) + protected fun handleApiException(ex: ApiException): ResponseEntity { + logger.warn(ex.message, ex) + return ResponseEntity.status(ex.getStatus()).body(ex.getErrorResponse()) + } + +} diff --git a/server/api/src/main/kotlin/com/kw/api/config/SwaggerConfig.kt b/server/api/src/main/kotlin/com/kw/api/config/SwaggerConfig.kt new file mode 100644 index 0000000..5c6a7fb --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/config/SwaggerConfig.kt @@ -0,0 +1,33 @@ +package com.kw.api.config + +import io.swagger.v3.oas.annotations.OpenAPIDefinition +import io.swagger.v3.oas.annotations.info.Info +import io.swagger.v3.oas.annotations.servers.Server +import io.swagger.v3.oas.models.Components +import io.swagger.v3.oas.models.OpenAPI +import io.swagger.v3.oas.models.security.SecurityRequirement +import io.swagger.v3.oas.models.security.SecurityScheme +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import java.util.* + + +@OpenAPIDefinition( + info = Info(title = "키윙 API 명세서", version = "1.0"), + servers = [ Server(url = "/", description = "키윙 현재 서버 URL"), + Server(url = "https://api-dev.kiwing.kr", description = "키윙 스테이징 서버 URL")] +) +@Configuration +class SwaggerConfig { + @Bean + fun openAPI(): OpenAPI { + val securityScheme = SecurityScheme() + .type(SecurityScheme.Type.HTTP).scheme("bearer").bearerFormat("JWT") + .`in`(SecurityScheme.In.HEADER).name("Authorization") + val securityRequirement = SecurityRequirement().addList("bearerAuth") + return OpenAPI() + .components(Components().addSecuritySchemes("bearerAuth", securityScheme)) + .security(Arrays.asList(securityRequirement)) + } +} + diff --git a/server/api/src/main/kotlin/com/kw/api/config/WebMvcConfig.kt b/server/api/src/main/kotlin/com/kw/api/config/WebMvcConfig.kt new file mode 100644 index 0000000..8eda68d --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/config/WebMvcConfig.kt @@ -0,0 +1,22 @@ +package com.kw.api.config + +import com.kw.infrasecurity.resolver.AuthToMemberArgumentResolver +import org.springframework.context.annotation.Configuration +import org.springframework.web.method.support.HandlerMethodArgumentResolver +import org.springframework.web.servlet.config.annotation.CorsRegistry +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer + + +@Configuration +class WebMvcConfig(val authToMemberArgumentResolver: AuthToMemberArgumentResolver) : WebMvcConfigurer { + override fun addArgumentResolvers(resolvers: MutableList) { + resolvers.add(authToMemberArgumentResolver) + } + override fun addCorsMappings(registry: CorsRegistry) { + registry.addMapping("/**") + .allowedOriginPatterns("/**") + .allowedHeaders("*") + .allowedMethods("HEAD", "GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") + .allowCredentials(true) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/auth/controller/AuthController.kt b/server/api/src/main/kotlin/com/kw/api/domain/auth/controller/AuthController.kt new file mode 100644 index 0000000..bda32bc --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/auth/controller/AuthController.kt @@ -0,0 +1,37 @@ +package com.kw.api.domain.auth.controller + +import com.kw.api.domain.auth.dto.request.RefreshTokenRequest +import com.kw.api.domain.auth.dto.response.TokenResponse +import com.kw.api.domain.auth.service.AuthService +import com.kw.data.domain.member.Member +import com.kw.infrasecurity.resolver.AuthToMember +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.* + +@Tag(name = "인증", description = "인증 관련 API 입니다.") +@RestController +@RequestMapping("/api/v1/auth") +class AuthController(val authService: AuthService) { + + @Operation(summary = "로그아웃을 합니다.") + @ResponseStatus(HttpStatus.NO_CONTENT) + @GetMapping("/logout") + fun logout(@RequestBody refreshTokenRequest: RefreshTokenRequest) { + authService.logout(refreshTokenRequest) + } + + @Operation(summary = "리프레시 토큰으로 어세스 토큰을 재발급합니다.") + @PostMapping("/refresh-access-token") + fun refreshAccessToken(@RequestBody refreshTokenRequest: RefreshTokenRequest): TokenResponse { + return authService.refreshAccessToken(refreshTokenRequest) + } + + @Operation(summary = "회원탈퇴합니다.") + @ResponseStatus(HttpStatus.NO_CONTENT) + @DeleteMapping("/withdraw") + fun withdrawMember(@AuthToMember member: Member) { + authService.withdrawMember(member) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/auth/dto/request/RefreshTokenRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/auth/dto/request/RefreshTokenRequest.kt new file mode 100644 index 0000000..c291ec3 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/auth/dto/request/RefreshTokenRequest.kt @@ -0,0 +1,3 @@ +package com.kw.api.domain.auth.dto.request + +data class RefreshTokenRequest(val refreshToken : String) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/auth/dto/response/TokenResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/auth/dto/response/TokenResponse.kt new file mode 100644 index 0000000..f0ac2f4 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/auth/dto/response/TokenResponse.kt @@ -0,0 +1,4 @@ +package com.kw.api.domain.auth.dto.response + +data class TokenResponse(val accessToken : String, + val refreshToken : String) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/auth/service/AuthService.kt b/server/api/src/main/kotlin/com/kw/api/domain/auth/service/AuthService.kt new file mode 100644 index 0000000..e76aa2c --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/auth/service/AuthService.kt @@ -0,0 +1,58 @@ +package com.kw.api.domain.auth.service + +import com.kw.api.common.exception.ApiErrorCode +import com.kw.api.common.exception.ApiException +import com.kw.api.domain.auth.dto.request.RefreshTokenRequest +import com.kw.api.domain.auth.dto.response.TokenResponse +import com.kw.data.domain.member.Member +import com.kw.data.domain.member.repository.MemberRepository +import com.kw.infraredis.repository.RedisRefreshTokenRepository +import com.kw.infrasecurity.jwt.JwtTokenProvider +import com.kw.infrasecurity.oauth.OAuth2UserDetails +import org.springframework.data.repository.findByIdOrNull +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.stereotype.Service + +@Service +class AuthService( + val redisRefreshTokenRepository: RedisRefreshTokenRepository, + val memberRepository: MemberRepository, + val jwtTokenProvider: JwtTokenProvider +) { + + fun logout(refreshTokenRequest: RefreshTokenRequest) { + redisRefreshTokenRepository.delete(refreshTokenRequest.refreshToken) + } + + fun refreshAccessToken(refreshTokenRequest: RefreshTokenRequest): TokenResponse { + val memberId = redisRefreshTokenRepository.findByRefreshToken(refreshTokenRequest.refreshToken) + ?: throw ApiException(ApiErrorCode.REFRESH_TOKEN_EXPIRED) + val member = memberRepository.findByIdOrNull(memberId) + ?: throw ApiException(ApiErrorCode.NOT_FOUND_MEMBER) + + val oauth2UserDetails = createOauth2UserDetails(member) + val accessToken = jwtTokenProvider.generateAccessToken(oauth2UserDetails) + val refreshToken = jwtTokenProvider.generateRefreshToken() + redisRefreshTokenRepository.save(refreshToken, memberId) + + return TokenResponse(accessToken, refreshToken) + } + + fun withdrawMember(member: Member) { + member.withdrawMember() + } + + private fun createOauth2UserDetails(member: Member): OAuth2UserDetails { + val authorities: MutableList = member.memberRoles + .stream() + .map { memberRole -> SimpleGrantedAuthority(memberRole.toString()) } + .toList() + .toMutableList() + + return OAuth2UserDetails( + id = member.id!!, + email = member.email, + authorities = authorities + ) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/controller/BundleController.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/controller/BundleController.kt new file mode 100644 index 0000000..43b5954 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/controller/BundleController.kt @@ -0,0 +1,138 @@ +package com.kw.api.domain.bundle.controller + +import com.kw.api.common.dto.request.PageCondition +import com.kw.api.common.dto.response.PageResponse +import com.kw.api.domain.bundle.dto.request.* +import com.kw.api.domain.bundle.dto.response.BundleDetailResponse +import com.kw.api.domain.bundle.dto.response.BundleResponse +import com.kw.api.domain.bundle.service.BundleService +import com.kw.api.domain.member.dto.request.BundleOrderUpdateRequest +import com.kw.data.domain.bundle.dto.request.BundleGetCondition +import com.kw.data.domain.bundle.dto.request.BundleSearchCondition +import com.kw.data.domain.member.Member +import com.kw.infrasecurity.resolver.AuthToMember +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import jakarta.validation.Valid +import org.springdoc.core.annotations.ParameterObject +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.* + +@Tag(name = "꾸러미") +@RestController +@RequestMapping("/api/v1") +class BundleController( + private val bundleService: BundleService +) { + + @Operation(summary = "꾸러미 생성") + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("/bundles") + fun createBundle( + @RequestBody @Valid request: BundleCreateRequest, + @AuthToMember member: Member + ): BundleDetailResponse { + return bundleService.createBundle(request, member) + } + + //TODO: ES + @Operation(summary = "꾸러미 검색") + @GetMapping("/bundles/search") + fun searchBundles( + @ParameterObject @ModelAttribute @Valid searchCondition: BundleSearchCondition, + @ParameterObject @ModelAttribute pageCondition: PageCondition + ): PageResponse { + return bundleService.searchBundles(searchCondition, pageCondition) + } + + @Operation(summary = "내 꾸러미 목록 조회") + @GetMapping("/bundles/my") + fun getMyBundles( + @ParameterObject @ModelAttribute @Valid getCondition: BundleGetCondition, + @AuthToMember member: Member + ): List { + return bundleService.getMyBundles(getCondition, member) + } + + @Operation(summary = "꾸러미 상세 조회") + @GetMapping("/bundles/{id}") + fun getBundle( + @PathVariable id: Long, + @RequestParam("showOnlyMyQuestions", required = false, defaultValue = "false") showOnlyMyQuestions: Boolean, + @AuthToMember member: Member + ): BundleDetailResponse { + return bundleService.getBundle(id, showOnlyMyQuestions, member) + } + + @Operation(summary = "꾸러미 수정") + @PatchMapping("/bundles/{id}") + fun updateBundle( + @PathVariable id: Long, + @RequestBody @Valid request: BundleUpdateRequest, + @AuthToMember member: Member + ): BundleResponse { + return bundleService.updateBundle(id, request, member) + } + + @Operation(summary = "꾸러미 순서 변경") + @ResponseStatus(HttpStatus.NO_CONTENT) + @PatchMapping("/bundles/bundle-order") + fun updateBundleOrder( + @AuthToMember member: Member, + @RequestBody request: BundleOrderUpdateRequest + ) { + bundleService.updateBundleOrder(member, request) + } + + @Operation(summary = "꾸러미 삭제") + @ResponseStatus(HttpStatus.NO_CONTENT) + @DeleteMapping("/bundles/{id}") + fun deleteBundle( + @PathVariable id: Long, + @AuthToMember member: Member + ) { + bundleService.deleteBundle(id, member) + } + + @Operation(summary = "꾸러미 스크랩") + @ResponseStatus(HttpStatus.NO_CONTENT) + @PostMapping("/bundles/{id}/scrape") + fun scrapeBundle( + @PathVariable id: Long, + @AuthToMember member: Member + ) { + bundleService.scrapeBundle(id, member) + } + + @Operation(summary = "꾸러미의 질문 순서 변경") + @ResponseStatus(HttpStatus.NO_CONTENT) + @PatchMapping("/bundles/{id}/question-order") + fun updateQuestionOrder( + @PathVariable id: Long, + @RequestBody @Valid request: BundleQuestionOrderUpdateRequest, + @AuthToMember member: Member + ) { + bundleService.updateQuestionOrder(id, request, member) + } + + @Operation(summary = "선택한 질문 여러 꾸러미에 추가") + @ResponseStatus(HttpStatus.NO_CONTENT) + @PostMapping("/bundles/questions") + fun addQuestion( + @RequestBody @Valid request: BundleQuestionAddRequest, + @AuthToMember member: Member + ) { + bundleService.addQuestion(request, member) + } + + @Operation(summary = "선택한 질문 꾸러미에서 삭제") + @ResponseStatus(HttpStatus.NO_CONTENT) + @DeleteMapping("/bundles/{id}/questions") + fun removeQuestion( + @PathVariable id: Long, + @RequestBody @Valid request: BundleQuestionRemoveRequest, + @AuthToMember member: Member + ) { + bundleService.removeQuestion(id, request, member) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleCreateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleCreateRequest.kt new file mode 100644 index 0000000..be70963 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleCreateRequest.kt @@ -0,0 +1,26 @@ +package com.kw.api.domain.bundle.dto.request + +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.member.Member +import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.Size + +data class BundleCreateRequest( + + @field:NotBlank(message = "이름은 필수입니다.") + @field:Size(max = 100, message = "이름은 최대 5자까지 입력해 주세요.") + val name: String, + + val shareType: Bundle.ShareType, + + @field:Size(max = 3, message = "태그는 최대 3개까지 지정 가능합니다.") + val tagIds: List? +) { + fun toEntity(member: Member): Bundle { + return Bundle( + name = name, + shareType = shareType, + member = member + ) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionAddRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionAddRequest.kt new file mode 100644 index 0000000..78d481b --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionAddRequest.kt @@ -0,0 +1,11 @@ +package com.kw.api.domain.bundle.dto.request + +import jakarta.validation.constraints.Size + +data class BundleQuestionAddRequest( + @field:Size(min = 1, message = "추가할 꾸러미를 선택해 주세요.") + val bundleIds: List, + + @field:Size(min = 1, message = "추가할 질문을 선택해 주세요.") + val questionIds: List +) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionOrderUpdateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionOrderUpdateRequest.kt new file mode 100644 index 0000000..eb17e6b --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionOrderUpdateRequest.kt @@ -0,0 +1,8 @@ +package com.kw.api.domain.bundle.dto.request + +import jakarta.validation.constraints.Size + +data class BundleQuestionOrderUpdateRequest( + @field:Size(min = 1, message = "질문의 아이디를 순서대로 입력해 주세요.") + val questionOrder: List +) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionRemoveRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionRemoveRequest.kt new file mode 100644 index 0000000..f4ecbeb --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleQuestionRemoveRequest.kt @@ -0,0 +1,8 @@ +package com.kw.api.domain.bundle.dto.request + +import jakarta.validation.constraints.Size + +data class BundleQuestionRemoveRequest( + @field:Size(min = 1, message = "삭제할 질문을 선택해 주세요.") + val questionIds: List +) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleUpdateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleUpdateRequest.kt new file mode 100644 index 0000000..b7f1375 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/request/BundleUpdateRequest.kt @@ -0,0 +1,11 @@ +package com.kw.api.domain.bundle.dto.request + +import com.kw.data.domain.bundle.Bundle +import jakarta.validation.constraints.Size + +data class BundleUpdateRequest( + @field:Size(max = 100, message = "이름은 최대 5자까지 입력해 주세요.") + val name: String?, + val shareType: Bundle.ShareType?, + val tagIds: List? +) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleDetailResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleDetailResponse.kt new file mode 100644 index 0000000..a0b5b97 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleDetailResponse.kt @@ -0,0 +1,35 @@ +package com.kw.api.domain.bundle.dto.response + +import com.kw.api.domain.question.dto.response.QuestionResponse +import com.kw.api.domain.tag.dto.response.TagResponse +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.question.Question +import java.time.LocalDateTime + +data class BundleDetailResponse( + val id: Long, + val name: String? = null, + val shareType: String, + val tags: List? = null, + val questions: List? = null, + val originId: Long? = null, + val writerId: Long, + val createdAt: LocalDateTime? = null, + val updatedAt: LocalDateTime? = null +) { + companion object { + fun from(bundle: Bundle, questions: List): BundleDetailResponse { + return BundleDetailResponse( + id = bundle.id!!, + name = bundle.name, + shareType = bundle.shareType.name, + tags = bundle.bundleTags.map { it.tag }.map { TagResponse.from(it) }, + questions = questions.map { QuestionResponse.from(it) }, + originId = bundle.originId, + writerId = bundle.member.id!!, + createdAt = bundle.createdAt, + updatedAt = bundle.updatedAt + ) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleResponse.kt new file mode 100644 index 0000000..581ffc0 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/dto/response/BundleResponse.kt @@ -0,0 +1,35 @@ +package com.kw.api.domain.bundle.dto.response + +import com.kw.api.domain.tag.dto.response.TagResponse +import com.kw.data.domain.bundle.Bundle +import java.time.LocalDateTime + +data class BundleResponse( + val id: Long, + val name: String, + val shareType: String, + val scrapeCount: Long, + val tags: List, + val isHot: Boolean, + val originId: Long? = null, + val writerId: Long, + val createdAt: LocalDateTime, + val updatedAt: LocalDateTime +) { + companion object { + fun from(bundle: Bundle): BundleResponse { + return BundleResponse( + id = bundle.id!!, + name = bundle.name, + shareType = bundle.shareType.name, + scrapeCount = bundle.scrapeCount, + tags = bundle.bundleTags.map { TagResponse.from(it.tag) }, + isHot = bundle.isHot(), + originId = bundle.originId, + writerId = bundle.member.id!!, + createdAt = bundle.createdAt, + updatedAt = bundle.updatedAt + ) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/bundle/service/BundleService.kt b/server/api/src/main/kotlin/com/kw/api/domain/bundle/service/BundleService.kt new file mode 100644 index 0000000..53d4f2e --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/bundle/service/BundleService.kt @@ -0,0 +1,220 @@ +package com.kw.api.domain.bundle.service + +import com.kw.api.common.dto.request.PageCondition +import com.kw.api.common.dto.response.PageResponse +import com.kw.api.common.exception.ApiErrorCode +import com.kw.api.common.exception.ApiException +import com.kw.api.domain.bundle.dto.request.* +import com.kw.api.domain.bundle.dto.response.BundleDetailResponse +import com.kw.api.domain.bundle.dto.response.BundleResponse +import com.kw.api.domain.member.dto.request.BundleOrderUpdateRequest +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.bundle.BundleTag +import com.kw.data.domain.bundle.dto.request.BundleGetCondition +import com.kw.data.domain.bundle.dto.request.BundleSearchCondition +import com.kw.data.domain.bundle.repository.BundleRepository +import com.kw.data.domain.member.Member +import com.kw.data.domain.question.Question +import com.kw.data.domain.question.repository.QuestionRepository +import com.kw.data.domain.tag.Tag +import com.kw.data.domain.tag.repository.TagRepository +import org.springframework.data.domain.PageRequest +import org.springframework.data.support.PageableExecutionUtils +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import java.util.function.LongSupplier + +@Service +@Transactional +class BundleService( + private val bundleRepository: BundleRepository, + private val tagRepository: TagRepository, + private val questionRepository: QuestionRepository, +) { + + fun createBundle(request: BundleCreateRequest, member: Member): BundleDetailResponse { + val tags = request.tagIds?.let { getExistTags(it) } ?: emptyList() + val bundle = request.toEntity(member) + bundle.updateBundleTags(tags.map { BundleTag(bundle, it) }) + + val savedBundle = bundleRepository.save(bundle) + member.updateBundleOrder((member.bundleOrder + " " + savedBundle.id).trim()) + + return getBundle(savedBundle.id!!, false, member) + } + + @Transactional(readOnly = true) + fun searchBundles( + searchCondition: BundleSearchCondition, + pageCondition: PageCondition + ): PageResponse { + val pageable = PageRequest.of(pageCondition.page.minus(1), pageCondition.size) + val bundles = bundleRepository.findAll(searchCondition, pageable) + .map { BundleResponse.from(it) } + return PageResponse.from( + PageableExecutionUtils.getPage( + bundles, pageable, LongSupplier { bundleRepository.count(searchCondition) } + ) + ) + } + + @Transactional(readOnly = true) + fun getMyBundles(getCondition: BundleGetCondition, member: Member): List { + val bundles = bundleRepository.findAllByMemberId(member.id!!, getCondition) + + if (getCondition.sortingType == BundleGetCondition.SortingType.CUSTOM) { + val bundleOrder = parseOrderStringToOrderList(member.bundleOrder) + val sortedBundles = bundles.sortedBy { bundleOrder.indexOf(it.id) } + return sortedBundles.map { BundleResponse.from(it) } + } + + return bundles.map { BundleResponse.from(it) } + } + + @Transactional(readOnly = true) + fun getBundle(id: Long, showOnlyMyQuestions: Boolean? = false, member: Member): BundleDetailResponse { + val bundle = bundleRepository.findWithTagsById(id) + ?: throw ApiException(ApiErrorCode.NOT_FOUND_BUNDLE) + if (bundle.shareType == Bundle.ShareType.PRIVATE && bundle.member.id != member.id) { + return BundleDetailResponse( + id = bundle.id!!, + shareType = bundle.shareType.name, + originId = bundle.originId, + writerId = bundle.member.id!!, + ) + } + + val questions = questionRepository.findAllWithTagsByBundleId( + id, + showOnlyMyQuestions, + member.id + ) + val questionOrder = parseOrderStringToOrderList(bundle.questionOrder) + val sortedQuestions = questions.sortedBy { questionOrder.indexOf(it.id) } + + return BundleDetailResponse.from(bundle, sortedQuestions) + } + + fun updateBundle(id: Long, request: BundleUpdateRequest, member: Member): BundleResponse { + val bundle = bundleRepository.findWithTagsById(id) + ?: throw ApiException(ApiErrorCode.NOT_FOUND_BUNDLE) + if (bundle.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + + request.name?.let { bundle.updateName(request.name) } + request.shareType?.let { bundle.updateShareType(request.shareType) } + request.tagIds?.let { it -> + val tags = getExistTags(it) + bundle.updateBundleTags(tags.map { BundleTag(bundle, it) }) + } + + return BundleResponse.from(bundle) + } + + fun updateBundleOrder(member: Member, request: BundleOrderUpdateRequest) { + member.updateBundleOrder(request.bundleIds.joinToString(" ")) + } + + fun deleteBundle(id: Long, member: Member) { + val bundle = getExistBundle(id) + if (bundle.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + bundle.originId?.let { bundleRepository.decreaseScrapeCount(it) } + + val questions = questionRepository.findAllByBundleId(id) + questionRepository.decreaseShareCountByIdIn(questions.mapNotNull { it.originId }) + + bundleRepository.delete(bundle) + } + + fun scrapeBundle(id: Long, member: Member) { + val bundle = bundleRepository.findWithTagsById(id) + ?: throw ApiException(ApiErrorCode.NOT_FOUND_BUNDLE) + if (bundle.shareType == Bundle.ShareType.PRIVATE) { + throw ApiException(ApiErrorCode.FORBIDDEN_BUNDLE) + } + bundleRepository.increaseScrapeCount(id) + val copiedAndSavedBundle = bundleRepository.save(bundle.copy(member)) + member.updateBundleOrder((member.bundleOrder + " " + copiedAndSavedBundle.id).trim()) + + val questions = questionRepository.findAllWithTagsByBundleId(id) + questionRepository.increaseShareCountByIdIn(questions.map { it.id!! }) + val copiedAndSavedQuestions = questions + .map { questionRepository.save(it.copy(copiedAndSavedBundle, member)) } + + copiedAndSavedBundle.updateQuestionOrder((copiedAndSavedQuestions.joinToString(" ") { it.id.toString() }).trim()) + } + + fun updateQuestionOrder(id: Long, request: BundleQuestionOrderUpdateRequest, member: Member) { + val bundle = getExistBundle(id) + if (bundle.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + + bundle.updateQuestionOrder(request.questionOrder.joinToString(" ")) + } + + fun addQuestion(request: BundleQuestionAddRequest, member: Member) { + val bundles = bundleRepository.findAllByMemberIdAndIdIn(member.id!!, request.bundleIds) + if (bundles.size != request.bundleIds.size) { + throw ApiException(ApiErrorCode.INCLUDE_INVALID_BUNDLE) + } + + bundles.forEach { bundle -> + val questionCount = questionRepository.countAllByBundleId(bundle.id!!) + if (questionCount + request.questionIds.size >= 100) { + throw ApiException(ApiErrorCode.OVER_QUESTION_LIMIT) + } + + val questions = questionRepository.findAllWithTagsByIdIn(request.questionIds) + questionRepository.increaseShareCountByIdIn(questions.map { it.id!! }) + val copiedAndSavedQuestions = questions + .map { questionRepository.save(it.copy(bundle, member)) } + + bundle.updateQuestionOrder((bundle.questionOrder + " " + copiedAndSavedQuestions.joinToString(" ") { it.id.toString() }).trim()) + } + } + + fun removeQuestion(id: Long, request: BundleQuestionRemoveRequest, member: Member) { + val bundle = getExistBundle(id) + if (bundle.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + + val questions = getExistQuestions(request.questionIds) + questionRepository.decreaseShareCountByIdIn(questions.mapNotNull { it.originId }) + + bundle.removeQuestions(questions) + } + + private fun getExistBundle(id: Long): Bundle { + return bundleRepository.findById(id) + .orElseThrow { ApiException(ApiErrorCode.NOT_FOUND_BUNDLE) } + } + + private fun getExistTags(tagIds: List): List { + val tags = tagRepository.findAllById(tagIds) + if (tags.size != tagIds.size) { + throw ApiException(ApiErrorCode.INCLUDE_NOT_FOUND_TAG) + } + return tags + } + + private fun getExistQuestions(questionIds: List): List { + val questions = questionRepository.findAllById(questionIds) + if (questions.size != questionIds.size) { + throw ApiException(ApiErrorCode.INCLUDE_NOT_FOUND_QUESTION) + } + return questions + } + + private fun parseOrderStringToOrderList(orderString: String): List { + return if (orderString.isNotBlank()) { + orderString.split(" ").map { it.toLong() } + } else { + emptyList() + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/claim/controller/ClaimController.kt b/server/api/src/main/kotlin/com/kw/api/domain/claim/controller/ClaimController.kt new file mode 100644 index 0000000..c8ffe0b --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/claim/controller/ClaimController.kt @@ -0,0 +1,22 @@ +package com.kw.api.domain.claim.controller + +import com.kw.api.domain.claim.dto.request.CreateClaimRequest +import com.kw.api.domain.claim.dto.response.ClaimResponse +import com.kw.api.domain.claim.service.ClaimService +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.* + +@Tag(name = "건의") +@RestController +@RequestMapping("/api/v1") +class ClaimController(val claimService: ClaimService) { + + @Operation(summary = "건의 생성") + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("/claims") + fun createClaim(@RequestBody createClaimRequest: CreateClaimRequest): ClaimResponse { + return claimService.createClaim(createClaimRequest) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/claim/dto/request/CreateClaimRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/claim/dto/request/CreateClaimRequest.kt new file mode 100644 index 0000000..6107d2d --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/claim/dto/request/CreateClaimRequest.kt @@ -0,0 +1,3 @@ +package com.kw.api.domain.claim.dto.request + +data class CreateClaimRequest(val content : String) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/claim/dto/response/ClaimResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/claim/dto/response/ClaimResponse.kt new file mode 100644 index 0000000..3ca9ce2 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/claim/dto/response/ClaimResponse.kt @@ -0,0 +1,4 @@ +package com.kw.api.domain.claim.dto.response + +data class ClaimResponse(val id : Long?, + val content : String) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/claim/service/ClaimService.kt b/server/api/src/main/kotlin/com/kw/api/domain/claim/service/ClaimService.kt new file mode 100644 index 0000000..8aa2770 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/claim/service/ClaimService.kt @@ -0,0 +1,18 @@ +package com.kw.api.domain.claim.service + +import com.kw.api.domain.claim.dto.request.CreateClaimRequest +import com.kw.api.domain.claim.dto.response.ClaimResponse +import com.kw.data.domain.claim.Claim +import com.kw.data.domain.claim.repository.ClaimRepository +import jakarta.transaction.Transactional +import org.springframework.stereotype.Service + +@Service +@Transactional +class ClaimService(val claimRepository: ClaimRepository) { + fun createClaim(createClaimRequest: CreateClaimRequest) : ClaimResponse { + val claim = Claim(content = createClaimRequest.content) + val savedClaim = claimRepository.save(claim) + return ClaimResponse(id = savedClaim.id, content = savedClaim.content) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/member/controller/MemberController.kt b/server/api/src/main/kotlin/com/kw/api/domain/member/controller/MemberController.kt new file mode 100644 index 0000000..64132e3 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/member/controller/MemberController.kt @@ -0,0 +1,87 @@ +package com.kw.api.domain.member.controller + +import com.kw.api.domain.member.dto.request.MemberInfoUpdateRequest +import com.kw.api.domain.member.dto.request.MemberSnsUpdateRequest +import com.kw.api.domain.member.dto.response.MemberInfoResponse +import com.kw.api.domain.member.service.MemberService +import com.kw.data.domain.member.Member +import com.kw.infrasecurity.resolver.AuthToMember +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import org.springframework.http.MediaType +import org.springframework.web.bind.annotation.* +import org.springframework.web.multipart.MultipartFile + +@Tag(name = "회원", description = "회원 관련 API 입니다.") +@RestController +@RequestMapping("/api/v1/members") +class MemberController(private val memberService: MemberService) { + + @Operation(summary = "로그인된 사용자의 정보를 가져옵니다.") + @GetMapping("/me") + fun getUserInfo(@AuthToMember member: Member): MemberInfoResponse { + return memberService.getMemberInfo(member) + } + + @Operation(summary = "사용자의 닉네임을 변경합니다.") + @PatchMapping("/me/nickname") + fun updateMemberNickname( + @AuthToMember member: Member, + @RequestParam nickname: String + ): MemberInfoResponse { + val response = memberService.updateMemberNickname(member, nickname) + return response + } + + @Operation(summary = "사용자의 소셜 링크를 변경합니다.") + @PatchMapping("/me/sns") + fun updateMemberSns( + @AuthToMember member: Member, + @RequestBody memberSnsUpdateRequest: MemberSnsUpdateRequest + ): MemberInfoResponse { + val response = memberService.updateMemberSns(member, memberSnsUpdateRequest) + return response + } + + @Operation(summary = "사용자의 관심 태그를 변경합니다.") + @PatchMapping("/me/tags") + fun updateMemberTags( + @AuthToMember member: Member, + @RequestParam tagIds: List + ): MemberInfoResponse { + val response = memberService.updateMemberTags(member, tagIds) + return response + } + + @Operation(summary = "사용자 회원가입 시 회원 정보를 설정합니다.") + @PatchMapping("/me") + fun updateMemberInfo( + @AuthToMember member: Member, + @RequestBody memberInfoUpdateRequest: MemberInfoUpdateRequest + ): MemberInfoResponse { + val response = memberService.updateMemberInfo(member, memberInfoUpdateRequest) + return response + } + + @Operation(summary = "회원 프로필 사진을 저장합니다.") + @PatchMapping(value = ["/me/profile-image"], consumes = [MediaType.MULTIPART_FORM_DATA_VALUE]) + fun updateMemberProfileImage( + @AuthToMember member: Member, + @RequestPart(value = "file", required = true) file: MultipartFile + ): MemberInfoResponse { + return memberService.updateMemberProfileImage(member, file) + } + + @Operation(summary = "회원 아이디로 회원 정보를 가져옵니다.") + @GetMapping("/{id}") + fun updateMemberProfileImage(@PathVariable id: Long): MemberInfoResponse { + val response = memberService.getMemberInfoById(id) + return response + } + + @Operation(summary = "회원 닉네임 중복검사를 합니다.") + @GetMapping("/nickname/validate-duplicate") + fun isMemberNicknameDuplicate(@RequestParam nickname: String) { + memberService.isMemberNicknameDuplicate(nickname) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/BundleOrderUpdateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/BundleOrderUpdateRequest.kt new file mode 100644 index 0000000..96ee248 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/BundleOrderUpdateRequest.kt @@ -0,0 +1,3 @@ +package com.kw.api.domain.member.dto.request + +data class BundleOrderUpdateRequest(val bundleIds: List) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberInfoUpdateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberInfoUpdateRequest.kt new file mode 100644 index 0000000..0e08ae8 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberInfoUpdateRequest.kt @@ -0,0 +1,6 @@ +package com.kw.api.domain.member.dto.request + +data class MemberInfoUpdateRequest(val nickname: String, + val snsRequests: List, + val tagIds: List) { +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberSnsUpdateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberSnsUpdateRequest.kt new file mode 100644 index 0000000..c63c44e --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/request/MemberSnsUpdateRequest.kt @@ -0,0 +1,6 @@ +package com.kw.api.domain.member.dto.request + +data class MemberSnsUpdateRequest(val SnsRequests: List) { + data class SnsRequest(val name: String, + val url: String) +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/member/dto/response/MemberInfoResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/response/MemberInfoResponse.kt new file mode 100644 index 0000000..f9beece --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/member/dto/response/MemberInfoResponse.kt @@ -0,0 +1,44 @@ +package com.kw.api.domain.member.dto.response + +import com.kw.api.domain.tag.dto.response.TagResponse +import com.kw.data.domain.member.Member + +data class MemberInfoResponse(val id: Long?, + val nickname: String?, + val email: String, + val provider: Member.Provider, + val profileImage: String?, + val snsList: List, + val memberTags: List + ) { + companion object { + fun from(member: Member) : MemberInfoResponse { + val snsResponses = member.snsList.map { sns -> + SnsResponse( + name = sns.name, + url = sns.url + ) + }.toList() + + val tagResponses = member.memberTags.map { memberTag -> + TagResponse( + id = memberTag.tag.id, + name = memberTag.tag.name + ) + }.toList() + + return MemberInfoResponse( + id = member.id, + nickname = member.nickname, + email = member.email, + provider = member.provider, + profileImage = member.profileImage, + snsList = snsResponses, + memberTags = tagResponses + ) + } + } + + data class SnsResponse(val name: String, + val url: String) +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/member/service/MemberService.kt b/server/api/src/main/kotlin/com/kw/api/domain/member/service/MemberService.kt new file mode 100644 index 0000000..1e659dc --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/member/service/MemberService.kt @@ -0,0 +1,101 @@ +package com.kw.api.domain.member.service + +import com.kw.api.common.exception.ApiErrorCode +import com.kw.api.common.exception.ApiException +import com.kw.api.domain.member.dto.request.MemberInfoUpdateRequest +import com.kw.api.domain.member.dto.request.MemberSnsUpdateRequest +import com.kw.api.domain.member.dto.response.MemberInfoResponse +import com.kw.data.domain.member.Member +import com.kw.data.domain.member.MemberTag +import com.kw.data.domain.member.Sns +import com.kw.data.domain.member.repository.MemberRepository +import com.kw.data.domain.tag.repository.TagRepository +import com.kw.infras3.service.S3Service +import org.springframework.data.repository.findByIdOrNull +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import org.springframework.web.multipart.MultipartFile + +@Service +@Transactional +class MemberService( + private val memberRepository: MemberRepository, + private val s3Service: S3Service, + private val tagRepository: TagRepository +) { + + @Transactional(readOnly = true) + fun getMemberInfo(member: Member): MemberInfoResponse { + return MemberInfoResponse.from(member) + } + + fun updateMemberNickname(member: Member, nickname: String): MemberInfoResponse { + isNicknameUnique(nickname) + member.updateMemberNickname(nickname) + return MemberInfoResponse.from(member) + } + + fun updateMemberProfileImage(member: Member, file: MultipartFile): MemberInfoResponse { + val profileImageUrl = s3Service.uploadImage(file) + member.updateMemberProfileImage(profileImageUrl) + return MemberInfoResponse.from(member) + } + + fun updateMemberSns(member: Member, memberSnsUpdateRequest: MemberSnsUpdateRequest): MemberInfoResponse { + updateMemberInfoSns(member, memberSnsUpdateRequest.SnsRequests) + return MemberInfoResponse.from(member) + } + + fun updateMemberTags(member: Member, tagIds: List): MemberInfoResponse { + val memberTags = tagIds.map { tagId -> + val tag = tagRepository.findByIdOrNull(tagId) ?: throw ApiException(ApiErrorCode.INCLUDE_NOT_FOUND_TAG) + MemberTag(member, tag) + }.toList() + + member.updateMemberTags(memberTags) + return MemberInfoResponse.from(member) + } + + fun getMemberInfoById(id: Long): MemberInfoResponse { + val member = memberRepository.findByIdOrNull(id) ?: throw ApiException(ApiErrorCode.NOT_FOUND_MEMBER) + return MemberInfoResponse.from(member) + } + + fun updateMemberInfo( + member: Member, + memberInfoUpdateRequest: MemberInfoUpdateRequest + ): MemberInfoResponse { + updateMemberNickname(member, memberInfoUpdateRequest.nickname) + updateMemberInfoSns(member, memberInfoUpdateRequest.snsRequests) + updateMemberTags(member, memberInfoUpdateRequest.tagIds) + + return MemberInfoResponse.from(member) + } + + fun isMemberNicknameDuplicate( + nickname: String + ) { + isNicknameUnique(nickname); + } + + private fun updateMemberInfoSns( + member: Member, + snsRequests: List + ) { + val snsList = snsRequests.map { snsRequest -> + Sns( + name = snsRequest.name, + url = snsRequest.url, + member = member + ) + }.toList() + + member.updateMemberSns(snsList) + } + + private fun isNicknameUnique(nickname: String) { + if (memberRepository.existsByNickname(nickname)) { + throw ApiException(ApiErrorCode.NICKNAME_ALREADY_EXISTS) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/controller/QuestionController.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/controller/QuestionController.kt new file mode 100644 index 0000000..c025cc0 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/controller/QuestionController.kt @@ -0,0 +1,70 @@ +package com.kw.api.domain.question.controller + +import com.kw.api.domain.question.dto.request.QuestionCreateRequest +import com.kw.api.domain.question.dto.request.QuestionReportRequest +import com.kw.api.domain.question.dto.request.QuestionSearchRequest +import com.kw.api.domain.question.dto.request.QuestionUpdateRequest +import com.kw.api.domain.question.dto.response.QuestionListResponse +import com.kw.api.domain.question.dto.response.QuestionReportResponse +import com.kw.api.domain.question.dto.response.QuestionResponse +import com.kw.api.domain.question.service.QuestionService +import com.kw.data.domain.member.Member +import com.kw.infrasecurity.resolver.AuthToMember +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import jakarta.validation.Valid +import org.springdoc.core.annotations.ParameterObject +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.* + +@Tag(name = "질문") +@RequestMapping("/api/v1") +@RestController +class QuestionController(val questionService: QuestionService) { + + @Operation(summary = "질문 생성") + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("/questions") + fun createQuestion( + @RequestBody @Valid request: QuestionCreateRequest, + @AuthToMember member: Member + ): QuestionResponse { + return questionService.createQuestion(request, member) + } + + @Operation(summary = "질문 수정") + @PatchMapping("/questions/{id}") + fun updateQuestion( + @PathVariable id: Long, + @RequestBody @Valid request: QuestionUpdateRequest, + @AuthToMember member: Member + ): QuestionResponse { + return questionService.updateQuestion(id, request, member) + } + + @Operation(summary = "질문 삭제") + @ResponseStatus(HttpStatus.NO_CONTENT) + @DeleteMapping("/questions/{id}") + fun deleteQuestion( + @PathVariable id: Long, + @AuthToMember member: Member + ) { + questionService.deleteQuestion(id, member) + } + + @Operation(summary = "질문 신고") + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("/questions/{id}/report") + fun reportQuestion( + @RequestBody request: QuestionReportRequest, + @PathVariable id: Long + ): QuestionReportResponse { + return questionService.reportQuestion(request, id) + } + + @Operation(summary = "질문 검색") + @GetMapping("/questions/search") + fun searchQuestion(@ParameterObject @ModelAttribute request: QuestionSearchRequest): QuestionListResponse { + return questionService.searchQuestion(request) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionCreateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionCreateRequest.kt new file mode 100644 index 0000000..20b777a --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionCreateRequest.kt @@ -0,0 +1,33 @@ +package com.kw.api.domain.question.dto.request + +import com.kw.data.domain.bundle.Bundle +import com.kw.data.domain.member.Member +import com.kw.data.domain.question.Question +import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.Size + +data class QuestionCreateRequest( + + @field:NotBlank(message = "내용은 필수입니다.") + @field:Size(max = 300, message = "내용은 최대 300자까지 입력해 주세요.") + val content: String, + + @field:Size(max = 1500, message = "답변은 최대 1500자까지 입력해 주세요.") + val answer: String?, + + val answerShareType: Question.AnswerShareType, + + val tagIds: List?, + + val bundleId: Long +) { + fun toEntity(bundle: Bundle, member: Member): Question { + return Question( + content = content, + answer = answer, + answerShareType = answerShareType, + bundle = bundle, + member = member + ) + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionReportRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionReportRequest.kt new file mode 100644 index 0000000..3111c62 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionReportRequest.kt @@ -0,0 +1,3 @@ +package com.kw.api.domain.question.dto.request + +data class QuestionReportRequest(val reason: String) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionSearchRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionSearchRequest.kt new file mode 100644 index 0000000..02dc278 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionSearchRequest.kt @@ -0,0 +1,11 @@ +package com.kw.api.domain.question.dto.request + +import com.kw.data.common.dto.SearchSortingType + +data class QuestionSearchRequest( + val sortingType: SearchSortingType?, + val tagIds: List?, + val keyword: String?, + val page: Long = 1, + val size: Long = 10 +) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionUpdateRequest.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionUpdateRequest.kt new file mode 100644 index 0000000..3562a60 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/request/QuestionUpdateRequest.kt @@ -0,0 +1,18 @@ +package com.kw.api.domain.question.dto.request + +import com.kw.data.domain.question.Question +import jakarta.validation.constraints.Size + +data class QuestionUpdateRequest( + + @field:Size(max = 300, message = "내용은 최대 300자까지 입력해 주세요.") + val content: String?, + + @field:Size(max = 1500, message = "답변은 최대 1500자까지 입력해 주세요.") + val answer: String?, + + val answerShareType: Question.AnswerShareType?, + + @field:Size(max = 3, message = "태그는 최대 3개까지 지정 가능합니다.") + val tagIds: List?, +) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionListResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionListResponse.kt new file mode 100644 index 0000000..f1ecced --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionListResponse.kt @@ -0,0 +1,5 @@ +package com.kw.api.domain.question.dto.response + +import com.kw.api.common.dto.PageResponse + +data class QuestionListResponse (val questionResponses : List, val pageResponse: PageResponse) diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionReportResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionReportResponse.kt new file mode 100644 index 0000000..7ab4247 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionReportResponse.kt @@ -0,0 +1,15 @@ +package com.kw.api.domain.question.dto.response + +import com.kw.data.domain.question.QuestionReport + +data class QuestionReportResponse(val id : Long?, + val reason : String?, + val questionId : Long?) { + companion object { + fun from(questionReport: QuestionReport) : QuestionReportResponse { + return QuestionReportResponse(id = questionReport.id, + reason = questionReport.reason, + questionId = questionReport.question.id) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionResponse.kt new file mode 100644 index 0000000..cde02d8 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/dto/response/QuestionResponse.kt @@ -0,0 +1,37 @@ +package com.kw.api.domain.question.dto.response + +import com.kw.api.domain.tag.dto.response.TagResponse +import com.kw.data.domain.question.Question +import java.time.LocalDateTime + +data class QuestionResponse( + val id: Long, + val content: String, + val answer: String?, + val answerShareType: Question.AnswerShareType, + val shareCount: Long, + val originId: Long?, + val tags: List, + val isHot: Boolean, + val writerId: Long, + val createdAt: LocalDateTime, + val updatedAt: LocalDateTime +) { + companion object { + fun from(question: Question): QuestionResponse { + return QuestionResponse( + id = question.id!!, + content = question.content, + answer = question.answer, + answerShareType = question.answerShareType, + shareCount = question.shareCount, + originId = question.originId, + tags = question.questionTags.map { it.tag }.map { TagResponse.from(it) }, + isHot = question.isHot(), + writerId = question.member.id!!, + createdAt = question.createdAt, + updatedAt = question.updatedAt + ) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/question/service/QuestionService.kt b/server/api/src/main/kotlin/com/kw/api/domain/question/service/QuestionService.kt new file mode 100644 index 0000000..69d4572 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/question/service/QuestionService.kt @@ -0,0 +1,120 @@ +package com.kw.api.domain.question.service + +import com.kw.api.common.dto.PageResponse +import com.kw.api.common.exception.ApiErrorCode +import com.kw.api.common.exception.ApiException +import com.kw.api.domain.question.dto.request.QuestionCreateRequest +import com.kw.api.domain.question.dto.request.QuestionReportRequest +import com.kw.api.domain.question.dto.request.QuestionSearchRequest +import com.kw.api.domain.question.dto.request.QuestionUpdateRequest +import com.kw.api.domain.question.dto.response.QuestionListResponse +import com.kw.api.domain.question.dto.response.QuestionReportResponse +import com.kw.api.domain.question.dto.response.QuestionResponse +import com.kw.data.domain.bundle.repository.BundleRepository +import com.kw.data.domain.member.Member +import com.kw.data.domain.question.Question +import com.kw.data.domain.question.QuestionReport +import com.kw.data.domain.question.QuestionTag +import com.kw.data.domain.question.dto.QuestionSearchDto +import com.kw.data.domain.question.repository.QuestionReportRepository +import com.kw.data.domain.question.repository.QuestionRepository +import com.kw.data.domain.tag.Tag +import com.kw.data.domain.tag.repository.TagRepository +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional + +@Service +@Transactional +class QuestionService( + private val questionRepository: QuestionRepository, + private val questionReportRepository: QuestionReportRepository, + private val tagRepository: TagRepository, + private val bundleRepository: BundleRepository, +) { + fun createQuestion(request: QuestionCreateRequest, member: Member): QuestionResponse { + val bundle = bundleRepository.findById(request.bundleId) + .orElseThrow { ApiException(ApiErrorCode.NOT_FOUND_BUNDLE) } + if (bundle.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + + val questionCount = questionRepository.countAllByBundleId(request.bundleId) + if (questionCount >= 100) { + throw ApiException(ApiErrorCode.OVER_QUESTION_LIMIT) + } + + val question = request.toEntity(bundle, member) + val tags = request.tagIds?.let { getExistTags(it) } ?: emptyList() + question.updateQuestionTags(tags.map { QuestionTag(question, it) }) + + val savedQuestion = questionRepository.save(question) + bundle.updateQuestionOrder((bundle.questionOrder + " " + savedQuestion.id).trim()) + + return QuestionResponse.from(savedQuestion) + } + + fun updateQuestion(id: Long, request: QuestionUpdateRequest, member: Member): QuestionResponse { + val question = getExistQuestion(id) + if (question.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + + request.content?.let { question.updateContent(it) } + request.answer?.let { question.updateAnswer(it) } + request.answerShareType?.let { question.updateAnswerShareStatus(it) } + request.tagIds?.let { it -> + val tags = getExistTags(it) + question.updateQuestionTags(tags.map { QuestionTag(question, it) }) + } + + return QuestionResponse.from(question) + } + + fun deleteQuestion(id: Long, member: Member) { + val question = getExistQuestion(id) + if (question.member.id != member.id) { + throw ApiException(ApiErrorCode.FORBIDDEN) + } + + questionRepository.delete(question) + } + + fun reportQuestion(request: QuestionReportRequest, id: Long): QuestionReportResponse { + val question = getExistQuestion(id) + + val report = QuestionReport( + reason = request.reason, + question = question + ) + return QuestionReportResponse.from(questionReportRepository.save(report)) + } + + @Transactional(readOnly = true) + fun searchQuestion(request: QuestionSearchRequest): QuestionListResponse { + val questionSearchDto = QuestionSearchDto( + sortingType = request.sortingType, + tagIds = request.tagIds, + keyword = request.keyword, + page = request.page, + size = request.size, + ) + val questions = questionRepository.searchQuestion(questionSearchDto) + val questionResponses = questions.map { QuestionResponse.from(it) } + val lastPageNum = questionRepository.getPageNum(questionSearchDto) + + return QuestionListResponse(questionResponses, PageResponse(questionSearchDto.page, lastPageNum)) + } + + private fun getExistTags(tagIds: List): List { + val tags = tagRepository.findAllById(tagIds) + if (tags.size != tagIds.size) { + throw ApiException(ApiErrorCode.INCLUDE_NOT_FOUND_TAG) + } + return tags + } + + private fun getExistQuestion(id: Long): Question { + return questionRepository.findById(id) + .orElseThrow { ApiException(ApiErrorCode.NOT_FOUND_QUESTION) } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/tag/controller/TagController.kt b/server/api/src/main/kotlin/com/kw/api/domain/tag/controller/TagController.kt new file mode 100644 index 0000000..a11ef56 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/tag/controller/TagController.kt @@ -0,0 +1,21 @@ +package com.kw.api.domain.tag.controller + +import com.kw.api.domain.tag.dto.response.TagResponse +import com.kw.api.domain.tag.service.TagService +import io.swagger.v3.oas.annotations.Operation +import io.swagger.v3.oas.annotations.tags.Tag +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@Tag(name = "태그") +@RestController +@RequestMapping("/api/v1") +class TagController(val tagService: TagService) { + + @Operation(summary = "태그 목록 조회") + @GetMapping("/tags") + fun getTags(): List { + return tagService.getTags() + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/tag/dto/response/TagResponse.kt b/server/api/src/main/kotlin/com/kw/api/domain/tag/dto/response/TagResponse.kt new file mode 100644 index 0000000..9f896f6 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/tag/dto/response/TagResponse.kt @@ -0,0 +1,17 @@ +package com.kw.api.domain.tag.dto.response + +import com.kw.data.domain.tag.Tag + +data class TagResponse( + val id: Long?, + val name: String +) { + companion object { + fun from(tag: Tag): TagResponse { + return TagResponse( + id = tag.id, + name = tag.name + ) + } + } +} diff --git a/server/api/src/main/kotlin/com/kw/api/domain/tag/service/TagService.kt b/server/api/src/main/kotlin/com/kw/api/domain/tag/service/TagService.kt new file mode 100644 index 0000000..65327e3 --- /dev/null +++ b/server/api/src/main/kotlin/com/kw/api/domain/tag/service/TagService.kt @@ -0,0 +1,17 @@ +package com.kw.api.domain.tag.service + +import com.kw.api.domain.tag.dto.response.TagResponse +import com.kw.data.domain.tag.repository.TagRepository +import jakarta.transaction.Transactional +import org.springframework.stereotype.Service + +@Service +@Transactional +class TagService(val tagRepository: TagRepository) { + fun getTags() : List { + val tags = tagRepository.findAll() + return tags.map { tag -> + TagResponse.from(tag) + } + } +} diff --git a/server/api/src/main/resources/application.properties b/server/api/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/server/api/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/server/api/src/main/resources/application.yml b/server/api/src/main/resources/application.yml new file mode 100644 index 0000000..768bf45 --- /dev/null +++ b/server/api/src/main/resources/application.yml @@ -0,0 +1,7 @@ +spring: + profiles: + include: rdb, security, redis, s3 + active: local + +server: + port: 8080 diff --git a/server/api/src/test/kotlin/com/kw/api/domain/bundle/service/BundleServiceTest.kt b/server/api/src/test/kotlin/com/kw/api/domain/bundle/service/BundleServiceTest.kt new file mode 100644 index 0000000..c86e438 --- /dev/null +++ b/server/api/src/test/kotlin/com/kw/api/domain/bundle/service/BundleServiceTest.kt @@ -0,0 +1,38 @@ +package com.kw.api.domain.bundle.service + +//TODO: 동시성 테스트 작성 +//@SpringBootTest +class BundleServiceTest { +// +// @BeforeEach +// fun setUp() { +// } +// +// @AfterEach +// fun tearDown() { +// } +// +// @Test +// fun 꾸러미_삭제_시_꾸러미_원본의_scrapeCount가_1_감소한다() { +// } +// +// @Test +// fun 꾸러미_삭제_시_질문들의_원본의_shareCount가_1씩_감소한다() { +// } +// +// @Test +// fun 꾸러미_스크랩_시_꾸러미_원본의_scrapeCount가_1_증가한다() { +// } +// +// @Test +// fun 꾸러미_스크랩_시_질문들의_원본의_shareCount가_1씩_증가한다() { +// } +// +// @Test +// fun 꾸러미에_질문들_추가_시_질문들의_원본의_shareCount가_1씩_증가한다() { +// } +// +// @Test +// fun 꾸러미에_질문들_제거_시_질문들의_원본의_shareCount가_1씩_감소한다() { +// } +} diff --git a/server/api/src/test/kotlin/com/kw/api/domain/question/service/QuestionServiceTest.kt b/server/api/src/test/kotlin/com/kw/api/domain/question/service/QuestionServiceTest.kt new file mode 100644 index 0000000..1016351 --- /dev/null +++ b/server/api/src/test/kotlin/com/kw/api/domain/question/service/QuestionServiceTest.kt @@ -0,0 +1,41 @@ +package com.kw.api.domain.question.service + +import com.kw.data.domain.question.repository.QuestionRepository +import com.kw.data.domain.tag.repository.TagRepository +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.transaction.annotation.Transactional + +@Transactional +@SpringBootTest +class QuestionServiceTest @Autowired constructor( + val questionService: QuestionService, + val questionRepository: QuestionRepository, + val tagRepository: TagRepository +) { +// @Test +// fun 질문_생성_성공() { +// // given +// val tag1 = tagRepository.save(Tag("백엔드")) +// val tag2 = tagRepository.save(Tag("프론트엔드")) +// +// val questionCreateRequest = QuestionCreateRequest( +// content = "test", +// shareStatus = Question.ShareStatus.PUBLIC, +// originId = null, +// tagIds = listOf(tag1.id, tag2.id) +// ) +// +// // when +// val questionResponse = questionService.createQuestion(questionCreateRequest = questionCreateRequest) +// +// // then +// val question = questionRepository.findById(questionResponse.id!!).orElseThrow { RuntimeException() } +// Assertions.assertEquals(question.id, questionResponse.id) +// Assertions.assertEquals(question.content, questionResponse.content) +// val tagIds = question.questionTags!!.map { questionTag -> +// questionTag.tag.id +// } +// Assertions.assertEquals(tagIds, questionResponse.tagIds) +// } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 423ac2e..150ae19 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,5 +2,8 @@ rootProject.name = "kiwing" include("data") include("infra") +include("infra:infra-security") +include("infra:infra-redis") +include("infra:infra-s3") include("server") include("server:api") From ac86ec5cd30c320f16fb9dc9e88bf534706742bf Mon Sep 17 00:00:00 2001 From: Kyunghun Kim <86098663+KarmaPol@users.noreply.github.com> Date: Sat, 9 Mar 2024 12:43:14 +0900 Subject: [PATCH 2/3] Update deploy-prod.yml --- .github/workflows/deploy-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 9f7efea..a923043 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -73,7 +73,7 @@ jobs: # Build a docker container and # push it to ECR so that it can # be deployed to ECS. - docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE prod . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT From a7b7292ba785237f646221c362bf83564a3cd8d0 Mon Sep 17 00:00:00 2001 From: Hanna Lee <8annahxxl@gmail.com> Date: Sat, 9 Mar 2024 12:51:42 +0900 Subject: [PATCH 3/3] Update deploy-prod.yml --- .github/workflows/deploy-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index a923043..1778a84 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -73,7 +73,7 @@ jobs: # Build a docker container and # push it to ECR so that it can # be deployed to ECS. - docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE prod . + docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg PROFILE=prod . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT