From 6a43216ccbf754977972924513442c2a43fc3912 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Tue, 23 Jan 2024 22:59:58 +0900 Subject: [PATCH 01/15] =?UTF-8?q?:sparkles:=20Feat=20:=20=EB=A9=80?= =?UTF-8?q?=ED=8B=B0=EB=AA=A8=EB=93=88=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20?= =?UTF-8?q?FCM=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Briefing-Api/build.gradle | 60 +++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../briefingapi/BriefingApiApplication.java | 34 +++ .../annotation/CacheEvictByBriefingId.java | 2 +- .../aspect/CacheEvictByBriefingIdAspect.java | 9 +- .../batch/job/DailyPushJobConfig.java | 49 ++++ .../batch/scheduler/DailyPush.java | 39 +++ .../briefing/business/BriefingConverter.java | 12 +- .../briefing/business/BriefingFacade.java | 29 +- .../briefing/business/BriefingV2Facade.java | 16 +- .../context/BriefingQueryContext.java | 10 +- .../context/BriefingQueryContextFactory.java | 6 +- .../service/ArticleCommandService.java | 7 +- .../BriefingArticleCommandService.java | 7 +- .../service/BriefingCommandService.java | 6 +- .../service/BriefingQueryService.java | 17 +- .../strategy/BriefingQueryStrategy.java | 9 +- .../strategy/BriefingV1QueryStrategy.java | 16 +- .../strategy/BriefingV2QueryStrategy.java | 11 +- .../briefing/presentation/BriefingApi.java | 19 +- .../briefing/presentation/BriefingV2Api.java | 14 +- .../presentation/dto/BriefingRequestDTO.java | 9 +- .../dto/BriefingRequestParam.java | 6 +- .../presentation/dto/BriefingResponseDTO.java | 17 +- .../briefingapi}/config/CacheConfig.java | 2 +- .../briefingapi}/config/GlobalWebConfig.java | 6 +- .../config/RestTemplateConfig.java | 2 +- .../briefingapi}/config/SwaggerConfig.java | 2 +- .../briefingapi/config/firebaseConfig.java | 37 +++ .../exception/JwtAuthenticationException.java | 6 +- .../exception/handler/ExceptionAdvice.java | 12 +- .../handler/GlobalControllerAdvice.java | 6 +- .../fcm/implementation/FcmCommandService.java | 71 +++++ .../fcm/implementation/FcmQueryService.java | 4 + .../briefingapi/fcm/presentation/FcmApi.java | 35 +++ .../fcm/presentation/dto/FcmRequest.java | 11 + .../member/business/MemberConverter.java | 15 +- .../member/business/MemberFacade.java | 62 ++++- .../implement/MemberCommandService.java | 52 +++- .../member/implement/MemberQueryService.java | 17 +- .../member/presentation/MemberApi.java | 71 +++-- .../member/presentation/MemberV2Api.java | 19 +- .../presentation/dto/MemberRequest.java | 11 +- .../presentation/dto/MemberResponse.java | 10 +- .../repository/RefreshTokenRepository.java | 4 +- .../redis/service/RedisService.java | 10 +- .../redis/service/RedisServiceImpl.java | 20 +- .../root/presentation/RootApi.java | 2 +- .../scrap/business/ScrapConverter.java | 10 +- .../scrap/business/ScrapFacade.java | 27 +- .../scrap/business/ScrapV2Facade.java | 26 +- .../scrap/implement/ScrapCommandService.java | 10 +- .../scrap/implement/ScrapQueryService.java | 10 +- .../scrap/presentation/ScrapApi.java | 11 +- .../scrap/presentation/ScrapV2Api.java | 13 +- .../scrap/presentation/dto/ScrapRequest.java | 2 +- .../scrap/presentation/dto/ScrapResponse.java | 7 +- .../security/config/SecurityConfig.java | 16 +- .../security/filter/JwtRequestFilter.java | 5 +- .../handler/JwtAccessDeniedHandler.java | 6 +- .../handler/JwtAuthenticationEntryPoint.java | 6 +- .../JwtAuthenticationExceptionHandler.java | 8 +- .../handler/SwaggerLoginSuccessHandler.java | 2 +- .../handler/annotation/AuthMember.java | 2 +- .../annotation/AuthUserArgumentResolver.java | 8 +- .../security/provider/TokenProvider.java | 7 +- .../annotation/CheckSameMember.java | 5 +- .../validator/CheckSameMemberValidator.java | 6 +- .../src/main/resources/application.yml | 167 ++++++++++++ .../BriefingApiApplicationTests.java | 13 + Briefing-Batch/build.gradle | 17 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../BriefingBatchApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../BriefingBatchApplicationTests.java | 13 + Briefing-FCM/.gitignore | 37 +++ Briefing-FCM/build.gradle | 25 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + Briefing-FCM/gradlew | 249 ++++++++++++++++++ Briefing-FCM/gradlew.bat | 92 +++++++ Briefing-FCM/settings.gradle | 1 + .../briefingfcm/BriefingFcmApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../BriefingFcmApplicationTests.java | 13 + build.gradle | 77 +++--- core/Briefing-Common/build.gradle | 38 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../briefingcommon/entity}/QArticle.java | 6 +- .../entity}/QBaseDateTimeEntity.java | 4 +- .../briefingcommon/entity}/QBriefing.java | 12 +- .../entity}/QBriefingArticle.java | 6 +- .../briefingcommon/entity/QFcmToken.java | 53 ++++ .../briefingcommon/entity}/QMember.java | 14 +- .../briefingcommon/entity}/QScrap.java | 14 +- .../briefingcommon/DomainPackageLocation.java | 4 + .../com/example/briefingcommon/JpaConfig.java | 13 + .../briefingcommon}/QueryDslConfig.java | 3 +- .../common/exception/AppleOAuthException.java | 11 + .../common/exception/BriefingException.java | 11 + .../common/exception/ChattingException.java | 11 + .../exception/CustomFeignClientException.java | 12 + .../common/exception/MemberException.java | 10 + .../exception/RefreshTokenException.java | 10 + .../common/exception/ScrapException.java | 11 + .../exception/common/ApiErrorResult.java | 3 +- .../exception/common/BaseException.java | 3 +- .../exception/common/BaseExceptionType.java | 3 +- .../common/exception/common/ErrorCode.java | 108 ++++++++ .../exception/common/GeneralException.java | 3 +- .../converter/APIVersionRequestConverter.java | 7 +- .../BriefingTypeRequestConverter.java | 5 +- .../converter/GptModelRequestConverter.java | 5 +- .../converter/SocialTypeRequestConverter.java | 5 +- .../converter/TimeOfDayConverter.java | 5 +- .../presentation/response/CommonResponse.java | 6 +- .../presentation/response/PageResponse.java | 2 +- .../domain/repository/FcmTokenRepository.java | 13 + .../repository/article/ArticleRepository.java | 9 + .../article/BriefingArticleRepository.java | 9 + .../article}/BriefingCustomRepository.java | 9 +- .../BriefingCustomRepositoryImpl.java | 17 +- .../article/BriefingRepository.java | 24 ++ .../repository/member}/MemberRepository.java | 10 +- .../scrap/ScrapCustomRepository.java | 3 + .../scrap}/ScrapCustomRepositoryImpl.java | 2 +- .../repository/scrap}/ScrapRepository.java | 9 +- .../briefingcommon/entity}/Article.java | 4 +- .../entity}/BaseDateTimeEntity.java | 2 +- .../briefingcommon/entity}/Briefing.java | 10 +- .../entity}/BriefingArticle.java | 3 +- .../briefingcommon/entity/FcmToken.java | 22 ++ .../briefingcommon/entity}/Member.java | 10 +- .../example/briefingcommon/entity}/Scrap.java | 5 +- .../entity}/enums/APIVersion.java | 6 +- .../entity}/enums/BriefingType.java | 6 +- .../entity}/enums/GptModel.java | 6 +- .../entity}/enums/MemberRole.java | 2 +- .../entity}/enums/MemberStatus.java | 2 +- .../entity}/enums/SocialType.java | 2 +- .../entity}/enums/TimeOfDay.java | 7 +- .../entity/redis}/RefreshToken.java | 4 +- .../src/main/resources/application.properties | 1 + .../BriefingCommonApplicationTests.java | 13 + core/Briefing-Infra/build.gradle | 23 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../FeignClientExceptionErrorDecoder.java | 6 +- .../oauth/apple/client/AppleOauth2Client.java | 7 +- .../config/AppleOauth2FeignConfiguration.java | 4 +- .../feign/oauth/apple/dto/ApplePublicKey.java | 2 +- .../oauth/apple/dto/ApplePublicKeyList.java | 6 +- .../google/client/GoogleOauth2Client.java | 9 +- .../GoogleOauth2FeignConfiguration.java | 4 +- .../oauth/google/dto/GoogleUserInfo.java | 2 +- .../src/main/resources/application.properties | 1 + .../BriefingInfraApplicationTests.java | 13 + settings.gradle | 10 + .../java/briefing/BriefingApplication.java | 30 --- .../domain/repository/ArticleRepository.java | 7 - .../repository/BriefingArticleRepository.java | 7 - .../domain/repository/BriefingRepository.java | 18 -- .../briefing/exception/BriefingException.java | 10 - .../common/exception/AppleOAuthException.java | 10 - .../common/exception/ChattingException.java | 10 - .../exception/CustomFeignClientException.java | 11 - .../exception/RefreshTokenException.java | 10 - .../common/exception/common/ErrorCode.java | 107 -------- .../briefing/config/JpaAuditingConfig.java | 8 - .../member/exception/MemberException.java | 10 - .../repository/ScrapCustomRepository.java | 3 - .../scrap/exception/ScrapException.java | 10 - src/main/resources/application.yml | 2 + 176 files changed, 2062 insertions(+), 731 deletions(-) create mode 100644 Briefing-Api/build.gradle create mode 100644 Briefing-Api/gradle/wrapper/gradle-wrapper.jar create mode 100644 Briefing-Api/gradle/wrapper/gradle-wrapper.properties create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/BriefingApiApplication.java rename {src/main/java/briefing/common => Briefing-Api/src/main/java/com/example/briefingapi}/aop/annotation/CacheEvictByBriefingId.java (88%) rename {src/main/java/briefing/common => Briefing-Api/src/main/java/com/example/briefingapi}/aop/aspect/CacheEvictByBriefingIdAspect.java (91%) create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/batch/job/DailyPushJobConfig.java create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/batch/scheduler/DailyPush.java rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/business/BriefingConverter.java (95%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/business/BriefingFacade.java (75%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/business/BriefingV2Facade.java (73%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/context/BriefingQueryContext.java (64%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/context/BriefingQueryContextFactory.java (82%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/service/ArticleCommandService.java (65%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/service/BriefingArticleCommandService.java (67%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/service/BriefingCommandService.java (74%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/service/BriefingQueryService.java (63%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/strategy/BriefingQueryStrategy.java (50%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/strategy/BriefingV1QueryStrategy.java (74%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/implement/strategy/BriefingV2QueryStrategy.java (80%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/presentation/BriefingApi.java (82%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/presentation/BriefingV2Api.java (75%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/presentation/dto/BriefingRequestDTO.java (78%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/presentation/dto/BriefingRequestParam.java (75%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/briefing/presentation/dto/BriefingResponseDTO.java (86%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/config/CacheConfig.java (98%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/config/GlobalWebConfig.java (88%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/config/RestTemplateConfig.java (88%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/config/SwaggerConfig.java (97%) create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/config/firebaseConfig.java rename {src/main/java/briefing/common => Briefing-Api/src/main/java/com/example/briefingapi}/exception/JwtAuthenticationException.java (67%) rename {src/main/java/briefing/common => Briefing-Api/src/main/java/com/example/briefingapi}/exception/handler/ExceptionAdvice.java (95%) rename {src/main/java/briefing/common => Briefing-Api/src/main/java/com/example/briefingapi}/exception/handler/GlobalControllerAdvice.java (79%) create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmCommandService.java create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmQueryService.java create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java create mode 100644 Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/dto/FcmRequest.java rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/business/MemberConverter.java (81%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/business/MemberFacade.java (57%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/implement/MemberCommandService.java (65%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/implement/MemberQueryService.java (75%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/presentation/MemberApi.java (64%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/presentation/MemberV2Api.java (89%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/presentation/dto/MemberRequest.java (53%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/member/presentation/dto/MemberResponse.java (83%) rename {src/main/java/briefing/infra => Briefing-Api/src/main/java/com/example/briefingapi}/redis/repository/RefreshTokenRepository.java (57%) rename {src/main/java/briefing/infra => Briefing-Api/src/main/java/com/example/briefingapi}/redis/service/RedisService.java (55%) rename {src/main/java/briefing/infra => Briefing-Api/src/main/java/com/example/briefingapi}/redis/service/RedisServiceImpl.java (84%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/root/presentation/RootApi.java (93%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/business/ScrapConverter.java (91%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/business/ScrapFacade.java (69%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/business/ScrapV2Facade.java (71%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/implement/ScrapCommandService.java (66%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/implement/ScrapQueryService.java (75%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/presentation/ScrapApi.java (82%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/presentation/ScrapV2Api.java (81%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/presentation/dto/ScrapRequest.java (83%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/scrap/presentation/dto/ScrapResponse.java (91%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/config/SecurityConfig.java (93%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/filter/JwtRequestFilter.java (92%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/handler/JwtAccessDeniedHandler.java (89%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/handler/JwtAuthenticationEntryPoint.java (89%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/handler/JwtAuthenticationExceptionHandler.java (85%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/handler/SwaggerLoginSuccessHandler.java (93%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/handler/annotation/AuthMember.java (81%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/handler/annotation/AuthUserArgumentResolver.java (91%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/security/provider/TokenProvider.java (96%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/validation/annotation/CheckSameMember.java (79%) rename {src/main/java/briefing => Briefing-Api/src/main/java/com/example/briefingapi}/validation/validator/CheckSameMemberValidator.java (90%) create mode 100644 Briefing-Api/src/main/resources/application.yml create mode 100644 Briefing-Api/src/test/java/com/example/briefingapi/BriefingApiApplicationTests.java create mode 100644 Briefing-Batch/build.gradle create mode 100644 Briefing-Batch/gradle/wrapper/gradle-wrapper.jar create mode 100644 Briefing-Batch/gradle/wrapper/gradle-wrapper.properties create mode 100644 Briefing-Batch/src/main/java/com/example/briefingbatch/BriefingBatchApplication.java create mode 100644 Briefing-Batch/src/main/resources/application.properties create mode 100644 Briefing-Batch/src/test/java/com/example/briefingbatch/BriefingBatchApplicationTests.java create mode 100644 Briefing-FCM/.gitignore create mode 100644 Briefing-FCM/build.gradle create mode 100644 Briefing-FCM/gradle/wrapper/gradle-wrapper.jar create mode 100644 Briefing-FCM/gradle/wrapper/gradle-wrapper.properties create mode 100644 Briefing-FCM/gradlew create mode 100644 Briefing-FCM/gradlew.bat create mode 100644 Briefing-FCM/settings.gradle create mode 100644 Briefing-FCM/src/main/java/com/example/briefingfcm/BriefingFcmApplication.java create mode 100644 Briefing-FCM/src/main/resources/application.properties create mode 100644 Briefing-FCM/src/test/java/com/example/briefingfcm/BriefingFcmApplicationTests.java create mode 100644 core/Briefing-Common/build.gradle create mode 100644 core/Briefing-Common/gradle/wrapper/gradle-wrapper.jar create mode 100644 core/Briefing-Common/gradle/wrapper/gradle-wrapper.properties rename {src/main/generated/briefing/briefing/domain => core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity}/QArticle.java (84%) rename {src/main/generated/briefing/common/domain => core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity}/QBaseDateTimeEntity.java (91%) rename {src/main/generated/briefing/briefing/domain => core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity}/QBriefing.java (70%) rename {src/main/generated/briefing/briefing/domain => core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity}/QBriefingArticle.java (89%) create mode 100644 core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QFcmToken.java rename {src/main/generated/briefing/member/domain => core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity}/QMember.java (59%) rename {src/main/generated/briefing/scrap/domain => core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity}/QScrap.java (71%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/DomainPackageLocation.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/JpaConfig.java rename {src/main/java/briefing/config => core/Briefing-Common/src/main/java/com/example/briefingcommon}/QueryDslConfig.java (81%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/AppleOAuthException.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/BriefingException.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ChattingException.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/CustomFeignClientException.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/MemberException.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/RefreshTokenException.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ScrapException.java rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/exception/common/ApiErrorResult.java (91%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/exception/common/BaseException.java (77%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/exception/common/BaseExceptionType.java (68%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ErrorCode.java rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/exception/common/GeneralException.java (96%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/converter/APIVersionRequestConverter.java (70%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/converter/BriefingTypeRequestConverter.java (70%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/converter/GptModelRequestConverter.java (69%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/converter/SocialTypeRequestConverter.java (67%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/converter/TimeOfDayConverter.java (69%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/response/CommonResponse.java (79%) rename {src/main/java/briefing => core/Briefing-Common/src/main/java/com/example/briefingcommon}/common/presentation/response/PageResponse.java (76%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/FcmTokenRepository.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/ArticleRepository.java create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingArticleRepository.java rename {src/main/java/briefing/briefing/domain/repository => core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article}/BriefingCustomRepository.java (58%) rename {src/main/java/briefing/briefing/domain/repository => core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article}/BriefingCustomRepositoryImpl.java (93%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingRepository.java rename {src/main/java/briefing/member/domain/repository => core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/member}/MemberRepository.java (58%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepository.java rename {src/main/java/briefing/scrap/domain/repository => core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap}/ScrapCustomRepositoryImpl.java (69%) rename {src/main/java/briefing/scrap/domain/repository => core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap}/ScrapRepository.java (74%) rename {src/main/java/briefing/briefing/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/Article.java (90%) rename {src/main/java/briefing/common/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/BaseDateTimeEntity.java (93%) rename {src/main/java/briefing/briefing/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/Briefing.java (88%) rename {src/main/java/briefing/briefing/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/BriefingArticle.java (91%) create mode 100644 core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/FcmToken.java rename {src/main/java/briefing/member/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/Member.java (78%) rename {src/main/java/briefing/scrap/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/Scrap.java (82%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/APIVersion.java (76%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/BriefingType.java (75%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/GptModel.java (77%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/MemberRole.java (82%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/MemberStatus.java (80%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/SocialType.java (93%) rename {src/main/java/briefing/common => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity}/enums/TimeOfDay.java (77%) rename {src/main/java/briefing/infra/redis/domain => core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/redis}/RefreshToken.java (90%) create mode 100644 core/Briefing-Common/src/main/resources/application.properties create mode 100644 core/Briefing-Common/src/test/java/com/example/briefingcommon/BriefingCommonApplicationTests.java create mode 100644 core/Briefing-Infra/build.gradle create mode 100644 core/Briefing-Infra/gradle/wrapper/gradle-wrapper.jar create mode 100644 core/Briefing-Infra/gradle/wrapper/gradle-wrapper.properties rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/decoder/FeignClientExceptionErrorDecoder.java (88%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/apple/client/AppleOauth2Client.java (66%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java (79%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/apple/dto/ApplePublicKey.java (93%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/apple/dto/ApplePublicKeyList.java (72%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/google/client/GoogleOauth2Client.java (63%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java (79%) rename {src/main/java/briefing/infra => core/Briefing-Infra/src/main/java/com/example/briefinginfra}/feign/oauth/google/dto/GoogleUserInfo.java (87%) create mode 100644 core/Briefing-Infra/src/main/resources/application.properties create mode 100644 core/Briefing-Infra/src/test/java/com/example/briefinginfra/BriefingInfraApplicationTests.java delete mode 100644 src/main/java/briefing/BriefingApplication.java delete mode 100644 src/main/java/briefing/briefing/domain/repository/ArticleRepository.java delete mode 100644 src/main/java/briefing/briefing/domain/repository/BriefingArticleRepository.java delete mode 100644 src/main/java/briefing/briefing/domain/repository/BriefingRepository.java delete mode 100644 src/main/java/briefing/briefing/exception/BriefingException.java delete mode 100644 src/main/java/briefing/common/exception/AppleOAuthException.java delete mode 100644 src/main/java/briefing/common/exception/ChattingException.java delete mode 100644 src/main/java/briefing/common/exception/CustomFeignClientException.java delete mode 100644 src/main/java/briefing/common/exception/RefreshTokenException.java delete mode 100644 src/main/java/briefing/common/exception/common/ErrorCode.java delete mode 100644 src/main/java/briefing/config/JpaAuditingConfig.java delete mode 100644 src/main/java/briefing/member/exception/MemberException.java delete mode 100644 src/main/java/briefing/scrap/domain/repository/ScrapCustomRepository.java delete mode 100644 src/main/java/briefing/scrap/exception/ScrapException.java diff --git a/Briefing-Api/build.gradle b/Briefing-Api/build.gradle new file mode 100644 index 0000000..19e57e8 --- /dev/null +++ b/Briefing-Api/build.gradle @@ -0,0 +1,60 @@ + +tasks.named('bootJar') { //빌드할 때 bootjar 파일로 하겠다는 의미 + enabled = true +} + +tasks.named('jar') { //빌드할 때 jar 파일로 하겠다는 의미 + enabled = false +} + +dependencies { + + implementation project(':core:Briefing-Common') + implementation project(':core:Briefing-Infra') + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + // querydsl + // == 스프링 부트 3.0 이상 == + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE' + implementation 'org.springframework.boot:spring-boot-starter-security' + + implementation 'io.springfox:springfox-swagger2:2.9.2' + implementation 'io.springfox:springfox-swagger-ui:2.9.2' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' + implementation 'mysql:mysql-connector-java' // 추가 작성 + + implementation platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.3") + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' +// runtimeOnly 'org.postgresql:postgresql' +// runtimeOnly 'com.mysql:mysql-connector-j' + + // jwt 의존성 + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + + // fcm 의존성 + implementation 'com.google.firebase:firebase-admin:9.1.1' + + //spring batch 의존성 + implementation 'org.springframework.boot:spring-boot-starter-batch' +} + +tasks.named('test') { + useJUnitPlatform() +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/Briefing-Api/gradle/wrapper/gradle-wrapper.jar b/Briefing-Api/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/Briefing-Api/gradle/wrapper/gradle-wrapper.properties b/Briefing-Api/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Briefing-Api/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/Briefing-Api/src/main/java/com/example/briefingapi/BriefingApiApplication.java b/Briefing-Api/src/main/java/com/example/briefingapi/BriefingApiApplication.java new file mode 100644 index 0000000..b4c9fe0 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/BriefingApiApplication.java @@ -0,0 +1,34 @@ +package com.example.briefingapi; + +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.servers.Server; +import lombok.RequiredArgsConstructor; +import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.FeignAutoConfiguration; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; + + +@OpenAPIDefinition( + servers = { + @Server(url = "http://localhost:8080", description = "local server"), + @Server(url = "https://dev.briefing.store", description = "dev server"), + @Server(url = "https://api.newsbreifing.store", description = "release server") + }) +@SpringBootApplication(scanBasePackages = {"com.example.briefingapi","com.example.briefingcommon","com.example.briefinginfra"}) +@RequiredArgsConstructor +@EnableCaching +@EnableFeignClients(basePackages = "com.example.briefinginfra") +@EnableRedisRepositories +@ImportAutoConfiguration({FeignAutoConfiguration.class}) +public class BriefingApiApplication { + + public static void main(String[] args) { + SpringApplication.run(BriefingApiApplication.class, args); + } + +} diff --git a/src/main/java/briefing/common/aop/annotation/CacheEvictByBriefingId.java b/Briefing-Api/src/main/java/com/example/briefingapi/aop/annotation/CacheEvictByBriefingId.java similarity index 88% rename from src/main/java/briefing/common/aop/annotation/CacheEvictByBriefingId.java rename to Briefing-Api/src/main/java/com/example/briefingapi/aop/annotation/CacheEvictByBriefingId.java index 22d7db4..2229df6 100644 --- a/src/main/java/briefing/common/aop/annotation/CacheEvictByBriefingId.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/aop/annotation/CacheEvictByBriefingId.java @@ -1,4 +1,4 @@ -package briefing.common.aop.annotation; +package com.example.briefingapi.aop.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/briefing/common/aop/aspect/CacheEvictByBriefingIdAspect.java b/Briefing-Api/src/main/java/com/example/briefingapi/aop/aspect/CacheEvictByBriefingIdAspect.java similarity index 91% rename from src/main/java/briefing/common/aop/aspect/CacheEvictByBriefingIdAspect.java rename to Briefing-Api/src/main/java/com/example/briefingapi/aop/aspect/CacheEvictByBriefingIdAspect.java index e76350d..73624af 100644 --- a/src/main/java/briefing/common/aop/aspect/CacheEvictByBriefingIdAspect.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/aop/aspect/CacheEvictByBriefingIdAspect.java @@ -1,7 +1,10 @@ -package briefing.common.aop.aspect; +package com.example.briefingapi.aop.aspect; import java.util.Optional; +import com.example.briefingapi.aop.annotation.CacheEvictByBriefingId; +import com.example.briefingcommon.domain.repository.article.BriefingRepository; +import com.example.briefingcommon.entity.Briefing; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; import org.aspectj.lang.annotation.Aspect; @@ -13,9 +16,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.stereotype.Component; -import briefing.briefing.domain.Briefing; -import briefing.briefing.domain.repository.BriefingRepository; -import briefing.common.aop.annotation.CacheEvictByBriefingId; + import lombok.RequiredArgsConstructor; @Aspect diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/batch/job/DailyPushJobConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/batch/job/DailyPushJobConfig.java new file mode 100644 index 0000000..c28f86f --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/batch/job/DailyPushJobConfig.java @@ -0,0 +1,49 @@ +package com.example.briefingapi.batch.job; + +import com.example.briefingapi.fcm.implementation.FcmCommandService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.job.builder.JobBuilder; +import org.springframework.batch.core.repository.JobRepository; +import org.springframework.batch.core.step.builder.StepBuilder; +import org.springframework.batch.core.step.tasklet.Tasklet; +import org.springframework.batch.repeat.RepeatStatus; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.PlatformTransactionManager; + +@Slf4j +@Configuration +@RequiredArgsConstructor +public class DailyPushJobConfig { + + private final FcmCommandService fcmCommandService; + + @Value("${fcm.topic.daily-push}") + private String dailyPushTopic; + + @Bean + public Job dailyPushJob(JobRepository jobRepository, Step simpleStep1) { + return new JobBuilder("daily Push", jobRepository) + .start(simpleStep1) + .build(); + } + + @Bean + public Step dailyPushStep(JobRepository jobRepository, Tasklet testTasklet, PlatformTransactionManager platformTransactionManager){ + return new StepBuilder("dailyPushStep", jobRepository) + .tasklet(testTasklet, platformTransactionManager).build(); + } + @Bean + public Tasklet dailyPushTasklet(){ + return ((contribution, chunkContext) -> { + log.info("request FCM!!"); + fcmCommandService.sendMessage(dailyPushTopic); + return RepeatStatus.FINISHED; + }); + } +} + diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/batch/scheduler/DailyPush.java b/Briefing-Api/src/main/java/com/example/briefingapi/batch/scheduler/DailyPush.java new file mode 100644 index 0000000..e529904 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/batch/scheduler/DailyPush.java @@ -0,0 +1,39 @@ +package com.example.briefingapi.batch.scheduler; + +import com.example.briefingapi.fcm.implementation.FcmCommandService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecutionException; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.launch.JobLauncher; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +@EnableScheduling +public class DailyPush { + + private final JobLauncher jobLauncher; + + private final Job job; + + // 초 분 시 일 월 요일 + @Scheduled(cron = "0 0 8,17 * * *") + public void requestDailyTopicFcmJob(){ + log.info("daily alarm launched"); + try { + JobParameters jobParameters = new JobParametersBuilder() + .addLong("executedTime", System.currentTimeMillis()) + .toJobParameters(); + + jobLauncher.run(job, jobParameters); + } catch (JobExecutionException e) { + log.error("SeatReleaseScheduler error : ", e); + } + } +} diff --git a/src/main/java/briefing/briefing/business/BriefingConverter.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingConverter.java similarity index 95% rename from src/main/java/briefing/briefing/business/BriefingConverter.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingConverter.java index 0b95a97..7ce474e 100644 --- a/src/main/java/briefing/briefing/business/BriefingConverter.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingConverter.java @@ -1,14 +1,14 @@ -package briefing.briefing.business; +package com.example.briefingapi.briefing.business; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; -import briefing.briefing.domain.Article; -import briefing.briefing.domain.Briefing; -import briefing.briefing.presentation.dto.BriefingRequestDTO; -import briefing.briefing.presentation.dto.BriefingResponseDTO; -import briefing.common.enums.BriefingType; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestDTO; +import com.example.briefingapi.briefing.presentation.dto.BriefingResponseDTO; +import com.example.briefingcommon.entity.Article; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.BriefingType; public class BriefingConverter { diff --git a/src/main/java/briefing/briefing/business/BriefingFacade.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingFacade.java similarity index 75% rename from src/main/java/briefing/briefing/business/BriefingFacade.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingFacade.java index 87a7e87..7506647 100644 --- a/src/main/java/briefing/briefing/business/BriefingFacade.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingFacade.java @@ -1,24 +1,25 @@ -package briefing.briefing.business; +package com.example.briefingapi.briefing.business; import java.util.List; import java.util.Optional; +import com.example.briefingapi.briefing.implement.service.ArticleCommandService; +import com.example.briefingapi.briefing.implement.service.BriefingArticleCommandService; +import com.example.briefingapi.briefing.implement.service.BriefingCommandService; +import com.example.briefingapi.briefing.implement.service.BriefingQueryService; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestDTO; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingapi.briefing.presentation.dto.BriefingResponseDTO; +import com.example.briefingapi.scrap.implement.ScrapQueryService; +import com.example.briefingcommon.entity.Article; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.BriefingArticle; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import briefing.briefing.domain.Article; -import briefing.briefing.domain.Briefing; -import briefing.briefing.domain.BriefingArticle; -import briefing.briefing.implement.service.ArticleCommandService; -import briefing.briefing.implement.service.BriefingArticleCommandService; -import briefing.briefing.implement.service.BriefingCommandService; -import briefing.briefing.implement.service.BriefingQueryService; -import briefing.briefing.presentation.dto.BriefingRequestDTO; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.briefing.presentation.dto.BriefingResponseDTO; -import briefing.common.enums.APIVersion; -import briefing.member.domain.Member; -import briefing.scrap.implement.ScrapQueryService; + import lombok.RequiredArgsConstructor; @Component diff --git a/src/main/java/briefing/briefing/business/BriefingV2Facade.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingV2Facade.java similarity index 73% rename from src/main/java/briefing/briefing/business/BriefingV2Facade.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingV2Facade.java index 8bf5957..af41716 100644 --- a/src/main/java/briefing/briefing/business/BriefingV2Facade.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/business/BriefingV2Facade.java @@ -1,18 +1,18 @@ -package briefing.briefing.business; +package com.example.briefingapi.briefing.business; import java.util.List; import java.util.Optional; +import com.example.briefingapi.briefing.implement.service.BriefingQueryService; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingapi.briefing.presentation.dto.BriefingResponseDTO; +import com.example.briefingapi.scrap.implement.ScrapQueryService; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import briefing.briefing.domain.Briefing; -import briefing.briefing.implement.service.BriefingQueryService; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.briefing.presentation.dto.BriefingResponseDTO; -import briefing.common.enums.APIVersion; -import briefing.member.domain.Member; -import briefing.scrap.implement.ScrapQueryService; import lombok.RequiredArgsConstructor; @Component diff --git a/src/main/java/briefing/briefing/implement/context/BriefingQueryContext.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/context/BriefingQueryContext.java similarity index 64% rename from src/main/java/briefing/briefing/implement/context/BriefingQueryContext.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/context/BriefingQueryContext.java index d9ab7fc..3690294 100644 --- a/src/main/java/briefing/briefing/implement/context/BriefingQueryContext.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/context/BriefingQueryContext.java @@ -1,11 +1,13 @@ -package briefing.briefing.implement.context; +package com.example.briefingapi.briefing.implement.context; import java.util.List; import java.util.Optional; -import briefing.briefing.domain.Briefing; -import briefing.briefing.implement.strategy.BriefingQueryStrategy; -import briefing.briefing.presentation.dto.BriefingRequestParam; + + +import com.example.briefingapi.briefing.implement.strategy.BriefingQueryStrategy; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingcommon.entity.Briefing; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/src/main/java/briefing/briefing/implement/context/BriefingQueryContextFactory.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/context/BriefingQueryContextFactory.java similarity index 82% rename from src/main/java/briefing/briefing/implement/context/BriefingQueryContextFactory.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/context/BriefingQueryContextFactory.java index c2c7934..8f393a1 100644 --- a/src/main/java/briefing/briefing/implement/context/BriefingQueryContextFactory.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/context/BriefingQueryContextFactory.java @@ -1,14 +1,14 @@ -package briefing.briefing.implement.context; +package com.example.briefingapi.briefing.implement.context; import java.util.EnumMap; import java.util.List; import java.util.Map; +import com.example.briefingapi.briefing.implement.strategy.BriefingQueryStrategy; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import briefing.briefing.implement.strategy.BriefingQueryStrategy; -import briefing.common.enums.APIVersion; @Component public class BriefingQueryContextFactory { diff --git a/src/main/java/briefing/briefing/implement/service/ArticleCommandService.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/ArticleCommandService.java similarity index 65% rename from src/main/java/briefing/briefing/implement/service/ArticleCommandService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/ArticleCommandService.java index e413d4b..810ba1d 100644 --- a/src/main/java/briefing/briefing/implement/service/ArticleCommandService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/ArticleCommandService.java @@ -1,11 +1,12 @@ -package briefing.briefing.implement.service; +package com.example.briefingapi.briefing.implement.service; import java.util.List; +import com.example.briefingcommon.domain.repository.article.ArticleRepository; +import com.example.briefingcommon.entity.Article; import org.springframework.stereotype.Service; -import briefing.briefing.domain.Article; -import briefing.briefing.domain.repository.ArticleRepository; + import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/briefing/implement/service/BriefingArticleCommandService.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingArticleCommandService.java similarity index 67% rename from src/main/java/briefing/briefing/implement/service/BriefingArticleCommandService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingArticleCommandService.java index 1366b06..20e3686 100644 --- a/src/main/java/briefing/briefing/implement/service/BriefingArticleCommandService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingArticleCommandService.java @@ -1,11 +1,12 @@ -package briefing.briefing.implement.service; +package com.example.briefingapi.briefing.implement.service; import java.util.List; +import com.example.briefingcommon.domain.repository.article.BriefingArticleRepository; +import com.example.briefingcommon.entity.BriefingArticle; import org.springframework.stereotype.Service; -import briefing.briefing.domain.BriefingArticle; -import briefing.briefing.domain.repository.BriefingArticleRepository; + import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/briefing/implement/service/BriefingCommandService.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingCommandService.java similarity index 74% rename from src/main/java/briefing/briefing/implement/service/BriefingCommandService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingCommandService.java index e3af12a..c61d1f6 100644 --- a/src/main/java/briefing/briefing/implement/service/BriefingCommandService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingCommandService.java @@ -1,9 +1,9 @@ -package briefing.briefing.implement.service; +package com.example.briefingapi.briefing.implement.service; +import com.example.briefingcommon.domain.repository.article.BriefingRepository; +import com.example.briefingcommon.entity.Briefing; import org.springframework.stereotype.Service; -import briefing.briefing.domain.Briefing; -import briefing.briefing.domain.repository.BriefingRepository; import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/briefing/implement/service/BriefingQueryService.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java similarity index 63% rename from src/main/java/briefing/briefing/implement/service/BriefingQueryService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java index f4737a6..201903b 100644 --- a/src/main/java/briefing/briefing/implement/service/BriefingQueryService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/service/BriefingQueryService.java @@ -1,16 +1,15 @@ -package briefing.briefing.implement.service; +package com.example.briefingapi.briefing.implement.service; import java.util.List; +import com.example.briefingapi.briefing.implement.context.BriefingQueryContext; +import com.example.briefingapi.briefing.implement.context.BriefingQueryContextFactory; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingcommon.common.exception.BriefingException; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.stereotype.Service; - -import briefing.briefing.domain.Briefing; -import briefing.briefing.exception.BriefingException; -import briefing.briefing.implement.context.BriefingQueryContext; -import briefing.briefing.implement.context.BriefingQueryContextFactory; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.common.enums.APIVersion; -import briefing.common.exception.common.ErrorCode; import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/briefing/implement/strategy/BriefingQueryStrategy.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingQueryStrategy.java similarity index 50% rename from src/main/java/briefing/briefing/implement/strategy/BriefingQueryStrategy.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingQueryStrategy.java index a325dfa..c2d73bb 100644 --- a/src/main/java/briefing/briefing/implement/strategy/BriefingQueryStrategy.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingQueryStrategy.java @@ -1,11 +1,12 @@ -package briefing.briefing.implement.strategy; +package com.example.briefingapi.briefing.implement.strategy; import java.util.List; import java.util.Optional; -import briefing.briefing.domain.Briefing; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.common.enums.APIVersion; + +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.APIVersion; public interface BriefingQueryStrategy { List findBriefings(BriefingRequestParam.BriefingPreviewListParam params); diff --git a/src/main/java/briefing/briefing/implement/strategy/BriefingV1QueryStrategy.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java similarity index 74% rename from src/main/java/briefing/briefing/implement/strategy/BriefingV1QueryStrategy.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java index 04b79eb..98bb66c 100644 --- a/src/main/java/briefing/briefing/implement/strategy/BriefingV1QueryStrategy.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java @@ -1,17 +1,19 @@ -package briefing.briefing.implement.strategy; +package com.example.briefingapi.briefing.implement.strategy; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; import java.util.Optional; +import com.example.briefingcommon.domain.repository.article.BriefingRepository; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.APIVersion; +import com.example.briefingcommon.entity.enums.BriefingType; import org.springframework.stereotype.Component; -import briefing.briefing.domain.Briefing; -import briefing.briefing.domain.repository.BriefingRepository; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.common.enums.APIVersion; -import briefing.common.enums.BriefingType; + + import lombok.RequiredArgsConstructor; @Component @@ -29,7 +31,7 @@ public List findBriefings(BriefingRequestParam.BriefingPreviewListPara briefingRepository.findAllByTypeAndCreatedAtBetweenOrderByRanks( params.getType(), startDateTime, endDateTime); if (briefingList.isEmpty()) { - briefingList = + briefingList = null; briefingRepository.findTop10ByTypeOrderByCreatedAtDesc(BriefingType.SOCIAL); } return briefingList; diff --git a/src/main/java/briefing/briefing/implement/strategy/BriefingV2QueryStrategy.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV2QueryStrategy.java similarity index 80% rename from src/main/java/briefing/briefing/implement/strategy/BriefingV2QueryStrategy.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV2QueryStrategy.java index 9ccf3c4..c69a3a5 100644 --- a/src/main/java/briefing/briefing/implement/strategy/BriefingV2QueryStrategy.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV2QueryStrategy.java @@ -1,16 +1,17 @@ -package briefing.briefing.implement.strategy; +package com.example.briefingapi.briefing.implement.strategy; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; import java.util.Optional; +import com.example.briefingcommon.domain.repository.article.BriefingRepository; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.stereotype.Component; -import briefing.briefing.domain.Briefing; -import briefing.briefing.domain.repository.BriefingRepository; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.common.enums.APIVersion; + import lombok.RequiredArgsConstructor; @Component diff --git a/src/main/java/briefing/briefing/presentation/BriefingApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/BriefingApi.java similarity index 82% rename from src/main/java/briefing/briefing/presentation/BriefingApi.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/BriefingApi.java index 02d46c7..dedd814 100644 --- a/src/main/java/briefing/briefing/presentation/BriefingApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/BriefingApi.java @@ -1,5 +1,12 @@ -package briefing.briefing.presentation; +package com.example.briefingapi.briefing.presentation; +import com.example.briefingapi.briefing.business.BriefingFacade; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestDTO; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingapi.briefing.presentation.dto.BriefingResponseDTO; +import com.example.briefingapi.security.handler.annotation.AuthMember; +import com.example.briefingcommon.common.presentation.response.CommonResponse; +import com.example.briefingcommon.entity.Member; import jakarta.validation.Valid; import org.springdoc.core.annotations.ParameterObject; @@ -7,14 +14,8 @@ import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import briefing.briefing.business.BriefingFacade; -import briefing.briefing.presentation.dto.BriefingRequestDTO; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.briefing.presentation.dto.BriefingResponseDTO; -import briefing.common.aop.annotation.CacheEvictByBriefingId; -import briefing.common.presentation.response.CommonResponse; -import briefing.member.domain.Member; -import briefing.security.handler.annotation.AuthMember; + +import com.example.briefingapi.aop.annotation.CacheEvictByBriefingId; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/briefing/briefing/presentation/BriefingV2Api.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/BriefingV2Api.java similarity index 75% rename from src/main/java/briefing/briefing/presentation/BriefingV2Api.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/BriefingV2Api.java index 7e01ccf..ffed107 100644 --- a/src/main/java/briefing/briefing/presentation/BriefingV2Api.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/BriefingV2Api.java @@ -1,15 +1,15 @@ -package briefing.briefing.presentation; +package com.example.briefingapi.briefing.presentation; +import com.example.briefingapi.briefing.business.BriefingV2Facade; +import com.example.briefingapi.briefing.presentation.dto.BriefingRequestParam; +import com.example.briefingapi.briefing.presentation.dto.BriefingResponseDTO; +import com.example.briefingapi.security.handler.annotation.AuthMember; +import com.example.briefingcommon.common.presentation.response.CommonResponse; +import com.example.briefingcommon.entity.Member; import org.springdoc.core.annotations.ParameterObject; import org.springframework.cache.annotation.Cacheable; import org.springframework.web.bind.annotation.*; -import briefing.briefing.business.BriefingV2Facade; -import briefing.briefing.presentation.dto.BriefingRequestParam; -import briefing.briefing.presentation.dto.BriefingResponseDTO; -import briefing.common.presentation.response.CommonResponse; -import briefing.member.domain.Member; -import briefing.security.handler.annotation.AuthMember; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/briefing/briefing/presentation/dto/BriefingRequestDTO.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingRequestDTO.java similarity index 78% rename from src/main/java/briefing/briefing/presentation/dto/BriefingRequestDTO.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingRequestDTO.java index 2a0ebbb..c8068db 100644 --- a/src/main/java/briefing/briefing/presentation/dto/BriefingRequestDTO.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingRequestDTO.java @@ -1,12 +1,13 @@ -package briefing.briefing.presentation.dto; +package com.example.briefingapi.briefing.presentation.dto; import java.util.List; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.example.briefingcommon.entity.enums.GptModel; +import com.example.briefingcommon.entity.enums.TimeOfDay; import com.fasterxml.jackson.annotation.JsonProperty; -import briefing.common.enums.BriefingType; -import briefing.common.enums.GptModel; -import briefing.common.enums.TimeOfDay; + import lombok.Getter; public class BriefingRequestDTO { diff --git a/src/main/java/briefing/briefing/presentation/dto/BriefingRequestParam.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingRequestParam.java similarity index 75% rename from src/main/java/briefing/briefing/presentation/dto/BriefingRequestParam.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingRequestParam.java index a2def3f..9b4b7b8 100644 --- a/src/main/java/briefing/briefing/presentation/dto/BriefingRequestParam.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingRequestParam.java @@ -1,11 +1,11 @@ -package briefing.briefing.presentation.dto; +package com.example.briefingapi.briefing.presentation.dto; import java.time.LocalDate; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.example.briefingcommon.entity.enums.TimeOfDay; import jakarta.validation.constraints.NotNull; -import briefing.common.enums.BriefingType; -import briefing.common.enums.TimeOfDay; import lombok.*; @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/src/main/java/briefing/briefing/presentation/dto/BriefingResponseDTO.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingResponseDTO.java similarity index 86% rename from src/main/java/briefing/briefing/presentation/dto/BriefingResponseDTO.java rename to Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingResponseDTO.java index cbb56e0..18f4e19 100644 --- a/src/main/java/briefing/briefing/presentation/dto/BriefingResponseDTO.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/presentation/dto/BriefingResponseDTO.java @@ -1,12 +1,12 @@ -package briefing.briefing.presentation.dto; +package com.example.briefingapi.briefing.presentation.dto; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; -import briefing.common.enums.BriefingType; -import briefing.common.enums.GptModel; -import briefing.common.enums.TimeOfDay; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.example.briefingcommon.entity.enums.GptModel; +import com.example.briefingcommon.entity.enums.TimeOfDay; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -81,9 +81,12 @@ public static class BriefingDetailDTOV2 { Boolean isBriefingOpen; Boolean isWarning; @Builder.Default Integer scrapCount = 0; - @Builder.Default GptModel gptModel = GptModel.GPT_3_5_TURBO; - @Builder.Default TimeOfDay timeOfDay = TimeOfDay.MORNING; - @Builder.Default BriefingType type = BriefingType.KOREA; + @Builder.Default + GptModel gptModel = GptModel.GPT_3_5_TURBO; + @Builder.Default + TimeOfDay timeOfDay = TimeOfDay.MORNING; + @Builder.Default + BriefingType type = BriefingType.KOREA; } @Builder diff --git a/src/main/java/briefing/config/CacheConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/config/CacheConfig.java similarity index 98% rename from src/main/java/briefing/config/CacheConfig.java rename to Briefing-Api/src/main/java/com/example/briefingapi/config/CacheConfig.java index a368f66..96bcdc9 100644 --- a/src/main/java/briefing/config/CacheConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/config/CacheConfig.java @@ -1,4 +1,4 @@ -package briefing.config; +package com.example.briefingapi.config; import java.time.Duration; diff --git a/src/main/java/briefing/config/GlobalWebConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/config/GlobalWebConfig.java similarity index 88% rename from src/main/java/briefing/config/GlobalWebConfig.java rename to Briefing-Api/src/main/java/com/example/briefingapi/config/GlobalWebConfig.java index cefd846..72302b9 100644 --- a/src/main/java/briefing/config/GlobalWebConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/config/GlobalWebConfig.java @@ -1,15 +1,15 @@ -package briefing.config; +package com.example.briefingapi.config; import java.util.List; +import com.example.briefingapi.security.handler.annotation.AuthUserArgumentResolver; +import com.example.briefingcommon.common.presentation.converter.*; import org.springframework.context.annotation.Configuration; import org.springframework.format.FormatterRegistry; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import briefing.common.presentation.converter.*; -import briefing.security.handler.annotation.AuthUserArgumentResolver; import lombok.RequiredArgsConstructor; @Configuration diff --git a/src/main/java/briefing/config/RestTemplateConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/config/RestTemplateConfig.java similarity index 88% rename from src/main/java/briefing/config/RestTemplateConfig.java rename to Briefing-Api/src/main/java/com/example/briefingapi/config/RestTemplateConfig.java index c99f07b..5e293da 100644 --- a/src/main/java/briefing/config/RestTemplateConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package briefing.config; +package com.example.briefingapi.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/briefing/config/SwaggerConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/config/SwaggerConfig.java similarity index 97% rename from src/main/java/briefing/config/SwaggerConfig.java rename to Briefing-Api/src/main/java/com/example/briefingapi/config/SwaggerConfig.java index cc9d7d5..0ad94d5 100644 --- a/src/main/java/briefing/config/SwaggerConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package briefing.config; +package com.example.briefingapi.config; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/config/firebaseConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/config/firebaseConfig.java new file mode 100644 index 0000000..0ab3c24 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/config/firebaseConfig.java @@ -0,0 +1,37 @@ +package com.example.briefingapi.config; + +import com.google.auth.oauth2.GoogleCredentials; +import com.google.firebase.FirebaseApp; +import com.google.firebase.FirebaseOptions; +import jakarta.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.Base64; + +@Configuration +public class firebaseConfig { + + @Value("${fcm.key}") + private String fcmJson; + + @PostConstruct + public void initFirebase(){ + + String base64String = fcmJson; + + byte[] decodedBytes = Base64.getDecoder().decode(base64String); + + InputStream credentialStream = new ByteArrayInputStream(decodedBytes); + try { + FirebaseOptions options = FirebaseOptions.builder() + .setCredentials(GoogleCredentials.fromStream(credentialStream)) + .build(); + FirebaseApp.initializeApp(options); + }catch (Exception e){ + e.printStackTrace(); + } + } +} diff --git a/src/main/java/briefing/common/exception/JwtAuthenticationException.java b/Briefing-Api/src/main/java/com/example/briefingapi/exception/JwtAuthenticationException.java similarity index 67% rename from src/main/java/briefing/common/exception/JwtAuthenticationException.java rename to Briefing-Api/src/main/java/com/example/briefingapi/exception/JwtAuthenticationException.java index ed9c0e4..d5ccf81 100644 --- a/src/main/java/briefing/common/exception/JwtAuthenticationException.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/exception/JwtAuthenticationException.java @@ -1,8 +1,8 @@ -package briefing.common.exception; +package com.example.briefingapi.exception; -import org.springframework.security.core.AuthenticationException; -import briefing.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import org.springframework.security.core.AuthenticationException; public class JwtAuthenticationException extends AuthenticationException { diff --git a/src/main/java/briefing/common/exception/handler/ExceptionAdvice.java b/Briefing-Api/src/main/java/com/example/briefingapi/exception/handler/ExceptionAdvice.java similarity index 95% rename from src/main/java/briefing/common/exception/handler/ExceptionAdvice.java rename to Briefing-Api/src/main/java/com/example/briefingapi/exception/handler/ExceptionAdvice.java index dd7c5c6..42ea315 100644 --- a/src/main/java/briefing/common/exception/handler/ExceptionAdvice.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/exception/handler/ExceptionAdvice.java @@ -1,4 +1,4 @@ -package briefing.common.exception.handler; +package com.example.briefingapi.exception.handler; import java.io.PrintWriter; import java.io.StringWriter; @@ -6,9 +6,14 @@ import java.util.Map; import java.util.Optional; + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; +import com.example.briefingcommon.common.presentation.response.CommonResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.ConstraintViolationException; import jakarta.validation.constraints.NotNull; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -24,11 +29,6 @@ import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; -import briefing.common.presentation.response.CommonResponse; -import lombok.extern.slf4j.Slf4j; - @Slf4j @RestControllerAdvice(annotations = {RestController.class}) public class ExceptionAdvice extends ResponseEntityExceptionHandler { diff --git a/src/main/java/briefing/common/exception/handler/GlobalControllerAdvice.java b/Briefing-Api/src/main/java/com/example/briefingapi/exception/handler/GlobalControllerAdvice.java similarity index 79% rename from src/main/java/briefing/common/exception/handler/GlobalControllerAdvice.java rename to Briefing-Api/src/main/java/com/example/briefingapi/exception/handler/GlobalControllerAdvice.java index 994ead9..b4f8ddc 100644 --- a/src/main/java/briefing/common/exception/handler/GlobalControllerAdvice.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/exception/handler/GlobalControllerAdvice.java @@ -1,10 +1,10 @@ -package briefing.common.exception.handler; +package com.example.briefingapi.exception.handler; +import com.example.briefingcommon.common.exception.common.BaseException; +import com.example.briefingcommon.common.exception.common.BaseExceptionType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; -import briefing.common.exception.common.BaseException; -import briefing.common.exception.common.BaseExceptionType; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmCommandService.java b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmCommandService.java new file mode 100644 index 0000000..4c1a4a7 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmCommandService.java @@ -0,0 +1,71 @@ +package com.example.briefingapi.fcm.implementation; + +import com.example.briefingcommon.domain.repository.article.BriefingRepository; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.google.firebase.messaging.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Transactional +@Slf4j +public class FcmCommandService { + + private final BriefingRepository briefingRepository; + + public void subScribe(String topicName, String memberTokenList) + { + try { + TopicManagementResponse topicManagementResponse = FirebaseMessaging.getInstance().subscribeToTopic(List.of(memberTokenList), topicName); + List errors = topicManagementResponse.getErrors(); + log.info("subscribe response : {}", topicManagementResponse.getSuccessCount()); + log.info("subscribe fail : {}", topicManagementResponse.getFailureCount()); + }catch (FirebaseMessagingException e){ + e.printStackTrace(); + } + } + + public void unSubScribe(String topicName, String memberTokenList){ + try { + TopicManagementResponse topicManagementResponse = FirebaseMessaging.getInstance().unsubscribeFromTopic(List.of(memberTokenList), topicName); + List errors = topicManagementResponse.getErrors(); + log.info("unSubscribe response : {}", topicManagementResponse.getSuccessCount()); + log.info("unSubscribe fail : {}", topicManagementResponse.getFailureCount()); + }catch (FirebaseMessagingException e){ + e.printStackTrace(); + } + } + + public void sendMessage(String topicName){ + + Optional briefingOptional = briefingRepository + .getBestTodayBriefing(BriefingType.SOCIAL, PageRequest.of(0, 1)) + .getContent().stream().findFirst(); + Message message = Message.builder() + .setNotification( + Notification.builder() + .setTitle(String.format("현재 소셜 키워드 #1 '%s'",briefingOptional.map(Briefing::getTitle) + .orElse("Briefing Social1"))) + .setBody(String.format("내용 : '%s' 읽어보러 가기",briefingOptional.map(Briefing::getSubtitle) + .orElse("Briefing App"))) + .build()) + .setTopic(topicName) + .build(); + + try { + String response = FirebaseMessaging.getInstance().send(message); + log.info("the response of request FCM : {}",response); + }catch (FirebaseMessagingException e){ + e.printStackTrace(); + } + } +} diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmQueryService.java b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmQueryService.java new file mode 100644 index 0000000..2b233c4 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/implementation/FcmQueryService.java @@ -0,0 +1,4 @@ +package com.example.briefingapi.fcm.implementation; + +public class FcmQueryService { +} diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java new file mode 100644 index 0000000..e41aef2 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java @@ -0,0 +1,35 @@ +package com.example.briefingapi.fcm.presentation; + +import com.example.briefingapi.fcm.implementation.FcmCommandService; +import com.example.briefingapi.fcm.presentation.dto.FcmRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/fcms") +public class FcmApi { + + private final FcmCommandService fcmCommandService; + + @PostMapping("/subscribe") + public String testFcmSubscribe(@RequestBody FcmRequest.FcmTokenDTO body){ + fcmCommandService.subScribe("dailyPush",body.getToken()); + return "response"; + } + + @PostMapping("/unsubscribe") + public String testFcmUnSubscribe(@RequestBody FcmRequest.FcmTokenDTO body){ + fcmCommandService.unSubScribe("dailyPush",body.getToken()); + return "response"; + } + + @PostMapping("/send") + public String testSendMessage(){ + fcmCommandService.sendMessage("dailyPush"); + return "response"; + } +} diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/dto/FcmRequest.java b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/dto/FcmRequest.java new file mode 100644 index 0000000..59de872 --- /dev/null +++ b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/dto/FcmRequest.java @@ -0,0 +1,11 @@ +package com.example.briefingapi.fcm.presentation.dto; + +import lombok.Getter; + +public class FcmRequest { + + @Getter + public static class FcmTokenDTO{ + String token; + } +} diff --git a/src/main/java/briefing/member/business/MemberConverter.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberConverter.java similarity index 81% rename from src/main/java/briefing/member/business/MemberConverter.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberConverter.java index 6903cd5..3eca6d3 100644 --- a/src/main/java/briefing/member/business/MemberConverter.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberConverter.java @@ -1,15 +1,16 @@ -package briefing.member.business; +package com.example.briefingapi.member.business; import java.time.LocalDateTime; +import com.example.briefingapi.member.presentation.dto.MemberResponse; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.MemberRole; +import com.example.briefingcommon.entity.enums.MemberStatus; +import com.example.briefingcommon.entity.enums.SocialType; +import com.example.briefinginfra.feign.oauth.google.dto.GoogleUserInfo; import org.springframework.stereotype.Component; -import briefing.common.enums.MemberRole; -import briefing.common.enums.MemberStatus; -import briefing.common.enums.SocialType; -import briefing.infra.feign.oauth.google.dto.GoogleUserInfo; -import briefing.member.domain.Member; -import briefing.member.presentation.dto.MemberResponse; + import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/src/main/java/briefing/member/business/MemberFacade.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java similarity index 57% rename from src/main/java/briefing/member/business/MemberFacade.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java index e0386b1..a3db659 100644 --- a/src/main/java/briefing/member/business/MemberFacade.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java @@ -1,24 +1,28 @@ -package briefing.member.business; +package com.example.briefingapi.member.business; import java.util.List; +import com.example.briefingapi.fcm.implementation.FcmCommandService; +import com.example.briefingapi.member.implement.MemberCommandService; +import com.example.briefingapi.member.implement.MemberQueryService; +import com.example.briefingapi.member.presentation.dto.MemberRequest; +import com.example.briefingapi.member.presentation.dto.MemberResponse; +import com.example.briefingapi.security.provider.TokenProvider; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.MemberRole; +import com.example.briefingcommon.entity.enums.SocialType; +import com.example.briefingcommon.entity.redis.RefreshToken; +import com.example.briefinginfra.feign.oauth.apple.client.AppleOauth2Client; +import com.example.briefinginfra.feign.oauth.google.client.GoogleOauth2Client; +import com.example.briefinginfra.feign.oauth.google.dto.GoogleUserInfo; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import briefing.common.enums.MemberRole; -import briefing.common.enums.SocialType; -import briefing.infra.feign.oauth.apple.client.AppleOauth2Client; -import briefing.infra.feign.oauth.google.client.GoogleOauth2Client; -import briefing.infra.feign.oauth.google.dto.GoogleUserInfo; -import briefing.infra.redis.domain.RefreshToken; -import briefing.infra.redis.service.RedisService; -import briefing.member.domain.Member; -import briefing.member.implement.MemberCommandService; -import briefing.member.implement.MemberQueryService; -import briefing.member.presentation.dto.MemberRequest; -import briefing.member.presentation.dto.MemberResponse; -import briefing.security.provider.TokenProvider; + +import com.example.briefingapi.redis.service.RedisService; + import lombok.RequiredArgsConstructor; @Component @@ -27,10 +31,14 @@ public class MemberFacade { private final MemberQueryService memberQueryService; private final MemberCommandService memberCommandService; private final TokenProvider tokenProvider; + private final FcmCommandService fcmCommandService; private final RedisService redisService; private final GoogleOauth2Client googleOauth2Client; private final AppleOauth2Client appleOauth2Client; + @Value("${fcm.topic.daily-push}") + private String dailyPushTopic; + private Member loginWithGoogle(String identityToken) { GoogleUserInfo googleUserInfo = googleOauth2Client.verifyToken(identityToken); Member member = @@ -61,6 +69,20 @@ public MemberResponse.LoginDTO login( return MemberConverter.toLoginDTO(member, accessToken, refreshToken); } + public MemberResponse.TestTokenDTO getTestToken(){ + Member member = memberQueryService.findById(63L); + + return MemberResponse.TestTokenDTO.builder() + .token( + tokenProvider.createAccessToken( + member.getId(), + member.getSocialType().toString(), + member.getSocialId(), + List.of(new SimpleGrantedAuthority(MemberRole.ROLE_USER.name())))) + .build(); + + } + public MemberResponse.ReIssueTokenDTO reIssueToken(final MemberRequest.ReissueDTO request) { RefreshToken refreshToken = redisService.reGenerateRefreshToken(request); Member parsedMember = memberQueryService.parseRefreshToken(refreshToken); @@ -78,4 +100,16 @@ public MemberResponse.QuitDTO quit(final Long memberId) { memberCommandService.deleteMember(memberId); return MemberConverter.toQuitDTO(); } + + public void subScribeDailyPush(MemberRequest.ToggleDailyPushAlarmDTO request, Member member){ + + if(request.getPermit().equals(1)){ + memberCommandService.storeFcmToken(request.getFcmToken(),member); + fcmCommandService.subScribe(dailyPushTopic, request.getFcmToken()); + } + else { + memberCommandService.abortFcmToken(request.getFcmToken(), member); + fcmCommandService.unSubScribe(dailyPushTopic,request.getFcmToken()); + } + } } diff --git a/src/main/java/briefing/member/implement/MemberCommandService.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/implement/MemberCommandService.java similarity index 65% rename from src/main/java/briefing/member/implement/MemberCommandService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/implement/MemberCommandService.java index 7703f40..d615540 100644 --- a/src/main/java/briefing/member/implement/MemberCommandService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/implement/MemberCommandService.java @@ -1,4 +1,4 @@ -package briefing.member.implement; +package com.example.briefingapi.member.implement; import java.math.BigInteger; import java.security.KeyFactory; @@ -7,6 +7,19 @@ import java.util.Base64; import java.util.Optional; +import com.example.briefingapi.member.business.MemberConverter; +import com.example.briefingcommon.domain.repository.FcmTokenRepository; +import com.example.briefingcommon.domain.repository.member.MemberRepository; +import com.example.briefingapi.member.presentation.dto.MemberRequest; +import com.example.briefingcommon.common.exception.AppleOAuthException; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.FcmToken; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.SocialType; +import com.example.briefinginfra.feign.oauth.apple.client.AppleOauth2Client; +import com.example.briefinginfra.feign.oauth.apple.dto.ApplePublicKey; +import com.example.briefinginfra.feign.oauth.apple.dto.ApplePublicKeyList; +import com.example.briefinginfra.feign.oauth.google.client.GoogleOauth2Client; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -14,16 +27,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import briefing.common.enums.SocialType; -import briefing.common.exception.AppleOAuthException; -import briefing.common.exception.common.ErrorCode; -import briefing.infra.feign.oauth.apple.client.AppleOauth2Client; -import briefing.infra.feign.oauth.apple.dto.ApplePublicKey; -import briefing.infra.feign.oauth.apple.dto.ApplePublicKeyList; -import briefing.member.business.MemberConverter; -import briefing.member.domain.Member; -import briefing.member.domain.repository.MemberRepository; -import briefing.member.presentation.dto.MemberRequest; + import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; @@ -35,6 +39,8 @@ public class MemberCommandService { private final MemberRepository memberRepository; private final AppleOauth2Client appleOauth2Client; + private final FcmTokenRepository fcmTokenRepository; + Logger logger = LoggerFactory.getLogger(MemberCommandService.class); public Member login(MemberRequest.LoginDTO request) { @@ -110,4 +116,28 @@ private PublicKey getPublicKey(ApplePublicKey applePublicKeyDTO) { public void deleteMember(Long memberId) { memberRepository.deleteById(memberId); } + + + public void storeFcmToken(String token, Member member){ + + Optional optionalFcmToken = fcmTokenRepository.findByMemberAndToken(member, token); + + optionalFcmToken.ifPresentOrElse( + fcmToken -> {}, + () -> fcmTokenRepository.save(FcmToken.builder() + .token(token) + .member(member) + .build()) + ); + } + + public void abortFcmToken(String token, Member member){ + + Optional optionalFcmToken = fcmTokenRepository.findByMemberAndToken(member, token); + + optionalFcmToken.ifPresentOrElse( + fcmTokenRepository::delete, + () -> {} + ); + } } diff --git a/src/main/java/briefing/member/implement/MemberQueryService.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/implement/MemberQueryService.java similarity index 75% rename from src/main/java/briefing/member/implement/MemberQueryService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/implement/MemberQueryService.java index 9789e51..3e71533 100644 --- a/src/main/java/briefing/member/implement/MemberQueryService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/implement/MemberQueryService.java @@ -1,16 +1,17 @@ -package briefing.member.implement; +package com.example.briefingapi.member.implement; import java.util.Optional; +import com.example.briefingcommon.domain.repository.member.MemberRepository; +import com.example.briefingcommon.common.exception.MemberException; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.MemberRole; +import com.example.briefingcommon.entity.enums.SocialType; +import com.example.briefingcommon.entity.redis.RefreshToken; import org.springframework.stereotype.Service; -import briefing.common.enums.MemberRole; -import briefing.common.enums.SocialType; -import briefing.common.exception.common.ErrorCode; -import briefing.infra.redis.domain.RefreshToken; -import briefing.member.domain.Member; -import briefing.member.domain.repository.MemberRepository; -import briefing.member.exception.MemberException; + import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/member/presentation/MemberApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java similarity index 64% rename from src/main/java/briefing/member/presentation/MemberApi.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java index 1e6d37e..c28dff4 100644 --- a/src/main/java/briefing/member/presentation/MemberApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java @@ -1,18 +1,18 @@ -package briefing.member.presentation; +package com.example.briefingapi.member.presentation; +import com.example.briefingapi.member.business.MemberFacade; +import com.example.briefingapi.member.presentation.dto.MemberRequest; +import com.example.briefingapi.member.presentation.dto.MemberResponse; +import com.example.briefingapi.security.handler.annotation.AuthMember; +import com.example.briefingapi.validation.annotation.CheckSameMember; +import com.example.briefingcommon.common.presentation.response.CommonResponse; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.SocialType; import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import briefing.common.enums.SocialType; -import briefing.common.presentation.response.CommonResponse; -import briefing.member.business.MemberFacade; -import briefing.member.domain.Member; -import briefing.member.presentation.dto.MemberRequest; -import briefing.member.presentation.dto.MemberResponse; -import briefing.security.handler.annotation.AuthMember; -import briefing.validation.annotation.CheckSameMember; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -36,23 +36,12 @@ public class MemberApi { private final MemberFacade memberFacade; - /* - @Operation(summary = "Member\uD83D\uDC64 토큰 잘 발급되나 테스트용API", description = "테스트 용") + + @Operation(summary = "Member\uD83D\uDC64 테스트를 위한 토큰 발급 API", description = "테스트 용") @GetMapping("/members/auth/test") - public CommonResponse testGenerateToken() { - Member member = memberQueryService.testForTokenApi(); - String accessToken = - tokenProvider.createAccessToken( - member.getId(), - member.getSocialType().toString(), - member.getSocialId(), - Arrays.asList(new SimpleGrantedAuthority(member.getRole().name()))); - RefreshToken refreshToken = - redisService.generateRefreshToken(member.getSocialId(), member.getSocialType()); - return CommonResponse.onSuccess( - MemberConverter.toLoginDTO(member, accessToken, refreshToken.getToken())); + public CommonResponse testGenerateToken() { + return CommonResponse.onSuccess(memberFacade.getTestToken()); } - */ @Operation(summary = "02-01 Member\uD83D\uDC64 소셜 로그인 V1", description = "구글, 애플 소셜로그인 API입니다.") @PostMapping("/members/auth/{socialType}") @@ -64,7 +53,7 @@ public CommonResponse login( } @Operation( - summary = "02-01 Member\uD83D\uDC64 accessToken 재발급 받기 V1", + summary = "02-02 Member\uD83D\uDC64 accessToken 재발급 받기 V1", description = "accessToken 만료 시 refreshToken으로 재발급을 받는 API 입니다.") @ApiResponses({ @ApiResponse(responseCode = "1000", description = "OK, 성공"), @@ -87,7 +76,7 @@ public CommonResponse reissueToken( return CommonResponse.onSuccess(memberFacade.reIssueToken(request)); } - @Operation(summary = "02-01 Member\uD83D\uDC64 회원 탈퇴 V1", description = "회원 탈퇴 API 입니다.") + @Operation(summary = "02-03 Member\uD83D\uDC64 회원 탈퇴 V1", description = "회원 탈퇴 API 입니다.") @DeleteMapping("/members/{memberId}") @Parameters({ @Parameter(name = "member", hidden = true), @@ -120,4 +109,34 @@ public CommonResponse quitMember( @AuthMember Member member, @CheckSameMember @PathVariable Long memberId) { return CommonResponse.onSuccess(memberFacade.quit(memberId)); } + + @Operation(summary = "02-04 Member\uD83D\uDC64 푸쉬 알람 허용/거부 설정 ", description = "푸쉬 알람 허용/거부 설정입니다.") + @PostMapping("/members/alarms") + @ApiResponses({ + @ApiResponse(responseCode = "1000", description = "OK, 성공"), + @ApiResponse( + responseCode = "AUTH003", + description = "access 토큰을 주세요!", + content = @Content(schema = @Schema(implementation = CommonResponse.class))), + @ApiResponse( + responseCode = "AUTH004", + description = "acess 토큰 만료", + content = @Content(schema = @Schema(implementation = CommonResponse.class))), + @ApiResponse( + responseCode = "AUTH006", + description = "acess 토큰 모양이 이상함", + content = @Content(schema = @Schema(implementation = CommonResponse.class))), + @ApiResponse( + responseCode = "MEMBER_001", + description = "사용자가 존재하지 않습니다.", + content = @Content(schema = @Schema(implementation = CommonResponse.class))), + }) + public CommonResponse subscribeDailyPush( + @Valid @RequestBody MemberRequest.ToggleDailyPushAlarmDTO request, + @Parameter(hidden = true) @AuthMember Member member + ){ + + memberFacade.subScribeDailyPush(request,member); + return CommonResponse.onSuccess(); + } } diff --git a/src/main/java/briefing/member/presentation/MemberV2Api.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberV2Api.java similarity index 89% rename from src/main/java/briefing/member/presentation/MemberV2Api.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberV2Api.java index 6382b8a..9714ecd 100644 --- a/src/main/java/briefing/member/presentation/MemberV2Api.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberV2Api.java @@ -1,18 +1,19 @@ -package briefing.member.presentation; +package com.example.briefingapi.member.presentation; +import com.example.briefingapi.member.business.MemberFacade; +import com.example.briefingapi.member.presentation.dto.MemberRequest; +import com.example.briefingapi.member.presentation.dto.MemberResponse; +import com.example.briefingapi.security.handler.annotation.AuthMember; +import com.example.briefingapi.validation.annotation.CheckSameMember; +import com.example.briefingcommon.common.presentation.response.CommonResponse; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.SocialType; import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import briefing.common.enums.SocialType; -import briefing.common.presentation.response.CommonResponse; -import briefing.member.business.MemberFacade; -import briefing.member.domain.Member; -import briefing.member.presentation.dto.MemberRequest; -import briefing.member.presentation.dto.MemberResponse; -import briefing.security.handler.annotation.AuthMember; -import briefing.validation.annotation.CheckSameMember; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; diff --git a/src/main/java/briefing/member/presentation/dto/MemberRequest.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/dto/MemberRequest.java similarity index 53% rename from src/main/java/briefing/member/presentation/dto/MemberRequest.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/dto/MemberRequest.java index 030f33b..1fe5803 100644 --- a/src/main/java/briefing/member/presentation/dto/MemberRequest.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/dto/MemberRequest.java @@ -1,7 +1,8 @@ -package briefing.member.presentation.dto; +package com.example.briefingapi.member.presentation.dto; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Getter; public class MemberRequest { @@ -15,4 +16,12 @@ public static class LoginDTO { public static class ReissueDTO { @NotBlank private String refreshToken; } + + @Getter + public static class ToggleDailyPushAlarmDTO{ + + @NotNull private Integer permit; + @NotBlank private String fcmToken; + } + } diff --git a/src/main/java/briefing/member/presentation/dto/MemberResponse.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/dto/MemberResponse.java similarity index 83% rename from src/main/java/briefing/member/presentation/dto/MemberResponse.java rename to Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/dto/MemberResponse.java index 3578e26..7c7ff2e 100644 --- a/src/main/java/briefing/member/presentation/dto/MemberResponse.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/dto/MemberResponse.java @@ -1,4 +1,4 @@ -package briefing.member.presentation.dto; +package com.example.briefingapi.member.presentation.dto; import java.time.LocalDateTime; import java.util.List; @@ -20,6 +20,14 @@ public static class LoginDTO { private String refreshToken; } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TestTokenDTO{ + String token; + } + @Builder @Getter @NoArgsConstructor diff --git a/src/main/java/briefing/infra/redis/repository/RefreshTokenRepository.java b/Briefing-Api/src/main/java/com/example/briefingapi/redis/repository/RefreshTokenRepository.java similarity index 57% rename from src/main/java/briefing/infra/redis/repository/RefreshTokenRepository.java rename to Briefing-Api/src/main/java/com/example/briefingapi/redis/repository/RefreshTokenRepository.java index 9abf7d4..93ff659 100644 --- a/src/main/java/briefing/infra/redis/repository/RefreshTokenRepository.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/redis/repository/RefreshTokenRepository.java @@ -1,7 +1,7 @@ -package briefing.infra.redis.repository; +package com.example.briefingapi.redis.repository; +import com.example.briefingcommon.entity.redis.RefreshToken; import org.springframework.data.repository.CrudRepository; -import briefing.infra.redis.domain.RefreshToken; public interface RefreshTokenRepository extends CrudRepository {} diff --git a/src/main/java/briefing/infra/redis/service/RedisService.java b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisService.java similarity index 55% rename from src/main/java/briefing/infra/redis/service/RedisService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisService.java index f1753ab..02f197b 100644 --- a/src/main/java/briefing/infra/redis/service/RedisService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisService.java @@ -1,8 +1,10 @@ -package briefing.infra.redis.service; +package com.example.briefingapi.redis.service; + + +import com.example.briefingapi.member.presentation.dto.MemberRequest; +import com.example.briefingcommon.entity.enums.SocialType; +import com.example.briefingcommon.entity.redis.RefreshToken; -import briefing.common.enums.SocialType; -import briefing.infra.redis.domain.RefreshToken; -import briefing.member.presentation.dto.MemberRequest; public interface RedisService { diff --git a/src/main/java/briefing/infra/redis/service/RedisServiceImpl.java b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java similarity index 84% rename from src/main/java/briefing/infra/redis/service/RedisServiceImpl.java rename to Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java index f24446a..29ef3ce 100644 --- a/src/main/java/briefing/infra/redis/service/RedisServiceImpl.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java @@ -1,24 +1,24 @@ -package briefing.infra.redis.service; +package com.example.briefingapi.redis.service; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.Optional; import java.util.UUID; +import com.example.briefingcommon.domain.repository.member.MemberRepository; +import com.example.briefingapi.member.presentation.dto.MemberRequest; +import com.example.briefingapi.redis.repository.RefreshTokenRepository; +import com.example.briefingcommon.common.exception.MemberException; +import com.example.briefingcommon.common.exception.RefreshTokenException; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.SocialType; +import com.example.briefingcommon.entity.redis.RefreshToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import briefing.common.enums.SocialType; -import briefing.common.exception.RefreshTokenException; -import briefing.common.exception.common.ErrorCode; -import briefing.infra.redis.domain.RefreshToken; -import briefing.infra.redis.repository.RefreshTokenRepository; -import briefing.member.domain.Member; -import briefing.member.domain.repository.MemberRepository; -import briefing.member.exception.MemberException; -import briefing.member.presentation.dto.MemberRequest; import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/root/presentation/RootApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/root/presentation/RootApi.java similarity index 93% rename from src/main/java/briefing/root/presentation/RootApi.java rename to Briefing-Api/src/main/java/com/example/briefingapi/root/presentation/RootApi.java index 135cf26..c055c32 100644 --- a/src/main/java/briefing/root/presentation/RootApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/root/presentation/RootApi.java @@ -1,4 +1,4 @@ -package briefing.root.presentation; +package com.example.briefingapi.root.presentation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/briefing/scrap/business/ScrapConverter.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapConverter.java similarity index 91% rename from src/main/java/briefing/scrap/business/ScrapConverter.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapConverter.java index e0fb5fb..e48b8bd 100644 --- a/src/main/java/briefing/scrap/business/ScrapConverter.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapConverter.java @@ -1,11 +1,11 @@ -package briefing.scrap.business; +package com.example.briefingapi.scrap.business; import java.time.LocalDateTime; -import briefing.briefing.domain.Briefing; -import briefing.member.domain.Member; -import briefing.scrap.domain.Scrap; -import briefing.scrap.presentation.dto.ScrapResponse; +import com.example.briefingapi.scrap.presentation.dto.ScrapResponse; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.Scrap; public class ScrapConverter { public static ScrapResponse.CreateDTO toCreateDTO(Scrap createdScrap) { diff --git a/src/main/java/briefing/scrap/business/ScrapFacade.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapFacade.java similarity index 69% rename from src/main/java/briefing/scrap/business/ScrapFacade.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapFacade.java index 8fc8df2..6f5ef15 100644 --- a/src/main/java/briefing/scrap/business/ScrapFacade.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapFacade.java @@ -1,22 +1,23 @@ -package briefing.scrap.business; +package com.example.briefingapi.scrap.business; import java.util.List; +import com.example.briefingapi.briefing.implement.service.BriefingQueryService; +import com.example.briefingapi.member.implement.MemberQueryService; +import com.example.briefingapi.scrap.implement.ScrapCommandService; +import com.example.briefingapi.scrap.implement.ScrapQueryService; +import com.example.briefingapi.scrap.presentation.dto.ScrapRequest; +import com.example.briefingapi.scrap.presentation.dto.ScrapResponse; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.Scrap; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import briefing.briefing.domain.Briefing; -import briefing.briefing.implement.service.BriefingQueryService; -import briefing.common.enums.APIVersion; -import briefing.common.exception.common.ErrorCode; -import briefing.member.domain.Member; -import briefing.member.implement.MemberQueryService; -import briefing.scrap.domain.Scrap; -import briefing.scrap.exception.ScrapException; -import briefing.scrap.implement.ScrapCommandService; -import briefing.scrap.implement.ScrapQueryService; -import briefing.scrap.presentation.dto.ScrapRequest; -import briefing.scrap.presentation.dto.ScrapResponse; + +import com.example.briefingcommon.common.exception.ScrapException; import lombok.RequiredArgsConstructor; @Component diff --git a/src/main/java/briefing/scrap/business/ScrapV2Facade.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapV2Facade.java similarity index 71% rename from src/main/java/briefing/scrap/business/ScrapV2Facade.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapV2Facade.java index 269f515..d6e2040 100644 --- a/src/main/java/briefing/scrap/business/ScrapV2Facade.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/business/ScrapV2Facade.java @@ -1,22 +1,22 @@ -package briefing.scrap.business; +package com.example.briefingapi.scrap.business; import java.util.List; +import com.example.briefingapi.briefing.implement.service.BriefingQueryService; +import com.example.briefingapi.member.implement.MemberQueryService; +import com.example.briefingapi.scrap.implement.ScrapCommandService; +import com.example.briefingapi.scrap.implement.ScrapQueryService; +import com.example.briefingapi.scrap.presentation.dto.ScrapRequest; +import com.example.briefingapi.scrap.presentation.dto.ScrapResponse; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.Scrap; +import com.example.briefingcommon.entity.enums.APIVersion; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import briefing.briefing.domain.Briefing; -import briefing.briefing.implement.service.BriefingQueryService; -import briefing.common.enums.APIVersion; -import briefing.common.exception.common.ErrorCode; -import briefing.member.domain.Member; -import briefing.member.implement.MemberQueryService; -import briefing.scrap.domain.Scrap; -import briefing.scrap.exception.ScrapException; -import briefing.scrap.implement.ScrapCommandService; -import briefing.scrap.implement.ScrapQueryService; -import briefing.scrap.presentation.dto.ScrapRequest; -import briefing.scrap.presentation.dto.ScrapResponse; +import com.example.briefingcommon.common.exception.ScrapException; import lombok.RequiredArgsConstructor; @Component diff --git a/src/main/java/briefing/scrap/implement/ScrapCommandService.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/implement/ScrapCommandService.java similarity index 66% rename from src/main/java/briefing/scrap/implement/ScrapCommandService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/implement/ScrapCommandService.java index ea3db0d..94cbb6b 100644 --- a/src/main/java/briefing/scrap/implement/ScrapCommandService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/implement/ScrapCommandService.java @@ -1,12 +1,12 @@ -package briefing.scrap.implement; +package com.example.briefingapi.scrap.implement; +import com.example.briefingcommon.domain.repository.scrap.ScrapRepository; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Scrap; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; -import briefing.common.exception.common.ErrorCode; -import briefing.scrap.domain.Scrap; -import briefing.scrap.domain.repository.ScrapRepository; -import briefing.scrap.exception.ScrapException; +import com.example.briefingcommon.common.exception.ScrapException; import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/scrap/implement/ScrapQueryService.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/implement/ScrapQueryService.java similarity index 75% rename from src/main/java/briefing/scrap/implement/ScrapQueryService.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/implement/ScrapQueryService.java index 0575c8a..7665584 100644 --- a/src/main/java/briefing/scrap/implement/ScrapQueryService.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/implement/ScrapQueryService.java @@ -1,13 +1,13 @@ -package briefing.scrap.implement; +package com.example.briefingapi.scrap.implement; import java.util.List; +import com.example.briefingcommon.domain.repository.scrap.ScrapRepository; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.entity.Scrap; import org.springframework.stereotype.Service; -import briefing.common.exception.common.ErrorCode; -import briefing.scrap.domain.Scrap; -import briefing.scrap.domain.repository.ScrapRepository; -import briefing.scrap.exception.ScrapException; +import com.example.briefingcommon.common.exception.ScrapException; import lombok.RequiredArgsConstructor; @Service diff --git a/src/main/java/briefing/scrap/presentation/ScrapApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/ScrapApi.java similarity index 82% rename from src/main/java/briefing/scrap/presentation/ScrapApi.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/ScrapApi.java index 051aee8..c40c435 100644 --- a/src/main/java/briefing/scrap/presentation/ScrapApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/ScrapApi.java @@ -1,13 +1,12 @@ -package briefing.scrap.presentation; - +package com.example.briefingapi.scrap.presentation; import java.util.List; +import com.example.briefingapi.scrap.business.ScrapFacade; +import com.example.briefingapi.scrap.presentation.dto.ScrapRequest; +import com.example.briefingapi.scrap.presentation.dto.ScrapResponse; +import com.example.briefingcommon.common.presentation.response.CommonResponse; import org.springframework.web.bind.annotation.*; -import briefing.common.presentation.response.CommonResponse; -import briefing.scrap.business.ScrapFacade; -import briefing.scrap.presentation.dto.ScrapRequest; -import briefing.scrap.presentation.dto.ScrapResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/briefing/scrap/presentation/ScrapV2Api.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/ScrapV2Api.java similarity index 81% rename from src/main/java/briefing/scrap/presentation/ScrapV2Api.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/ScrapV2Api.java index 83ebc60..b1e4f12 100644 --- a/src/main/java/briefing/scrap/presentation/ScrapV2Api.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/ScrapV2Api.java @@ -1,14 +1,13 @@ -package briefing.scrap.presentation; - +package com.example.briefingapi.scrap.presentation; import java.util.List; +import com.example.briefingapi.scrap.business.ScrapV2Facade; +import com.example.briefingapi.scrap.presentation.dto.ScrapRequest; +import com.example.briefingapi.scrap.presentation.dto.ScrapResponse; +import com.example.briefingcommon.common.presentation.response.CommonResponse; import org.springframework.web.bind.annotation.*; -import briefing.common.aop.annotation.CacheEvictByBriefingId; -import briefing.common.presentation.response.CommonResponse; -import briefing.scrap.business.ScrapV2Facade; -import briefing.scrap.presentation.dto.ScrapRequest; -import briefing.scrap.presentation.dto.ScrapResponse; +import com.example.briefingapi.aop.annotation.CacheEvictByBriefingId; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/briefing/scrap/presentation/dto/ScrapRequest.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/dto/ScrapRequest.java similarity index 83% rename from src/main/java/briefing/scrap/presentation/dto/ScrapRequest.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/dto/ScrapRequest.java index d00fd82..fe34bee 100644 --- a/src/main/java/briefing/scrap/presentation/dto/ScrapRequest.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/dto/ScrapRequest.java @@ -1,4 +1,4 @@ -package briefing.scrap.presentation.dto; +package com.example.briefingapi.scrap.presentation.dto; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/briefing/scrap/presentation/dto/ScrapResponse.java b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/dto/ScrapResponse.java similarity index 91% rename from src/main/java/briefing/scrap/presentation/dto/ScrapResponse.java rename to Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/dto/ScrapResponse.java index e5208a1..8c62589 100644 --- a/src/main/java/briefing/scrap/presentation/dto/ScrapResponse.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/scrap/presentation/dto/ScrapResponse.java @@ -1,10 +1,11 @@ -package briefing.scrap.presentation.dto; +package com.example.briefingapi.scrap.presentation.dto; import java.time.LocalDate; import java.time.LocalDateTime; -import briefing.common.enums.GptModel; -import briefing.common.enums.TimeOfDay; + +import com.example.briefingcommon.entity.enums.GptModel; +import com.example.briefingcommon.entity.enums.TimeOfDay; import lombok.*; @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/src/main/java/briefing/security/config/SecurityConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java similarity index 93% rename from src/main/java/briefing/security/config/SecurityConfig.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java index cf2b06c..a474b9d 100644 --- a/src/main/java/briefing/security/config/SecurityConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java @@ -1,9 +1,15 @@ -package briefing.security.config; +package com.example.briefingapi.security.config; import static org.springframework.security.config.Customizer.withDefaults; import java.util.Collections; +import com.example.briefingapi.security.filter.JwtRequestFilter; +import com.example.briefingapi.security.handler.JwtAccessDeniedHandler; +import com.example.briefingapi.security.handler.JwtAuthenticationEntryPoint; +import com.example.briefingapi.security.handler.JwtAuthenticationExceptionHandler; +import com.example.briefingapi.security.handler.SwaggerLoginSuccessHandler; +import com.example.briefingapi.security.provider.TokenProvider; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,12 +32,6 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfigurationSource; -import briefing.security.filter.JwtRequestFilter; -import briefing.security.handler.JwtAccessDeniedHandler; -import briefing.security.handler.JwtAuthenticationEntryPoint; -import briefing.security.handler.JwtAuthenticationExceptionHandler; -import briefing.security.handler.SwaggerLoginSuccessHandler; -import briefing.security.provider.TokenProvider; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -82,7 +82,7 @@ public WebSecurityCustomizer webSecurityCustomizer() { "/schedule", "/v3/api-docs", "/v3/api-docs/**", - "/docs/**", + "/docs/**","/fcms/**", "/briefings/temp"); } diff --git a/src/main/java/briefing/security/filter/JwtRequestFilter.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/filter/JwtRequestFilter.java similarity index 92% rename from src/main/java/briefing/security/filter/JwtRequestFilter.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/filter/JwtRequestFilter.java index 73d712f..0fed31b 100644 --- a/src/main/java/briefing/security/filter/JwtRequestFilter.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/filter/JwtRequestFilter.java @@ -1,7 +1,8 @@ -package briefing.security.filter; +package com.example.briefingapi.security.filter; import java.io.IOException; +import com.example.briefingapi.security.provider.TokenProvider; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -12,7 +13,7 @@ import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import briefing.security.provider.TokenProvider; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/briefing/security/handler/JwtAccessDeniedHandler.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAccessDeniedHandler.java similarity index 89% rename from src/main/java/briefing/security/handler/JwtAccessDeniedHandler.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAccessDeniedHandler.java index 3368c5d..36a2f14 100644 --- a/src/main/java/briefing/security/handler/JwtAccessDeniedHandler.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAccessDeniedHandler.java @@ -1,8 +1,10 @@ -package briefing.security.handler; +package com.example.briefingapi.security.handler; import java.io.IOException; import java.io.PrintWriter; +import com.example.briefingcommon.common.exception.common.ApiErrorResult; +import com.example.briefingcommon.common.exception.common.ErrorCode; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -12,8 +14,6 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; -import briefing.common.exception.common.ApiErrorResult; -import briefing.common.exception.common.ErrorCode; public class JwtAccessDeniedHandler implements AccessDeniedHandler { diff --git a/src/main/java/briefing/security/handler/JwtAuthenticationEntryPoint.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAuthenticationEntryPoint.java similarity index 89% rename from src/main/java/briefing/security/handler/JwtAuthenticationEntryPoint.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAuthenticationEntryPoint.java index 7dcebb0..53fffb5 100644 --- a/src/main/java/briefing/security/handler/JwtAuthenticationEntryPoint.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAuthenticationEntryPoint.java @@ -1,8 +1,10 @@ -package briefing.security.handler; +package com.example.briefingapi.security.handler; import java.io.IOException; import java.io.PrintWriter; +import com.example.briefingcommon.common.exception.common.ApiErrorResult; +import com.example.briefingcommon.common.exception.common.ErrorCode; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -12,8 +14,6 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; -import briefing.common.exception.common.ApiErrorResult; -import briefing.common.exception.common.ErrorCode; public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { diff --git a/src/main/java/briefing/security/handler/JwtAuthenticationExceptionHandler.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAuthenticationExceptionHandler.java similarity index 85% rename from src/main/java/briefing/security/handler/JwtAuthenticationExceptionHandler.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAuthenticationExceptionHandler.java index deb0c06..c4330bf 100644 --- a/src/main/java/briefing/security/handler/JwtAuthenticationExceptionHandler.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/JwtAuthenticationExceptionHandler.java @@ -1,8 +1,11 @@ -package briefing.security.handler; +package com.example.briefingapi.security.handler; import java.io.IOException; import java.io.PrintWriter; +import com.example.briefingapi.exception.JwtAuthenticationException; +import com.example.briefingcommon.common.exception.common.ApiErrorResult; +import com.example.briefingcommon.common.exception.common.ErrorCode; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -11,9 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.web.filter.OncePerRequestFilter; -import briefing.common.exception.JwtAuthenticationException; -import briefing.common.exception.common.ApiErrorResult; -import briefing.common.exception.common.ErrorCode; // @Component public class JwtAuthenticationExceptionHandler extends OncePerRequestFilter { diff --git a/src/main/java/briefing/security/handler/SwaggerLoginSuccessHandler.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/SwaggerLoginSuccessHandler.java similarity index 93% rename from src/main/java/briefing/security/handler/SwaggerLoginSuccessHandler.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/handler/SwaggerLoginSuccessHandler.java index 39aa9a2..effe35a 100644 --- a/src/main/java/briefing/security/handler/SwaggerLoginSuccessHandler.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/SwaggerLoginSuccessHandler.java @@ -1,4 +1,4 @@ -package briefing.security.handler; +package com.example.briefingapi.security.handler; import java.io.IOException; diff --git a/src/main/java/briefing/security/handler/annotation/AuthMember.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/annotation/AuthMember.java similarity index 81% rename from src/main/java/briefing/security/handler/annotation/AuthMember.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/handler/annotation/AuthMember.java index 7178ca4..432665c 100644 --- a/src/main/java/briefing/security/handler/annotation/AuthMember.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/annotation/AuthMember.java @@ -1,4 +1,4 @@ -package briefing.security.handler.annotation; +package com.example.briefingapi.security.handler.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/briefing/security/handler/annotation/AuthUserArgumentResolver.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/annotation/AuthUserArgumentResolver.java similarity index 91% rename from src/main/java/briefing/security/handler/annotation/AuthUserArgumentResolver.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/handler/annotation/AuthUserArgumentResolver.java index 4a0a530..1be7254 100644 --- a/src/main/java/briefing/security/handler/annotation/AuthUserArgumentResolver.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/handler/annotation/AuthUserArgumentResolver.java @@ -1,5 +1,8 @@ -package briefing.security.handler.annotation; +package com.example.briefingapi.security.handler.annotation; +import com.example.briefingapi.member.implement.MemberQueryService; +import com.example.briefingapi.security.provider.TokenProvider; +import com.example.briefingcommon.entity.Member; import jakarta.servlet.http.HttpServletRequest; import org.springframework.core.MethodParameter; @@ -10,9 +13,6 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; -import briefing.member.domain.Member; -import briefing.member.implement.MemberQueryService; -import briefing.security.provider.TokenProvider; import lombok.RequiredArgsConstructor; @Component diff --git a/src/main/java/briefing/security/provider/TokenProvider.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/provider/TokenProvider.java similarity index 96% rename from src/main/java/briefing/security/provider/TokenProvider.java rename to Briefing-Api/src/main/java/com/example/briefingapi/security/provider/TokenProvider.java index 20a0d2a..456e494 100644 --- a/src/main/java/briefing/security/provider/TokenProvider.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/provider/TokenProvider.java @@ -1,5 +1,4 @@ -package briefing.security.provider; - +package com.example.briefingapi.security.provider; import java.security.Key; import java.util.Arrays; import java.util.Base64; @@ -7,6 +6,8 @@ import java.util.Date; import java.util.stream.Collectors; +import com.example.briefingapi.exception.JwtAuthenticationException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -21,8 +22,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import briefing.common.exception.JwtAuthenticationException; -import briefing.common.exception.common.ErrorCode; import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; diff --git a/src/main/java/briefing/validation/annotation/CheckSameMember.java b/Briefing-Api/src/main/java/com/example/briefingapi/validation/annotation/CheckSameMember.java similarity index 79% rename from src/main/java/briefing/validation/annotation/CheckSameMember.java rename to Briefing-Api/src/main/java/com/example/briefingapi/validation/annotation/CheckSameMember.java index 14c2182..f4807f0 100644 --- a/src/main/java/briefing/validation/annotation/CheckSameMember.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/validation/annotation/CheckSameMember.java @@ -1,11 +1,12 @@ -package briefing.validation.annotation; +package com.example.briefingapi.validation.annotation; import java.lang.annotation.*; +import com.example.briefingapi.validation.validator.CheckSameMemberValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; -import briefing.validation.validator.CheckSameMemberValidator; + @Documented @Constraint(validatedBy = CheckSameMemberValidator.class) diff --git a/src/main/java/briefing/validation/validator/CheckSameMemberValidator.java b/Briefing-Api/src/main/java/com/example/briefingapi/validation/validator/CheckSameMemberValidator.java similarity index 90% rename from src/main/java/briefing/validation/validator/CheckSameMemberValidator.java rename to Briefing-Api/src/main/java/com/example/briefingapi/validation/validator/CheckSameMemberValidator.java index 38112a0..3278487 100644 --- a/src/main/java/briefing/validation/validator/CheckSameMemberValidator.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/validation/validator/CheckSameMemberValidator.java @@ -1,5 +1,7 @@ -package briefing.validation.validator; +package com.example.briefingapi.validation.validator; +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingapi.validation.annotation.CheckSameMember; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; @@ -8,8 +10,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import briefing.common.exception.common.ErrorCode; -import briefing.validation.annotation.CheckSameMember; import lombok.RequiredArgsConstructor; @Component diff --git a/Briefing-Api/src/main/resources/application.yml b/Briefing-Api/src/main/resources/application.yml new file mode 100644 index 0000000..d948a1b --- /dev/null +++ b/Briefing-Api/src/main/resources/application.yml @@ -0,0 +1,167 @@ +# default profile +spring: + application: + name: briefing-dev + profiles: + active: dev + batch: + jdbc: + initialize-schema: always +springdoc: + swagger-ui: + tags-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬 + operations-sorter: alpha # alpha: 알파벳 순 태그 정렬, method: HTTP Method 순 정렬 + cache: + disabled: true + use-fqn: true +swagger: + login: + id: ${SWAGGER_ID} + password : ${SWAGGER_PASS} +fcm: + key: ${FCM_KEY} + topic: + daily-push : dailyPush +--- +spring: + config: + activate: + on-profile: local + datasource: + username: ${aws.db.username} + password: ${aws.db.password} + url: ${aws.db.url} + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 + + data: + redis: + host: localhost + port: 6379 +eureka: + client: + service-url: + defaultZone: http://gateway.newsbreifing.store:8761/eureka + instance: + # 표기되는 규칙 변경 + instance-id: dev_briefing_server + hostname: dev.newsbreifing.store + ip-address: dev.newsbreifing.store + +jwt: + header: Authorization + # dev server + secret: ${JWT_SECRET} + authorities-key: authoritiesKey + access-token-validity-in-seconds: 1210000000 # 30 m + refresh-token-validity-in-seconds: 1210000000 # 14 d + +openai: + token: ${OPEN_API_TOKEN} + url: + chat: https://api.openai.com/v1/chat/completions + +--- +spring: + application: + name: dev + config: + activate: + on-profile: dev + datasource: + username: ${aws.db.username} + password: ${aws.db.password} + url: ${aws.db.url} + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + # show_sql: true + # format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 + data: + redis: + host: ${REDIS_URL} + port: 6379 +eureka: + instance: + # 표기되는 규칙 변경 + instance-id: dev_briefing_server + hostname: dev.newsbreifing.store + ip-address: dev.newsbreifing.store + client: + service-url: + defaultZone: http://gateway.newsbreifing.store:8761/eureka + +jwt: + header: Authorization + # dev server + secret: ${JWT_SECRET} + # secret : ${JWT_SECRET} + authorities-key: authoritiesKey + access-token-validity-in-seconds: 1210000000 # 30 m + refresh-token-validity-in-seconds: 1210000000 # 14 d + +openai: + token: ${OPEN_API_TOKEN} + url: + chat: https://api.openai.com/v1/chat/completions +--- +spring: + config: + activate: + on-profile: release + datasource: + username: ${aws.db.username} + password: ${aws.db.password} + url: ${aws.db.url} + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + # show_sql: true + # format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 + data: + redis: + host: ${release.redis.host} + port: 6379 +jwt: + header: Authorization + # dev server + secret: ${JWT_SECRET} + # secret : ${JWT_SECRET} + authorities-key: authoritiesKey + access-token-validity-in-seconds: 1210000000 # 30 m + refresh-token-validity-in-seconds: 1210000000 # 14 d + +openai: + token: ${OPEN_API_TOKEN} + url: + chat: https://api.openai.com/v1/chat/completions diff --git a/Briefing-Api/src/test/java/com/example/briefingapi/BriefingApiApplicationTests.java b/Briefing-Api/src/test/java/com/example/briefingapi/BriefingApiApplicationTests.java new file mode 100644 index 0000000..1a80c17 --- /dev/null +++ b/Briefing-Api/src/test/java/com/example/briefingapi/BriefingApiApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.briefingapi; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BriefingApiApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/Briefing-Batch/build.gradle b/Briefing-Batch/build.gradle new file mode 100644 index 0000000..4be5d5c --- /dev/null +++ b/Briefing-Batch/build.gradle @@ -0,0 +1,17 @@ +//tasks.named('bootJar') { //빌드할 때 bootjar 파일로 하겠다는 의미 +// enabled = false +//} +// +//tasks.named('jar') { //빌드할 때 jar 파일로 하겠다는 의미 +// enabled = true +//} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-batch' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.batch:spring-batch-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/Briefing-Batch/gradle/wrapper/gradle-wrapper.jar b/Briefing-Batch/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/Briefing-Batch/gradle/wrapper/gradle-wrapper.properties b/Briefing-Batch/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Briefing-Batch/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/Briefing-Batch/src/main/java/com/example/briefingbatch/BriefingBatchApplication.java b/Briefing-Batch/src/main/java/com/example/briefingbatch/BriefingBatchApplication.java new file mode 100644 index 0000000..2f94d64 --- /dev/null +++ b/Briefing-Batch/src/main/java/com/example/briefingbatch/BriefingBatchApplication.java @@ -0,0 +1,13 @@ +package com.example.briefingbatch; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BriefingBatchApplication { + + public static void main(String[] args) { + SpringApplication.run(BriefingBatchApplication.class, args); + } + +} diff --git a/Briefing-Batch/src/main/resources/application.properties b/Briefing-Batch/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Briefing-Batch/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/Briefing-Batch/src/test/java/com/example/briefingbatch/BriefingBatchApplicationTests.java b/Briefing-Batch/src/test/java/com/example/briefingbatch/BriefingBatchApplicationTests.java new file mode 100644 index 0000000..340d465 --- /dev/null +++ b/Briefing-Batch/src/test/java/com/example/briefingbatch/BriefingBatchApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.briefingbatch; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BriefingBatchApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/Briefing-FCM/.gitignore b/Briefing-FCM/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/Briefing-FCM/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/Briefing-FCM/build.gradle b/Briefing-FCM/build.gradle new file mode 100644 index 0000000..9178dca --- /dev/null +++ b/Briefing-FCM/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.2' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/Briefing-FCM/gradle/wrapper/gradle-wrapper.jar b/Briefing-FCM/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/Briefing-FCM/gradle/wrapper/gradle-wrapper.properties b/Briefing-FCM/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/Briefing-FCM/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/Briefing-FCM/gradlew b/Briefing-FCM/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/Briefing-FCM/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Briefing-FCM/gradlew.bat b/Briefing-FCM/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/Briefing-FCM/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Briefing-FCM/settings.gradle b/Briefing-FCM/settings.gradle new file mode 100644 index 0000000..f53aaa5 --- /dev/null +++ b/Briefing-FCM/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'Briefing-FCM' diff --git a/Briefing-FCM/src/main/java/com/example/briefingfcm/BriefingFcmApplication.java b/Briefing-FCM/src/main/java/com/example/briefingfcm/BriefingFcmApplication.java new file mode 100644 index 0000000..d7cb544 --- /dev/null +++ b/Briefing-FCM/src/main/java/com/example/briefingfcm/BriefingFcmApplication.java @@ -0,0 +1,13 @@ +package com.example.briefingfcm; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BriefingFcmApplication { + + public static void main(String[] args) { + SpringApplication.run(BriefingFcmApplication.class, args); + } + +} diff --git a/Briefing-FCM/src/main/resources/application.properties b/Briefing-FCM/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Briefing-FCM/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/Briefing-FCM/src/test/java/com/example/briefingfcm/BriefingFcmApplicationTests.java b/Briefing-FCM/src/test/java/com/example/briefingfcm/BriefingFcmApplicationTests.java new file mode 100644 index 0000000..050f969 --- /dev/null +++ b/Briefing-FCM/src/test/java/com/example/briefingfcm/BriefingFcmApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.briefingfcm; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BriefingFcmApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/build.gradle b/build.gradle index a209aaa..846c845 100644 --- a/build.gradle +++ b/build.gradle @@ -5,11 +5,15 @@ plugins { id 'com.diffplug.spotless' version '6.23.3' // Spotless 플러그인 } -group = 'briefing.info' -version = '0.0.1-SNAPSHOT' - -java { +allprojects { + group = 'com.chooz' + version = '0.0.1-SNAPSHOT' sourceCompatibility = '17' + + repositories { + mavenCentral() + } + } configurations { @@ -18,44 +22,31 @@ configurations { } } -repositories { - mavenCentral() -} +subprojects { // 각 모듈에 적용할 공통 설정 + apply plugin: 'java' + + // build.gradle에서 api() 를 사용하려면 java-library 사용 + apply plugin: 'java-library' + + apply plugin: 'org.springframework.boot' + apply plugin: 'io.spring.dependency-management' + + dependencies { // 롬복은 공통적으로 사용하는 의존성이니 여기서 끌어다 사용 + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + } + + tasks.named('bootJar') { //빌드할 때 bootjar 파일로 하겠다는 의미 + enabled = false + } + + tasks.named('jar') { //빌드할 때 jar 파일로 하겠다는 의미 + enabled = true + } -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - - // eureka client 설정 - implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client' - - // querydsl - // == 스프링 부트 3.0 이상 == - implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' - annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" - annotationProcessor "jakarta.annotation:jakarta.annotation-api" - annotationProcessor "jakarta.persistence:jakarta.persistence-api" - - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'io.jsonwebtoken:jjwt-api:0.11.5' - implementation 'io.springfox:springfox-swagger2:2.9.2' - implementation 'io.springfox:springfox-swagger-ui:2.9.2' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' - implementation 'com.googlecode.json-simple:json-simple:1.1.1' - implementation 'mysql:mysql-connector-java' // 추가 작성 - - implementation platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.3") - compileOnly 'org.projectlombok:lombok' - runtimeOnly 'com.h2database:h2' -// runtimeOnly 'org.postgresql:postgresql' -// runtimeOnly 'com.mysql:mysql-connector-j' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + tasks.named('test') { + useJUnitPlatform() + } } def querydslSrcDir = 'src/main/generated' @@ -68,10 +59,6 @@ tasks.withType(JavaCompile) { options.generatedSourceOutputDirectory = file(querydslSrcDir) } -tasks.named('test') { - useJUnitPlatform() -} - /* compileJava 태스크가 실행되기 전에 spotlessApply 태스크가 먼저 실행되도록 구성 diff --git a/core/Briefing-Common/build.gradle b/core/Briefing-Common/build.gradle new file mode 100644 index 0000000..68b8e7b --- /dev/null +++ b/core/Briefing-Common/build.gradle @@ -0,0 +1,38 @@ +bootJar { + enabled = false +} + +jar { + enabled = true +} + +dependencies { + + // querydsl + // == 스프링 부트 3.0 이상 == + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' +} + +tasks.named('test') { + useJUnitPlatform() +} + +def querydslSrcDir = 'src/main/generated' + +clean { + delete file(querydslSrcDir) +} + +tasks.withType(JavaCompile) { + options.generatedSourceOutputDirectory = file(querydslSrcDir) +} \ No newline at end of file diff --git a/core/Briefing-Common/gradle/wrapper/gradle-wrapper.jar b/core/Briefing-Common/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/core/Briefing-Common/gradle/wrapper/gradle-wrapper.properties b/core/Briefing-Common/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/core/Briefing-Common/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/src/main/generated/briefing/briefing/domain/QArticle.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QArticle.java similarity index 84% rename from src/main/generated/briefing/briefing/domain/QArticle.java rename to core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QArticle.java index c515f8e..6f97129 100644 --- a/src/main/generated/briefing/briefing/domain/QArticle.java +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QArticle.java @@ -1,4 +1,4 @@ -package briefing.briefing.domain; +package com.example.briefingcommon.entity; import static com.querydsl.core.types.PathMetadataFactory.*; @@ -15,11 +15,11 @@ @Generated("com.querydsl.codegen.DefaultEntitySerializer") public class QArticle extends EntityPathBase

{ - private static final long serialVersionUID = -598074260L; + private static final long serialVersionUID = 426734549L; public static final QArticle article = new QArticle("article"); - public final briefing.common.domain.QBaseDateTimeEntity _super = new briefing.common.domain.QBaseDateTimeEntity(this); + public final QBaseDateTimeEntity _super = new QBaseDateTimeEntity(this); //inherited public final DateTimePath createdAt = _super.createdAt; diff --git a/src/main/generated/briefing/common/domain/QBaseDateTimeEntity.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBaseDateTimeEntity.java similarity index 91% rename from src/main/generated/briefing/common/domain/QBaseDateTimeEntity.java rename to core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBaseDateTimeEntity.java index aadba51..0e6bc71 100644 --- a/src/main/generated/briefing/common/domain/QBaseDateTimeEntity.java +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBaseDateTimeEntity.java @@ -1,4 +1,4 @@ -package briefing.common.domain; +package com.example.briefingcommon.entity; import static com.querydsl.core.types.PathMetadataFactory.*; @@ -15,7 +15,7 @@ @Generated("com.querydsl.codegen.DefaultSupertypeSerializer") public class QBaseDateTimeEntity extends EntityPathBase { - private static final long serialVersionUID = -1472697380L; + private static final long serialVersionUID = 1973246032L; public static final QBaseDateTimeEntity baseDateTimeEntity = new QBaseDateTimeEntity("baseDateTimeEntity"); diff --git a/src/main/generated/briefing/briefing/domain/QBriefing.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBriefing.java similarity index 70% rename from src/main/generated/briefing/briefing/domain/QBriefing.java rename to core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBriefing.java index ffcdca6..b63bd7d 100644 --- a/src/main/generated/briefing/briefing/domain/QBriefing.java +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBriefing.java @@ -1,4 +1,4 @@ -package briefing.briefing.domain; +package com.example.briefingcommon.entity; import static com.querydsl.core.types.PathMetadataFactory.*; @@ -16,11 +16,11 @@ @Generated("com.querydsl.codegen.DefaultEntitySerializer") public class QBriefing extends EntityPathBase { - private static final long serialVersionUID = 63849586L; + private static final long serialVersionUID = 1768151593L; public static final QBriefing briefing = new QBriefing("briefing"); - public final briefing.common.domain.QBaseDateTimeEntity _super = new briefing.common.domain.QBaseDateTimeEntity(this); + public final QBaseDateTimeEntity _super = new QBaseDateTimeEntity(this); public final ListPath briefingArticles = this.createList("briefingArticles", BriefingArticle.class, QBriefingArticle.class, PathInits.DIRECT2); @@ -29,7 +29,7 @@ public class QBriefing extends EntityPathBase { //inherited public final DateTimePath createdAt = _super.createdAt; - public final EnumPath gptModel = createEnum("gptModel", briefing.common.enums.GptModel.class); + public final EnumPath gptModel = createEnum("gptModel", com.example.briefingcommon.entity.enums.GptModel.class); public final NumberPath id = createNumber("id", Long.class); @@ -37,11 +37,11 @@ public class QBriefing extends EntityPathBase { public final StringPath subtitle = createString("subtitle"); - public final EnumPath timeOfDay = createEnum("timeOfDay", briefing.common.enums.TimeOfDay.class); + public final EnumPath timeOfDay = createEnum("timeOfDay", com.example.briefingcommon.entity.enums.TimeOfDay.class); public final StringPath title = createString("title"); - public final EnumPath type = createEnum("type", briefing.common.enums.BriefingType.class); + public final EnumPath type = createEnum("type", com.example.briefingcommon.entity.enums.BriefingType.class); //inherited public final DateTimePath updatedAt = _super.updatedAt; diff --git a/src/main/generated/briefing/briefing/domain/QBriefingArticle.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBriefingArticle.java similarity index 89% rename from src/main/generated/briefing/briefing/domain/QBriefingArticle.java rename to core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBriefingArticle.java index c9600b7..9e8782c 100644 --- a/src/main/generated/briefing/briefing/domain/QBriefingArticle.java +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QBriefingArticle.java @@ -1,4 +1,4 @@ -package briefing.briefing.domain; +package com.example.briefingcommon.entity; import static com.querydsl.core.types.PathMetadataFactory.*; @@ -16,13 +16,13 @@ @Generated("com.querydsl.codegen.DefaultEntitySerializer") public class QBriefingArticle extends EntityPathBase { - private static final long serialVersionUID = 37002276L; + private static final long serialVersionUID = 1813281421L; private static final PathInits INITS = PathInits.DIRECT2; public static final QBriefingArticle briefingArticle = new QBriefingArticle("briefingArticle"); - public final briefing.common.domain.QBaseDateTimeEntity _super = new briefing.common.domain.QBaseDateTimeEntity(this); + public final QBaseDateTimeEntity _super = new QBaseDateTimeEntity(this); public final QArticle article; diff --git a/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QFcmToken.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QFcmToken.java new file mode 100644 index 0000000..f1591c4 --- /dev/null +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QFcmToken.java @@ -0,0 +1,53 @@ +package com.example.briefingcommon.entity; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QFcmToken is a Querydsl query type for FcmToken + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QFcmToken extends EntityPathBase { + + private static final long serialVersionUID = -179108470L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QFcmToken fcmToken = new QFcmToken("fcmToken"); + + public final NumberPath id = createNumber("id", Long.class); + + public final QMember member; + + public final StringPath token = createString("token"); + + public QFcmToken(String variable) { + this(FcmToken.class, forVariable(variable), INITS); + } + + public QFcmToken(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QFcmToken(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QFcmToken(PathMetadata metadata, PathInits inits) { + this(FcmToken.class, metadata, inits); + } + + public QFcmToken(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.member = inits.isInitialized("member") ? new QMember(forProperty("member")) : null; + } + +} + diff --git a/src/main/generated/briefing/member/domain/QMember.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QMember.java similarity index 59% rename from src/main/generated/briefing/member/domain/QMember.java rename to core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QMember.java index 2113fc3..2a3e6de 100644 --- a/src/main/generated/briefing/member/domain/QMember.java +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QMember.java @@ -1,4 +1,4 @@ -package briefing.member.domain; +package com.example.briefingcommon.entity; import static com.querydsl.core.types.PathMetadataFactory.*; @@ -16,11 +16,11 @@ @Generated("com.querydsl.codegen.DefaultEntitySerializer") public class QMember extends EntityPathBase { - private static final long serialVersionUID = 2051544022L; + private static final long serialVersionUID = 1037831131L; public static final QMember member = new QMember("member1"); - public final briefing.common.domain.QBaseDateTimeEntity _super = new briefing.common.domain.QBaseDateTimeEntity(this); + public final QBaseDateTimeEntity _super = new QBaseDateTimeEntity(this); //inherited public final DateTimePath createdAt = _super.createdAt; @@ -31,15 +31,15 @@ public class QMember extends EntityPathBase { public final StringPath profileImgUrl = createString("profileImgUrl"); - public final EnumPath role = createEnum("role", briefing.common.enums.MemberRole.class); + public final EnumPath role = createEnum("role", com.example.briefingcommon.entity.enums.MemberRole.class); - public final ListPath scrapList = this.createList("scrapList", briefing.scrap.domain.Scrap.class, briefing.scrap.domain.QScrap.class, PathInits.DIRECT2); + public final ListPath scrapList = this.createList("scrapList", Scrap.class, QScrap.class, PathInits.DIRECT2); public final StringPath socialId = createString("socialId"); - public final EnumPath socialType = createEnum("socialType", briefing.common.enums.SocialType.class); + public final EnumPath socialType = createEnum("socialType", com.example.briefingcommon.entity.enums.SocialType.class); - public final EnumPath status = createEnum("status", briefing.common.enums.MemberStatus.class); + public final EnumPath status = createEnum("status", com.example.briefingcommon.entity.enums.MemberStatus.class); //inherited public final DateTimePath updatedAt = _super.updatedAt; diff --git a/src/main/generated/briefing/scrap/domain/QScrap.java b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QScrap.java similarity index 71% rename from src/main/generated/briefing/scrap/domain/QScrap.java rename to core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QScrap.java index e0c5e17..a8524bc 100644 --- a/src/main/generated/briefing/scrap/domain/QScrap.java +++ b/core/Briefing-Common/src/main/generated/com/example/briefingcommon/entity/QScrap.java @@ -1,4 +1,4 @@ -package briefing.scrap.domain; +package com.example.briefingcommon.entity; import static com.querydsl.core.types.PathMetadataFactory.*; @@ -16,22 +16,22 @@ @Generated("com.querydsl.codegen.DefaultEntitySerializer") public class QScrap extends EntityPathBase { - private static final long serialVersionUID = -881090678L; + private static final long serialVersionUID = -930866576L; private static final PathInits INITS = PathInits.DIRECT2; public static final QScrap scrap = new QScrap("scrap"); - public final briefing.common.domain.QBaseDateTimeEntity _super = new briefing.common.domain.QBaseDateTimeEntity(this); + public final QBaseDateTimeEntity _super = new QBaseDateTimeEntity(this); - public final briefing.briefing.domain.QBriefing briefing; + public final QBriefing briefing; //inherited public final DateTimePath createdAt = _super.createdAt; public final NumberPath id = createNumber("id", Long.class); - public final briefing.member.domain.QMember member; + public final QMember member; //inherited public final DateTimePath updatedAt = _super.updatedAt; @@ -54,8 +54,8 @@ public QScrap(PathMetadata metadata, PathInits inits) { public QScrap(Class type, PathMetadata metadata, PathInits inits) { super(type, metadata, inits); - this.briefing = inits.isInitialized("briefing") ? new briefing.briefing.domain.QBriefing(forProperty("briefing")) : null; - this.member = inits.isInitialized("member") ? new briefing.member.domain.QMember(forProperty("member")) : null; + this.briefing = inits.isInitialized("briefing") ? new QBriefing(forProperty("briefing")) : null; + this.member = inits.isInitialized("member") ? new QMember(forProperty("member")) : null; } } diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/DomainPackageLocation.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/DomainPackageLocation.java new file mode 100644 index 0000000..2803cf9 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/DomainPackageLocation.java @@ -0,0 +1,4 @@ +package com.example.briefingcommon; + +public interface DomainPackageLocation { +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/JpaConfig.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/JpaConfig.java new file mode 100644 index 0000000..c950dbb --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/JpaConfig.java @@ -0,0 +1,13 @@ +package com.example.briefingcommon; + +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@Configuration +@EnableJpaAuditing +@EntityScan(basePackageClasses = DomainPackageLocation.class) +@EnableJpaRepositories(basePackageClasses = DomainPackageLocation.class) +public class JpaConfig {} diff --git a/src/main/java/briefing/config/QueryDslConfig.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/QueryDslConfig.java similarity index 81% rename from src/main/java/briefing/config/QueryDslConfig.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/QueryDslConfig.java index 4d4db3b..3233f53 100644 --- a/src/main/java/briefing/config/QueryDslConfig.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/QueryDslConfig.java @@ -1,7 +1,8 @@ -package briefing.config; +package com.example.briefingcommon; import jakarta.persistence.EntityManager; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/AppleOAuthException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/AppleOAuthException.java new file mode 100644 index 0000000..a628b92 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/AppleOAuthException.java @@ -0,0 +1,11 @@ +package com.example.briefingcommon.common.exception; + + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class AppleOAuthException extends GeneralException { + public AppleOAuthException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/BriefingException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/BriefingException.java new file mode 100644 index 0000000..17d4335 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/BriefingException.java @@ -0,0 +1,11 @@ +package com.example.briefingcommon.common.exception; + + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class BriefingException extends GeneralException { + public BriefingException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ChattingException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ChattingException.java new file mode 100644 index 0000000..288a9ac --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ChattingException.java @@ -0,0 +1,11 @@ +package com.example.briefingcommon.common.exception; + + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class ChattingException extends GeneralException { + public ChattingException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/CustomFeignClientException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/CustomFeignClientException.java new file mode 100644 index 0000000..ba6c2b2 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/CustomFeignClientException.java @@ -0,0 +1,12 @@ +package com.example.briefingcommon.common.exception; + + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class CustomFeignClientException extends GeneralException { + + public CustomFeignClientException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/MemberException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/MemberException.java new file mode 100644 index 0000000..daa0c6c --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/MemberException.java @@ -0,0 +1,10 @@ +package com.example.briefingcommon.common.exception; + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class MemberException extends GeneralException { + public MemberException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/RefreshTokenException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/RefreshTokenException.java new file mode 100644 index 0000000..372682c --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/RefreshTokenException.java @@ -0,0 +1,10 @@ +package com.example.briefingcommon.common.exception; + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class RefreshTokenException extends GeneralException { + public RefreshTokenException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ScrapException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ScrapException.java new file mode 100644 index 0000000..3b4ef83 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/ScrapException.java @@ -0,0 +1,11 @@ +package com.example.briefingcommon.common.exception; + + +import com.example.briefingcommon.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.common.GeneralException; + +public class ScrapException extends GeneralException { + public ScrapException(ErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/briefing/common/exception/common/ApiErrorResult.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ApiErrorResult.java similarity index 91% rename from src/main/java/briefing/common/exception/common/ApiErrorResult.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ApiErrorResult.java index 387f660..8d819c4 100644 --- a/src/main/java/briefing/common/exception/common/ApiErrorResult.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ApiErrorResult.java @@ -1,4 +1,5 @@ -package briefing.common.exception.common; +package com.example.briefingcommon.common.exception.common; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/briefing/common/exception/common/BaseException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/BaseException.java similarity index 77% rename from src/main/java/briefing/common/exception/common/BaseException.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/BaseException.java index f919fcb..45a98ac 100644 --- a/src/main/java/briefing/common/exception/common/BaseException.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/BaseException.java @@ -1,4 +1,5 @@ -package briefing.common.exception.common; +package com.example.briefingcommon.common.exception.common; + public abstract class BaseException extends RuntimeException { diff --git a/src/main/java/briefing/common/exception/common/BaseExceptionType.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/BaseExceptionType.java similarity index 68% rename from src/main/java/briefing/common/exception/common/BaseExceptionType.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/BaseExceptionType.java index d962b9d..958a640 100644 --- a/src/main/java/briefing/common/exception/common/BaseExceptionType.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/BaseExceptionType.java @@ -1,4 +1,5 @@ -package briefing.common.exception.common; +package com.example.briefingcommon.common.exception.common; + import org.springframework.http.HttpStatus; diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ErrorCode.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ErrorCode.java new file mode 100644 index 0000000..745792e --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/ErrorCode.java @@ -0,0 +1,108 @@ +package com.example.briefingcommon.common.exception.common; + + +import static org.springframework.http.HttpStatus.*; + +import java.util.Arrays; +import java.util.Optional; +import java.util.function.Predicate; + +import org.springframework.http.HttpStatus; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum ErrorCode { + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON000", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON001", "잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON002", "로그인이 필요합니다."), + _METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED, "COMMON003", "지원하지 않는 Http Method 입니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON004", "금지된 요청입니다."), + + // 인증 관련 에러 + ForbiddenException(HttpStatus.UNAUTHORIZED, "AUTH002", "해당 요청에 대한 권한이 없습니다."), + UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED, "AUTH003", "로그인 후 이용가능합니다. 토큰을 입력해 주세요"), + EXPIRED_JWT_EXCEPTION(HttpStatus.UNAUTHORIZED, "AUTH004", "기존 토큰이 만료되었습니다. 토큰을 재발급해주세요."), + RELOGIN_EXCEPTION(HttpStatus.UNAUTHORIZED, "AUTH005", "모든 토큰이 만료되었습니다. 다시 로그인해주세요."), + INVALID_TOKEN_EXCEPTION(HttpStatus.UNAUTHORIZED, "AUTH006", "토큰이 올바르지 않습니다."), + HIJACK_JWT_TOKEN_EXCEPTION(HttpStatus.UNAUTHORIZED, "AUTH007", "탈취된(로그아웃 된) 토큰입니다 다시 로그인 해주세요."), + INVALID_REFRESH_TOKEN(HttpStatus.BAD_REQUEST, "AUTH009", "리프레쉬 토큰이 유효하지 않습니다. 다시 로그인 해주세요"), + + // oauth 에러 + APPLE_BAD_REQUEST(HttpStatus.BAD_REQUEST, "OAUTH001", "애플 토큰이 잘못되었습니다."), + APPLE_SERVER_ERROR(HttpStatus.FORBIDDEN, "OAUTH002", "애플 서버와 통신에 실패 하였습니다."), + FAIL_TO_MAKE_APPLE_PUBLIC_KEY(HttpStatus.BAD_REQUEST, "OAUTH003", "새로운 애플 공개키 생성에 실패하였습니다."), + + // feign client 에러 + FEIGN_BAD_REQUEST(HttpStatus.BAD_REQUEST, "FEIGN_400_1", "Feign server bad request"), + FEIGN_UNAUTHORIZED(HttpStatus.BAD_REQUEST, "FEIGN_400_2", "Feign server unauthorized"), + FEIGN_FORBIDDEN(HttpStatus.BAD_REQUEST, "FEIGN_400_3", "Feign server forbidden"), + FEIGN_EXPIRED_TOKEN(HttpStatus.BAD_REQUEST, "FEIGN_400_4", "Feign server expired token"), + FEIGN_NOT_FOUND(HttpStatus.BAD_REQUEST, "FEIGN_400_5", "Feign server not found error"), + FEIGN_INTERNAL_SERVER_ERROR(HttpStatus.BAD_REQUEST, "FEIGN_400_6", "Feign server internal server error"), + FEIGN_METHOD_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "FEIGN_400_7", "Feign server method not allowed"), + FEIGN_SERVER_ERROR(HttpStatus.BAD_REQUEST, "FEIGN_500", "Feign server error"), + + // member 관련 에러 + + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER_001", "사용자가 없습니다"), + MEMBER_NOT_SAME(HttpStatus.BAD_REQUEST, "MEMBER_002", "로그인 된 사용자와 대상 사용자가 일치하지 않습니다."), + + // member 에러 + + // scrap 에러 + SCRAP_ALREADY_EXISTS(HttpStatus.CONFLICT, "SCRAP_001", "이미 스크랩했습니다."), + SCRAP_NOT_FOUND(HttpStatus.NOT_FOUND, "SCRAP_002", "존재하지 않는 스크랩입니다."), + DUPLICATE_SCRAP(HttpStatus.CONFLICT, "SCRAP_003", "중복된 스크랩 요청입니다."), + + // briefing 에러 + NOT_FOUND_BRIEFING(HttpStatus.NOT_FOUND, "BRIEFING_001", "브리핑이 존재하지 않습니다."), + NOT_FOUND_TYPE(HttpStatus.BAD_REQUEST, "BRIEFING_002", "해당하는 type을 찾을 수 없습니다."), + + // chatting 에러 + + NOT_FOUND_CHATTING(HttpStatus.NOT_FOUND, "CHATTING_001", "해당하는 채팅을 찾을 수 없습니다."), + LAST_MESSAGE_NOT_EXIST(HttpStatus.BAD_REQUEST, "CHATTING_002", "마지막 메시지를 찾을 수 없습니다."), + BAD_LAST_MESSAGE_ROLE(HttpStatus.BAD_REQUEST, "CHATTING_003", "마지막 메시지의 역할이 user가 아닙니다."), + CAN_NOT_EMPTY_CONTENT(HttpStatus.BAD_REQUEST, "CHATTING_004", "content가 비어있습니다."), + NOT_FOUND_ROLE(HttpStatus.BAD_REQUEST, "CHATTING_005", "해당하는 role을 찾을 수 없습니다."), + NOT_FOUND_MODEL(HttpStatus.BAD_REQUEST, "CHATTING_006", "해당하는 mode을 찾을 수 없습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + public String getMessage(Throwable e) { + return this.getMessage(this.getMessage() + " - " + e.getMessage()); + // 결과 예시 - "Validation error - Reason why it isn't valid" + } + + public String getMessage(String message) { + return Optional.ofNullable(message) + .filter(Predicate.not(String::isBlank)) + .orElse(this.getMessage()); + } + + public static ErrorCode valueOf(HttpStatus httpStatus) { + if (httpStatus == null) { + throw new GeneralException("HttpStatus is null."); + } + + return Arrays.stream(values()) + .filter(errorCode -> errorCode.getHttpStatus() == httpStatus) + .findFirst() + .orElseGet( + () -> { + if (httpStatus.is4xxClientError()) { + return ErrorCode._BAD_REQUEST; + } else return ErrorCode._INTERNAL_SERVER_ERROR; + }); + } + + // @Override + // public String toString() { + // return String.format("%s (%d)", this.name(), this.getCode()); + // } +} diff --git a/src/main/java/briefing/common/exception/common/GeneralException.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/GeneralException.java similarity index 96% rename from src/main/java/briefing/common/exception/common/GeneralException.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/GeneralException.java index 0fef5fd..8834799 100644 --- a/src/main/java/briefing/common/exception/common/GeneralException.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/exception/common/GeneralException.java @@ -1,4 +1,5 @@ -package briefing.common.exception.common; +package com.example.briefingcommon.common.exception.common; + import lombok.Getter; diff --git a/src/main/java/briefing/common/presentation/converter/APIVersionRequestConverter.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/APIVersionRequestConverter.java similarity index 70% rename from src/main/java/briefing/common/presentation/converter/APIVersionRequestConverter.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/APIVersionRequestConverter.java index d58c231..ae0d6cf 100644 --- a/src/main/java/briefing/common/presentation/converter/APIVersionRequestConverter.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/APIVersionRequestConverter.java @@ -1,9 +1,8 @@ -package briefing.common.presentation.converter; +package com.example.briefingcommon.common.presentation.converter; -import org.springframework.core.convert.converter.Converter; - -import briefing.common.enums.APIVersion; +import com.example.briefingcommon.entity.enums.APIVersion; import lombok.NonNull; +import org.springframework.core.convert.converter.Converter; public class APIVersionRequestConverter implements Converter { diff --git a/src/main/java/briefing/common/presentation/converter/BriefingTypeRequestConverter.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/BriefingTypeRequestConverter.java similarity index 70% rename from src/main/java/briefing/common/presentation/converter/BriefingTypeRequestConverter.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/BriefingTypeRequestConverter.java index 8e744dd..fab96e7 100644 --- a/src/main/java/briefing/common/presentation/converter/BriefingTypeRequestConverter.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/BriefingTypeRequestConverter.java @@ -1,8 +1,7 @@ -package briefing.common.presentation.converter; +package com.example.briefingcommon.common.presentation.converter; +import com.example.briefingcommon.entity.enums.BriefingType; import org.springframework.core.convert.converter.Converter; - -import briefing.common.enums.BriefingType; import lombok.NonNull; public class BriefingTypeRequestConverter implements Converter { diff --git a/src/main/java/briefing/common/presentation/converter/GptModelRequestConverter.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/GptModelRequestConverter.java similarity index 69% rename from src/main/java/briefing/common/presentation/converter/GptModelRequestConverter.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/GptModelRequestConverter.java index 688b146..b1289b0 100644 --- a/src/main/java/briefing/common/presentation/converter/GptModelRequestConverter.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/GptModelRequestConverter.java @@ -1,8 +1,9 @@ -package briefing.common.presentation.converter; +package com.example.briefingcommon.common.presentation.converter; +import com.example.briefingcommon.entity.enums.GptModel; import org.springframework.core.convert.converter.Converter; -import briefing.common.enums.GptModel; + import lombok.NonNull; public class GptModelRequestConverter implements Converter { diff --git a/src/main/java/briefing/common/presentation/converter/SocialTypeRequestConverter.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/SocialTypeRequestConverter.java similarity index 67% rename from src/main/java/briefing/common/presentation/converter/SocialTypeRequestConverter.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/SocialTypeRequestConverter.java index 6a27acc..ce857b8 100644 --- a/src/main/java/briefing/common/presentation/converter/SocialTypeRequestConverter.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/SocialTypeRequestConverter.java @@ -1,8 +1,9 @@ -package briefing.common.presentation.converter; +package com.example.briefingcommon.common.presentation.converter; +import com.example.briefingcommon.entity.enums.SocialType; import org.springframework.core.convert.converter.Converter; -import briefing.common.enums.SocialType; + public class SocialTypeRequestConverter implements Converter { @Override diff --git a/src/main/java/briefing/common/presentation/converter/TimeOfDayConverter.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/TimeOfDayConverter.java similarity index 69% rename from src/main/java/briefing/common/presentation/converter/TimeOfDayConverter.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/TimeOfDayConverter.java index 4d1f3c3..1c32e9c 100644 --- a/src/main/java/briefing/common/presentation/converter/TimeOfDayConverter.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/converter/TimeOfDayConverter.java @@ -1,8 +1,9 @@ -package briefing.common.presentation.converter; +package com.example.briefingcommon.common.presentation.converter; +import com.example.briefingcommon.entity.enums.TimeOfDay; import org.springframework.core.convert.converter.Converter; -import briefing.common.enums.TimeOfDay; + import lombok.NonNull; public class TimeOfDayConverter implements Converter { diff --git a/src/main/java/briefing/common/presentation/response/CommonResponse.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/response/CommonResponse.java similarity index 79% rename from src/main/java/briefing/common/presentation/response/CommonResponse.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/response/CommonResponse.java index ad0eac0..c83cfb5 100644 --- a/src/main/java/briefing/common/presentation/response/CommonResponse.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/response/CommonResponse.java @@ -1,4 +1,4 @@ -package briefing.common.presentation.response; +package com.example.briefingcommon.common.presentation.response; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -29,6 +29,10 @@ public static CommonResponse onSuccess(T data) { return new CommonResponse<>(true, "요청에 성공하였습니다.", "1000", data); } + public static CommonResponse onSuccess() { + return new CommonResponse<>(true, "요청에 성공하였습니다.", "1000", null); + } + public static CommonResponse onFailure(String code, String message, T data) { return new CommonResponse<>(false, code, message, data); } diff --git a/src/main/java/briefing/common/presentation/response/PageResponse.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/response/PageResponse.java similarity index 76% rename from src/main/java/briefing/common/presentation/response/PageResponse.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/response/PageResponse.java index 92b48ab..f809164 100644 --- a/src/main/java/briefing/common/presentation/response/PageResponse.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/common/presentation/response/PageResponse.java @@ -1,4 +1,4 @@ -package briefing.common.presentation.response; +package com.example.briefingcommon.common.presentation.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/FcmTokenRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/FcmTokenRepository.java new file mode 100644 index 0000000..46b6471 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/FcmTokenRepository.java @@ -0,0 +1,13 @@ +package com.example.briefingcommon.domain.repository; + +import com.example.briefingcommon.entity.FcmToken; +import com.example.briefingcommon.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface FcmTokenRepository extends JpaRepository { + + Optional findByMemberAndToken(Member member, String token); +} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/ArticleRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/ArticleRepository.java new file mode 100644 index 0000000..f84fd6f --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/ArticleRepository.java @@ -0,0 +1,9 @@ +package com.example.briefingcommon.domain.repository.article; + +import com.example.briefingcommon.entity.Article; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + + +public interface ArticleRepository extends JpaRepository {} diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingArticleRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingArticleRepository.java new file mode 100644 index 0000000..9853bf1 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingArticleRepository.java @@ -0,0 +1,9 @@ +package com.example.briefingcommon.domain.repository.article; + +import com.example.briefingcommon.entity.BriefingArticle; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + + +public interface BriefingArticleRepository extends JpaRepository {} diff --git a/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingCustomRepository.java similarity index 58% rename from src/main/java/briefing/briefing/domain/repository/BriefingCustomRepository.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingCustomRepository.java index 6522719..cf8a7cd 100644 --- a/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepository.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingCustomRepository.java @@ -1,12 +1,13 @@ -package briefing.briefing.domain.repository; +package com.example.briefingcommon.domain.repository.article; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.example.briefingcommon.entity.enums.TimeOfDay; +import org.springframework.stereotype.Repository; -import briefing.briefing.domain.Briefing; -import briefing.common.enums.BriefingType; -import briefing.common.enums.TimeOfDay; public interface BriefingCustomRepository { List findBriefingsWithScrapCount( diff --git a/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingCustomRepositoryImpl.java similarity index 93% rename from src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingCustomRepositoryImpl.java index 85541ac..934757e 100644 --- a/src/main/java/briefing/briefing/domain/repository/BriefingCustomRepositoryImpl.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingCustomRepositoryImpl.java @@ -1,23 +1,24 @@ -package briefing.briefing.domain.repository; +package com.example.briefingcommon.domain.repository.article; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import org.springframework.stereotype.Repository; - +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.QBriefing; +import com.example.briefingcommon.entity.QScrap; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.example.briefingcommon.entity.enums.TimeOfDay; import com.querydsl.core.Tuple; import com.querydsl.core.types.dsl.DateTemplate; import com.querydsl.core.types.dsl.DateTimePath; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.stereotype.Repository; + + -import briefing.briefing.domain.Briefing; -import briefing.briefing.domain.QBriefing; -import briefing.common.enums.BriefingType; -import briefing.common.enums.TimeOfDay; -import briefing.scrap.domain.QScrap; import lombok.RequiredArgsConstructor; @Repository diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingRepository.java new file mode 100644 index 0000000..e88305c --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/article/BriefingRepository.java @@ -0,0 +1,24 @@ +package com.example.briefingcommon.domain.repository.article; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +import com.example.briefingcommon.entity.Briefing; +import com.example.briefingcommon.entity.enums.BriefingType; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + + +public interface BriefingRepository + extends JpaRepository, BriefingCustomRepository { + + List findAllByTypeAndCreatedAtBetweenOrderByRanks( + BriefingType type, LocalDateTime start, LocalDateTime end); + + @Query("SELECT b from Briefing b where b.ranks = 1 and b.type = :type order by b.createdAt desc") + Page getBestTodayBriefing(@Param("type") BriefingType type, Pageable pageable); +} diff --git a/src/main/java/briefing/member/domain/repository/MemberRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/member/MemberRepository.java similarity index 58% rename from src/main/java/briefing/member/domain/repository/MemberRepository.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/member/MemberRepository.java index 5a481ac..f393274 100644 --- a/src/main/java/briefing/member/domain/repository/MemberRepository.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/member/MemberRepository.java @@ -1,11 +1,13 @@ -package briefing.member.domain.repository; +package com.example.briefingcommon.domain.repository.member; -import java.util.Optional; +import com.example.briefingcommon.entity.Member; +import com.example.briefingcommon.entity.enums.SocialType; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; -import briefing.common.enums.SocialType; -import briefing.member.domain.Member; public interface MemberRepository extends JpaRepository { Optional findBySocialIdAndSocialType(String socialId, SocialType socialType); diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepository.java new file mode 100644 index 0000000..d13f2ff --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepository.java @@ -0,0 +1,3 @@ +package com.example.briefingcommon.domain.repository.scrap; + +public interface ScrapCustomRepository {} diff --git a/src/main/java/briefing/scrap/domain/repository/ScrapCustomRepositoryImpl.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepositoryImpl.java similarity index 69% rename from src/main/java/briefing/scrap/domain/repository/ScrapCustomRepositoryImpl.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepositoryImpl.java index b8f0a48..32a49ff 100644 --- a/src/main/java/briefing/scrap/domain/repository/ScrapCustomRepositoryImpl.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapCustomRepositoryImpl.java @@ -1,4 +1,4 @@ -package briefing.scrap.domain.repository; +package com.example.briefingcommon.domain.repository.scrap; import org.springframework.stereotype.Repository; diff --git a/src/main/java/briefing/scrap/domain/repository/ScrapRepository.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapRepository.java similarity index 74% rename from src/main/java/briefing/scrap/domain/repository/ScrapRepository.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapRepository.java index 2616b2c..3ee7621 100644 --- a/src/main/java/briefing/scrap/domain/repository/ScrapRepository.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/domain/repository/scrap/ScrapRepository.java @@ -1,11 +1,12 @@ -package briefing.scrap.domain.repository; +package com.example.briefingcommon.domain.repository.scrap; -import java.util.List; -import java.util.Optional; +import com.example.briefingcommon.entity.Scrap; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; -import briefing.scrap.domain.Scrap; +import java.util.List; +import java.util.Optional; public interface ScrapRepository extends JpaRepository, ScrapCustomRepository { diff --git a/src/main/java/briefing/briefing/domain/Article.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Article.java similarity index 90% rename from src/main/java/briefing/briefing/domain/Article.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Article.java index cbe0aba..610aca7 100644 --- a/src/main/java/briefing/briefing/domain/Article.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Article.java @@ -1,4 +1,4 @@ -package briefing.briefing.domain; +package com.example.briefingcommon.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -6,7 +6,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import briefing.common.domain.BaseDateTimeEntity; + import lombok.*; @Entity diff --git a/src/main/java/briefing/common/domain/BaseDateTimeEntity.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/BaseDateTimeEntity.java similarity index 93% rename from src/main/java/briefing/common/domain/BaseDateTimeEntity.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/BaseDateTimeEntity.java index f772da7..9acf0e4 100644 --- a/src/main/java/briefing/common/domain/BaseDateTimeEntity.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/BaseDateTimeEntity.java @@ -1,4 +1,4 @@ -package briefing.common.domain; +package com.example.briefingcommon.entity; import java.time.LocalDateTime; diff --git a/src/main/java/briefing/briefing/domain/Briefing.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Briefing.java similarity index 88% rename from src/main/java/briefing/briefing/domain/Briefing.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Briefing.java index e5fabd1..532d793 100644 --- a/src/main/java/briefing/briefing/domain/Briefing.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Briefing.java @@ -1,15 +1,15 @@ -package briefing.briefing.domain; +package com.example.briefingcommon.entity; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import com.example.briefingcommon.entity.enums.BriefingType; +import com.example.briefingcommon.entity.enums.GptModel; +import com.example.briefingcommon.entity.enums.TimeOfDay; import jakarta.persistence.*; -import briefing.common.domain.BaseDateTimeEntity; -import briefing.common.enums.BriefingType; -import briefing.common.enums.GptModel; -import briefing.common.enums.TimeOfDay; + import lombok.*; @Entity diff --git a/src/main/java/briefing/briefing/domain/BriefingArticle.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/BriefingArticle.java similarity index 91% rename from src/main/java/briefing/briefing/domain/BriefingArticle.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/BriefingArticle.java index 2af2246..0b1e17a 100644 --- a/src/main/java/briefing/briefing/domain/BriefingArticle.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/BriefingArticle.java @@ -1,4 +1,4 @@ -package briefing.briefing.domain; +package com.example.briefingcommon.entity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -8,7 +8,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import briefing.common.domain.BaseDateTimeEntity; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/FcmToken.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/FcmToken.java new file mode 100644 index 0000000..8ccf703 --- /dev/null +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/FcmToken.java @@ -0,0 +1,22 @@ +package com.example.briefingcommon.entity; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class FcmToken { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String token; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; +} diff --git a/src/main/java/briefing/member/domain/Member.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Member.java similarity index 78% rename from src/main/java/briefing/member/domain/Member.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Member.java index ffd32dc..cdc21c3 100644 --- a/src/main/java/briefing/member/domain/Member.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Member.java @@ -1,15 +1,13 @@ -package briefing.member.domain; +package com.example.briefingcommon.entity; import java.util.ArrayList; import java.util.List; +import com.example.briefingcommon.entity.enums.MemberRole; +import com.example.briefingcommon.entity.enums.MemberStatus; +import com.example.briefingcommon.entity.enums.SocialType; import jakarta.persistence.*; -import briefing.common.domain.BaseDateTimeEntity; -import briefing.common.enums.MemberRole; -import briefing.common.enums.MemberStatus; -import briefing.common.enums.SocialType; -import briefing.scrap.domain.Scrap; import lombok.*; @Entity diff --git a/src/main/java/briefing/scrap/domain/Scrap.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Scrap.java similarity index 82% rename from src/main/java/briefing/scrap/domain/Scrap.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Scrap.java index 10b1731..36a3961 100644 --- a/src/main/java/briefing/scrap/domain/Scrap.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/Scrap.java @@ -1,10 +1,7 @@ -package briefing.scrap.domain; +package com.example.briefingcommon.entity; import jakarta.persistence.*; -import briefing.briefing.domain.Briefing; -import briefing.common.domain.BaseDateTimeEntity; -import briefing.member.domain.Member; import lombok.*; @Entity diff --git a/src/main/java/briefing/common/enums/APIVersion.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/APIVersion.java similarity index 76% rename from src/main/java/briefing/common/enums/APIVersion.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/APIVersion.java index b4644ee..039361e 100644 --- a/src/main/java/briefing/common/enums/APIVersion.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/APIVersion.java @@ -1,11 +1,11 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import java.util.Arrays; +import com.example.briefingcommon.common.exception.BriefingException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import com.fasterxml.jackson.annotation.JsonValue; -import briefing.briefing.exception.BriefingException; -import briefing.common.exception.common.ErrorCode; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/briefing/common/enums/BriefingType.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/BriefingType.java similarity index 75% rename from src/main/java/briefing/common/enums/BriefingType.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/BriefingType.java index 9bc1ff4..5b8e6d9 100644 --- a/src/main/java/briefing/common/enums/BriefingType.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/BriefingType.java @@ -1,9 +1,9 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import java.util.Arrays; -import briefing.briefing.exception.BriefingException; -import briefing.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.BriefingException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/briefing/common/enums/GptModel.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/GptModel.java similarity index 77% rename from src/main/java/briefing/common/enums/GptModel.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/GptModel.java index cc7ff82..349da28 100644 --- a/src/main/java/briefing/common/enums/GptModel.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/GptModel.java @@ -1,12 +1,12 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import java.util.Arrays; +import com.example.briefingcommon.common.exception.ChattingException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import briefing.common.exception.ChattingException; -import briefing.common.exception.common.ErrorCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/briefing/common/enums/MemberRole.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/MemberRole.java similarity index 82% rename from src/main/java/briefing/common/enums/MemberRole.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/MemberRole.java index df30a4f..c0e2bf8 100644 --- a/src/main/java/briefing/common/enums/MemberRole.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/MemberRole.java @@ -1,4 +1,4 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/briefing/common/enums/MemberStatus.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/MemberStatus.java similarity index 80% rename from src/main/java/briefing/common/enums/MemberStatus.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/MemberStatus.java index 34a06b1..08fa52c 100644 --- a/src/main/java/briefing/common/enums/MemberStatus.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/MemberStatus.java @@ -1,4 +1,4 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/briefing/common/enums/SocialType.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/SocialType.java similarity index 93% rename from src/main/java/briefing/common/enums/SocialType.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/SocialType.java index 9ca4acc..34c72d5 100644 --- a/src/main/java/briefing/common/enums/SocialType.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/SocialType.java @@ -1,4 +1,4 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/src/main/java/briefing/common/enums/TimeOfDay.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/TimeOfDay.java similarity index 77% rename from src/main/java/briefing/common/enums/TimeOfDay.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/TimeOfDay.java index 7b87895..11d06ad 100644 --- a/src/main/java/briefing/common/enums/TimeOfDay.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/enums/TimeOfDay.java @@ -1,11 +1,12 @@ -package briefing.common.enums; +package com.example.briefingcommon.entity.enums; import java.util.Arrays; +import com.example.briefingcommon.common.exception.BriefingException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import com.fasterxml.jackson.annotation.JsonValue; -import briefing.briefing.exception.BriefingException; -import briefing.common.exception.common.ErrorCode; + import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/briefing/infra/redis/domain/RefreshToken.java b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/redis/RefreshToken.java similarity index 90% rename from src/main/java/briefing/infra/redis/domain/RefreshToken.java rename to core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/redis/RefreshToken.java index 2580de2..523e98b 100644 --- a/src/main/java/briefing/infra/redis/domain/RefreshToken.java +++ b/core/Briefing-Common/src/main/java/com/example/briefingcommon/entity/redis/RefreshToken.java @@ -1,11 +1,11 @@ -package briefing.infra.redis.domain; +package com.example.briefingcommon.entity.redis; import java.time.LocalDateTime; import org.springframework.data.annotation.Id; -import org.springframework.data.redis.core.RedisHash; import lombok.*; +import org.springframework.data.redis.core.RedisHash; @RedisHash(value = "refreshToken_Breifing", timeToLive = 1800000) @Builder diff --git a/core/Briefing-Common/src/main/resources/application.properties b/core/Briefing-Common/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/core/Briefing-Common/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/core/Briefing-Common/src/test/java/com/example/briefingcommon/BriefingCommonApplicationTests.java b/core/Briefing-Common/src/test/java/com/example/briefingcommon/BriefingCommonApplicationTests.java new file mode 100644 index 0000000..64d0865 --- /dev/null +++ b/core/Briefing-Common/src/test/java/com/example/briefingcommon/BriefingCommonApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.briefingcommon; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BriefingCommonApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/core/Briefing-Infra/build.gradle b/core/Briefing-Infra/build.gradle new file mode 100644 index 0000000..c726087 --- /dev/null +++ b/core/Briefing-Infra/build.gradle @@ -0,0 +1,23 @@ +bootJar { + enabled = false +} + +jar { + enabled = true +} + +repositories { + mavenCentral() +} + +dependencies { + implementation project(":core:Briefing-Common") + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' + implementation platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.3") +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/core/Briefing-Infra/gradle/wrapper/gradle-wrapper.jar b/core/Briefing-Infra/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/core/Briefing-Infra/gradle/wrapper/gradle-wrapper.properties b/core/Briefing-Infra/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/core/Briefing-Infra/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/src/main/java/briefing/infra/feign/decoder/FeignClientExceptionErrorDecoder.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/decoder/FeignClientExceptionErrorDecoder.java similarity index 88% rename from src/main/java/briefing/infra/feign/decoder/FeignClientExceptionErrorDecoder.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/decoder/FeignClientExceptionErrorDecoder.java index 746eace..6b9591d 100644 --- a/src/main/java/briefing/infra/feign/decoder/FeignClientExceptionErrorDecoder.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/decoder/FeignClientExceptionErrorDecoder.java @@ -1,10 +1,10 @@ -package briefing.infra.feign.decoder; +package com.example.briefinginfra.feign.decoder; +import com.example.briefingcommon.common.exception.CustomFeignClientException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import briefing.common.exception.CustomFeignClientException; -import briefing.common.exception.common.ErrorCode; import feign.Response; import feign.codec.ErrorDecoder; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/briefing/infra/feign/oauth/apple/client/AppleOauth2Client.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/client/AppleOauth2Client.java similarity index 66% rename from src/main/java/briefing/infra/feign/oauth/apple/client/AppleOauth2Client.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/client/AppleOauth2Client.java index 4e5cf7f..ab03bc8 100644 --- a/src/main/java/briefing/infra/feign/oauth/apple/client/AppleOauth2Client.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/client/AppleOauth2Client.java @@ -1,17 +1,16 @@ -package briefing.infra.feign.oauth.apple.client; +package com.example.briefinginfra.feign.oauth.apple.client; +import com.example.briefinginfra.feign.oauth.apple.config.AppleOauth2FeignConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; -import briefing.infra.feign.oauth.apple.config.AppleOauth2FeignConfiguration; -import briefing.infra.feign.oauth.apple.dto.ApplePublicKeyList; +import com.example.briefinginfra.feign.oauth.apple.dto.ApplePublicKeyList; @FeignClient( name = "apple-public-key-client", url = "https://appleid.apple.com/auth", configuration = AppleOauth2FeignConfiguration.class) -@Component public interface AppleOauth2Client { @GetMapping("/keys") ApplePublicKeyList getApplePublicKeys(); diff --git a/src/main/java/briefing/infra/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java similarity index 79% rename from src/main/java/briefing/infra/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java index b5a6b93..46b1d19 100644 --- a/src/main/java/briefing/infra/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/config/AppleOauth2FeignConfiguration.java @@ -1,8 +1,8 @@ -package briefing.infra.feign.oauth.apple.config; +package com.example.briefinginfra.feign.oauth.apple.config; import org.springframework.context.annotation.Bean; -import briefing.infra.feign.decoder.FeignClientExceptionErrorDecoder; +import com.example.briefinginfra.feign.decoder.FeignClientExceptionErrorDecoder; import feign.Logger; import feign.RequestInterceptor; import feign.codec.ErrorDecoder; diff --git a/src/main/java/briefing/infra/feign/oauth/apple/dto/ApplePublicKey.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/dto/ApplePublicKey.java similarity index 93% rename from src/main/java/briefing/infra/feign/oauth/apple/dto/ApplePublicKey.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/dto/ApplePublicKey.java index b774f66..42fe843 100644 --- a/src/main/java/briefing/infra/feign/oauth/apple/dto/ApplePublicKey.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/dto/ApplePublicKey.java @@ -1,4 +1,4 @@ -package briefing.infra.feign.oauth.apple.dto; +package com.example.briefinginfra.feign.oauth.apple.dto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/briefing/infra/feign/oauth/apple/dto/ApplePublicKeyList.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/dto/ApplePublicKeyList.java similarity index 72% rename from src/main/java/briefing/infra/feign/oauth/apple/dto/ApplePublicKeyList.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/dto/ApplePublicKeyList.java index 4cacc4f..aa5985f 100644 --- a/src/main/java/briefing/infra/feign/oauth/apple/dto/ApplePublicKeyList.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/apple/dto/ApplePublicKeyList.java @@ -1,9 +1,9 @@ -package briefing.infra.feign.oauth.apple.dto; +package com.example.briefinginfra.feign.oauth.apple.dto; import java.util.List; -import briefing.common.exception.AppleOAuthException; -import briefing.common.exception.common.ErrorCode; +import com.example.briefingcommon.common.exception.AppleOAuthException; +import com.example.briefingcommon.common.exception.common.ErrorCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/briefing/infra/feign/oauth/google/client/GoogleOauth2Client.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/client/GoogleOauth2Client.java similarity index 63% rename from src/main/java/briefing/infra/feign/oauth/google/client/GoogleOauth2Client.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/client/GoogleOauth2Client.java index d6755ea..35cb0e3 100644 --- a/src/main/java/briefing/infra/feign/oauth/google/client/GoogleOauth2Client.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/client/GoogleOauth2Client.java @@ -1,16 +1,17 @@ -package briefing.infra.feign.oauth.google.client; +package com.example.briefinginfra.feign.oauth.google.client; +import com.example.briefinginfra.feign.oauth.google.config.GoogleOauth2FeignConfiguration; +import com.example.briefinginfra.feign.oauth.google.dto.GoogleUserInfo; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import briefing.infra.feign.oauth.google.config.GoogleOauth2FeignConfiguration; -import briefing.infra.feign.oauth.google.dto.GoogleUserInfo; - @FeignClient( name = "googleOauth2Client", url = "https://www.googleapis.com/oauth2/v3", configuration = GoogleOauth2FeignConfiguration.class) +@Component public interface GoogleOauth2Client { @GetMapping("/tokeninfo") GoogleUserInfo verifyToken(@RequestParam("id_token") String id_token); diff --git a/src/main/java/briefing/infra/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java similarity index 79% rename from src/main/java/briefing/infra/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java index db4c693..3eb69cb 100644 --- a/src/main/java/briefing/infra/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/config/GoogleOauth2FeignConfiguration.java @@ -1,8 +1,8 @@ -package briefing.infra.feign.oauth.google.config; +package com.example.briefinginfra.feign.oauth.google.config; +import com.example.briefinginfra.feign.decoder.FeignClientExceptionErrorDecoder; import org.springframework.context.annotation.Bean; -import briefing.infra.feign.decoder.FeignClientExceptionErrorDecoder; import feign.Logger; import feign.RequestInterceptor; import feign.codec.ErrorDecoder; diff --git a/src/main/java/briefing/infra/feign/oauth/google/dto/GoogleUserInfo.java b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/dto/GoogleUserInfo.java similarity index 87% rename from src/main/java/briefing/infra/feign/oauth/google/dto/GoogleUserInfo.java rename to core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/dto/GoogleUserInfo.java index 69941e8..2c50bb6 100644 --- a/src/main/java/briefing/infra/feign/oauth/google/dto/GoogleUserInfo.java +++ b/core/Briefing-Infra/src/main/java/com/example/briefinginfra/feign/oauth/google/dto/GoogleUserInfo.java @@ -1,4 +1,4 @@ -package briefing.infra.feign.oauth.google.dto; +package com.example.briefinginfra.feign.oauth.google.dto; import lombok.Data; diff --git a/core/Briefing-Infra/src/main/resources/application.properties b/core/Briefing-Infra/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/core/Briefing-Infra/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/core/Briefing-Infra/src/test/java/com/example/briefinginfra/BriefingInfraApplicationTests.java b/core/Briefing-Infra/src/test/java/com/example/briefinginfra/BriefingInfraApplicationTests.java new file mode 100644 index 0000000..0b98a9a --- /dev/null +++ b/core/Briefing-Infra/src/test/java/com/example/briefinginfra/BriefingInfraApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.briefinginfra; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BriefingInfraApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/settings.gradle b/settings.gradle index bea7b7f..4d18120 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,11 @@ rootProject.name = 'briefing' + +include 'Briefing-Api' +include 'core:Briefing-Common' +include 'core:Briefing-Infra' + +/* ToDo + 모놀리딕으로 진행 후 두개를 묶어서 분리할 것 + */ +//include 'core:Briefing-Batch' +//include 'core:Briefing-FCM' \ No newline at end of file diff --git a/src/main/java/briefing/BriefingApplication.java b/src/main/java/briefing/BriefingApplication.java deleted file mode 100644 index 186981a..0000000 --- a/src/main/java/briefing/BriefingApplication.java +++ /dev/null @@ -1,30 +0,0 @@ -package briefing; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.cloud.openfeign.FeignAutoConfiguration; -import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; - -import io.swagger.v3.oas.annotations.OpenAPIDefinition; -import io.swagger.v3.oas.annotations.servers.Server; - -@OpenAPIDefinition( - servers = { - @Server(url = "http://localhost:8080", description = "local server"), - @Server(url = "https://dev.briefing.store", description = "dev server"), - @Server(url = "https://api.newsbreifing.store", description = "release server") - }) -@SpringBootApplication -@EnableCaching -@EnableFeignClients -@EnableRedisRepositories -@ImportAutoConfiguration({FeignAutoConfiguration.class}) -public class BriefingApplication { - - public static void main(final String[] args) { - SpringApplication.run(BriefingApplication.class, args); - } -} diff --git a/src/main/java/briefing/briefing/domain/repository/ArticleRepository.java b/src/main/java/briefing/briefing/domain/repository/ArticleRepository.java deleted file mode 100644 index 498c00e..0000000 --- a/src/main/java/briefing/briefing/domain/repository/ArticleRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package briefing.briefing.domain.repository; - -import org.springframework.data.jpa.repository.JpaRepository; - -import briefing.briefing.domain.Article; - -public interface ArticleRepository extends JpaRepository {} diff --git a/src/main/java/briefing/briefing/domain/repository/BriefingArticleRepository.java b/src/main/java/briefing/briefing/domain/repository/BriefingArticleRepository.java deleted file mode 100644 index 846c688..0000000 --- a/src/main/java/briefing/briefing/domain/repository/BriefingArticleRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package briefing.briefing.domain.repository; - -import org.springframework.data.jpa.repository.JpaRepository; - -import briefing.briefing.domain.BriefingArticle; - -public interface BriefingArticleRepository extends JpaRepository {} diff --git a/src/main/java/briefing/briefing/domain/repository/BriefingRepository.java b/src/main/java/briefing/briefing/domain/repository/BriefingRepository.java deleted file mode 100644 index acd3667..0000000 --- a/src/main/java/briefing/briefing/domain/repository/BriefingRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package briefing.briefing.domain.repository; - -import java.time.LocalDateTime; -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import briefing.briefing.domain.Briefing; -import briefing.common.enums.BriefingType; - -@Repository -public interface BriefingRepository - extends JpaRepository, BriefingCustomRepository { - - List findAllByTypeAndCreatedAtBetweenOrderByRanks( - BriefingType type, LocalDateTime start, LocalDateTime end); -} diff --git a/src/main/java/briefing/briefing/exception/BriefingException.java b/src/main/java/briefing/briefing/exception/BriefingException.java deleted file mode 100644 index a504f64..0000000 --- a/src/main/java/briefing/briefing/exception/BriefingException.java +++ /dev/null @@ -1,10 +0,0 @@ -package briefing.briefing.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class BriefingException extends GeneralException { - public BriefingException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/briefing/common/exception/AppleOAuthException.java b/src/main/java/briefing/common/exception/AppleOAuthException.java deleted file mode 100644 index 3f5985d..0000000 --- a/src/main/java/briefing/common/exception/AppleOAuthException.java +++ /dev/null @@ -1,10 +0,0 @@ -package briefing.common.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class AppleOAuthException extends GeneralException { - public AppleOAuthException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/briefing/common/exception/ChattingException.java b/src/main/java/briefing/common/exception/ChattingException.java deleted file mode 100644 index 8b7e3dd..0000000 --- a/src/main/java/briefing/common/exception/ChattingException.java +++ /dev/null @@ -1,10 +0,0 @@ -package briefing.common.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class ChattingException extends GeneralException { - public ChattingException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/briefing/common/exception/CustomFeignClientException.java b/src/main/java/briefing/common/exception/CustomFeignClientException.java deleted file mode 100644 index 821d7bf..0000000 --- a/src/main/java/briefing/common/exception/CustomFeignClientException.java +++ /dev/null @@ -1,11 +0,0 @@ -package briefing.common.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class CustomFeignClientException extends GeneralException { - - public CustomFeignClientException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/briefing/common/exception/RefreshTokenException.java b/src/main/java/briefing/common/exception/RefreshTokenException.java deleted file mode 100644 index 8903afc..0000000 --- a/src/main/java/briefing/common/exception/RefreshTokenException.java +++ /dev/null @@ -1,10 +0,0 @@ -package briefing.common.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class RefreshTokenException extends GeneralException { - public RefreshTokenException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/briefing/common/exception/common/ErrorCode.java b/src/main/java/briefing/common/exception/common/ErrorCode.java deleted file mode 100644 index 47b3e66..0000000 --- a/src/main/java/briefing/common/exception/common/ErrorCode.java +++ /dev/null @@ -1,107 +0,0 @@ -package briefing.common.exception.common; - -import static org.springframework.http.HttpStatus.*; - -import java.util.Arrays; -import java.util.Optional; -import java.util.function.Predicate; - -import org.springframework.http.HttpStatus; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum ErrorCode { - _INTERNAL_SERVER_ERROR(INTERNAL_SERVER_ERROR, "COMMON000", "서버 에러, 관리자에게 문의 바랍니다."), - _BAD_REQUEST(BAD_REQUEST, "COMMON001", "잘못된 요청입니다."), - _UNAUTHORIZED(UNAUTHORIZED, "COMMON002", "로그인이 필요합니다."), - _METHOD_NOT_ALLOWED(METHOD_NOT_ALLOWED, "COMMON003", "지원하지 않는 Http Method 입니다."), - _FORBIDDEN(FORBIDDEN, "COMMON004", "금지된 요청입니다."), - - // 인증 관련 에러 - ForbiddenException(UNAUTHORIZED, "AUTH002", "해당 요청에 대한 권한이 없습니다."), - UNAUTHORIZED_EXCEPTION(UNAUTHORIZED, "AUTH003", "로그인 후 이용가능합니다. 토큰을 입력해 주세요"), - EXPIRED_JWT_EXCEPTION(UNAUTHORIZED, "AUTH004", "기존 토큰이 만료되었습니다. 토큰을 재발급해주세요."), - RELOGIN_EXCEPTION(UNAUTHORIZED, "AUTH005", "모든 토큰이 만료되었습니다. 다시 로그인해주세요."), - INVALID_TOKEN_EXCEPTION(UNAUTHORIZED, "AUTH006", "토큰이 올바르지 않습니다."), - HIJACK_JWT_TOKEN_EXCEPTION(UNAUTHORIZED, "AUTH007", "탈취된(로그아웃 된) 토큰입니다 다시 로그인 해주세요."), - INVALID_REFRESH_TOKEN(BAD_REQUEST, "AUTH009", "리프레쉬 토큰이 유효하지 않습니다. 다시 로그인 해주세요"), - - // oauth 에러 - APPLE_BAD_REQUEST(BAD_REQUEST, "OAUTH001", "애플 토큰이 잘못되었습니다."), - APPLE_SERVER_ERROR(FORBIDDEN, "OAUTH002", "애플 서버와 통신에 실패 하였습니다."), - FAIL_TO_MAKE_APPLE_PUBLIC_KEY(BAD_REQUEST, "OAUTH003", "새로운 애플 공개키 생성에 실패하였습니다."), - - // feign client 에러 - FEIGN_BAD_REQUEST(BAD_REQUEST, "FEIGN_400_1", "Feign server bad request"), - FEIGN_UNAUTHORIZED(BAD_REQUEST, "FEIGN_400_2", "Feign server unauthorized"), - FEIGN_FORBIDDEN(BAD_REQUEST, "FEIGN_400_3", "Feign server forbidden"), - FEIGN_EXPIRED_TOKEN(BAD_REQUEST, "FEIGN_400_4", "Feign server expired token"), - FEIGN_NOT_FOUND(BAD_REQUEST, "FEIGN_400_5", "Feign server not found error"), - FEIGN_INTERNAL_SERVER_ERROR(BAD_REQUEST, "FEIGN_400_6", "Feign server internal server error"), - FEIGN_METHOD_NOT_ALLOWED(BAD_REQUEST, "FEIGN_400_7", "Feign server method not allowed"), - FEIGN_SERVER_ERROR(BAD_REQUEST, "FEIGN_500", "Feign server error"), - - // member 관련 에러 - - MEMBER_NOT_FOUND(BAD_REQUEST, "MEMBER_001", "사용자가 없습니다"), - MEMBER_NOT_SAME(BAD_REQUEST, "MEMBER_002", "로그인 된 사용자와 대상 사용자가 일치하지 않습니다."), - - // member 에러 - - // scrap 에러 - SCRAP_ALREADY_EXISTS(CONFLICT, "SCRAP_001", "이미 스크랩했습니다."), - SCRAP_NOT_FOUND(NOT_FOUND, "SCRAP_002", "존재하지 않는 스크랩입니다."), - DUPLICATE_SCRAP(CONFLICT, "SCRAP_003", "중복된 스크랩 요청입니다."), - - // briefing 에러 - NOT_FOUND_BRIEFING(NOT_FOUND, "BRIEFING_001", "브리핑이 존재하지 않습니다."), - NOT_FOUND_TYPE(BAD_REQUEST, "BRIEFING_002", "해당하는 type을 찾을 수 없습니다."), - - // chatting 에러 - - NOT_FOUND_CHATTING(NOT_FOUND, "CHATTING_001", "해당하는 채팅을 찾을 수 없습니다."), - LAST_MESSAGE_NOT_EXIST(BAD_REQUEST, "CHATTING_002", "마지막 메시지를 찾을 수 없습니다."), - BAD_LAST_MESSAGE_ROLE(BAD_REQUEST, "CHATTING_003", "마지막 메시지의 역할이 user가 아닙니다."), - CAN_NOT_EMPTY_CONTENT(BAD_REQUEST, "CHATTING_004", "content가 비어있습니다."), - NOT_FOUND_ROLE(BAD_REQUEST, "CHATTING_005", "해당하는 role을 찾을 수 없습니다."), - NOT_FOUND_MODEL(BAD_REQUEST, "CHATTING_006", "해당하는 mode을 찾을 수 없습니다."); - - private final HttpStatus httpStatus; - private final String code; - private final String message; - - public String getMessage(Throwable e) { - return this.getMessage(this.getMessage() + " - " + e.getMessage()); - // 결과 예시 - "Validation error - Reason why it isn't valid" - } - - public String getMessage(String message) { - return Optional.ofNullable(message) - .filter(Predicate.not(String::isBlank)) - .orElse(this.getMessage()); - } - - public static ErrorCode valueOf(HttpStatus httpStatus) { - if (httpStatus == null) { - throw new GeneralException("HttpStatus is null."); - } - - return Arrays.stream(values()) - .filter(errorCode -> errorCode.getHttpStatus() == httpStatus) - .findFirst() - .orElseGet( - () -> { - if (httpStatus.is4xxClientError()) { - return ErrorCode._BAD_REQUEST; - } else return ErrorCode._INTERNAL_SERVER_ERROR; - }); - } - - // @Override - // public String toString() { - // return String.format("%s (%d)", this.name(), this.getCode()); - // } -} diff --git a/src/main/java/briefing/config/JpaAuditingConfig.java b/src/main/java/briefing/config/JpaAuditingConfig.java deleted file mode 100644 index 3bacc72..0000000 --- a/src/main/java/briefing/config/JpaAuditingConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package briefing.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; - -@Configuration -@EnableJpaAuditing -public class JpaAuditingConfig {} diff --git a/src/main/java/briefing/member/exception/MemberException.java b/src/main/java/briefing/member/exception/MemberException.java deleted file mode 100644 index 05c8421..0000000 --- a/src/main/java/briefing/member/exception/MemberException.java +++ /dev/null @@ -1,10 +0,0 @@ -package briefing.member.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class MemberException extends GeneralException { - public MemberException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/briefing/scrap/domain/repository/ScrapCustomRepository.java b/src/main/java/briefing/scrap/domain/repository/ScrapCustomRepository.java deleted file mode 100644 index a764200..0000000 --- a/src/main/java/briefing/scrap/domain/repository/ScrapCustomRepository.java +++ /dev/null @@ -1,3 +0,0 @@ -package briefing.scrap.domain.repository; - -public interface ScrapCustomRepository {} diff --git a/src/main/java/briefing/scrap/exception/ScrapException.java b/src/main/java/briefing/scrap/exception/ScrapException.java deleted file mode 100644 index 0701926..0000000 --- a/src/main/java/briefing/scrap/exception/ScrapException.java +++ /dev/null @@ -1,10 +0,0 @@ -package briefing.scrap.exception; - -import briefing.common.exception.common.ErrorCode; -import briefing.common.exception.common.GeneralException; - -public class ScrapException extends GeneralException { - public ScrapException(ErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a93b913..33cfba5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -15,6 +15,8 @@ swagger: login: id: ${SWAGGER_ID} password : ${SWAGGER_PASS} +fcm: + key: ${FCM_KEY} --- spring: config: From 8b4b1a373e6debfbc3c074d51596b4f2b2ed072f Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 12:35:32 +0900 Subject: [PATCH 02/15] =?UTF-8?q?:hammer:=20=EC=BD=94=EB=93=9C=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implement/strategy/BriefingV1QueryStrategy.java | 3 +-- .../example/briefingapi/fcm/presentation/FcmApi.java | 10 ++++++++-- .../briefingapi/member/business/MemberFacade.java | 5 ++++- .../briefingapi/member/presentation/MemberApi.java | 2 +- Briefing-Api/src/main/resources/application.yml | 1 + 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java index 98bb66c..86a8433 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/briefing/implement/strategy/BriefingV1QueryStrategy.java @@ -31,8 +31,7 @@ public List findBriefings(BriefingRequestParam.BriefingPreviewListPara briefingRepository.findAllByTypeAndCreatedAtBetweenOrderByRanks( params.getType(), startDateTime, endDateTime); if (briefingList.isEmpty()) { - briefingList = null; - briefingRepository.findTop10ByTypeOrderByCreatedAtDesc(BriefingType.SOCIAL); + briefingList = briefingRepository.findTop10ByTypeOrderByCreatedAtDesc(BriefingType.SOCIAL); } return briefingList; } diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java index e41aef2..cb1ad5a 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/fcm/presentation/FcmApi.java @@ -2,32 +2,38 @@ import com.example.briefingapi.fcm.implementation.FcmCommandService; import com.example.briefingapi.fcm.presentation.dto.FcmRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Tag(name = "06-Push-alarm 🚀", description = "푸쉬 알림 관련 API") @RestController @RequiredArgsConstructor -@RequestMapping("/fcms") +@RequestMapping("/pushs") public class FcmApi { private final FcmCommandService fcmCommandService; + @Operation(summary = "06-02 🚀[테스트] FCM 구독 테스트용 API") @PostMapping("/subscribe") public String testFcmSubscribe(@RequestBody FcmRequest.FcmTokenDTO body){ fcmCommandService.subScribe("dailyPush",body.getToken()); return "response"; } + @Operation(summary = "06-03 🚀[테스트] FCM 구독 취소 테스트용 API") @PostMapping("/unsubscribe") public String testFcmUnSubscribe(@RequestBody FcmRequest.FcmTokenDTO body){ fcmCommandService.unSubScribe("dailyPush",body.getToken()); return "response"; } - @PostMapping("/send") + @Operation(summary = "06-01 🚀[테스트] FCM 전송 테스트용 API") + @PostMapping("/") public String testSendMessage(){ fcmCommandService.sendMessage("dailyPush"); return "response"; diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java index a3db659..bd230dd 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/business/MemberFacade.java @@ -39,6 +39,9 @@ public class MemberFacade { @Value("${fcm.topic.daily-push}") private String dailyPushTopic; + @Value(("${fcm.permit-flag}")) + private Integer permitFlag; + private Member loginWithGoogle(String identityToken) { GoogleUserInfo googleUserInfo = googleOauth2Client.verifyToken(identityToken); Member member = @@ -103,7 +106,7 @@ public MemberResponse.QuitDTO quit(final Long memberId) { public void subScribeDailyPush(MemberRequest.ToggleDailyPushAlarmDTO request, Member member){ - if(request.getPermit().equals(1)){ + if(request.getPermit().equals(permitFlag)){ memberCommandService.storeFcmToken(request.getFcmToken(),member); fcmCommandService.subScribe(dailyPushTopic, request.getFcmToken()); } diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java index c28dff4..33fa2d7 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java @@ -37,7 +37,7 @@ public class MemberApi { private final MemberFacade memberFacade; - @Operation(summary = "Member\uD83D\uDC64 테스트를 위한 토큰 발급 API", description = "테스트 용") + @Operation(summary = "02-05 Member\uD83D\uDC64 [테스트] 테스트를 위한 토큰 발급 API", description = "테스트 용") @GetMapping("/members/auth/test") public CommonResponse testGenerateToken() { return CommonResponse.onSuccess(memberFacade.getTestToken()); diff --git a/Briefing-Api/src/main/resources/application.yml b/Briefing-Api/src/main/resources/application.yml index d948a1b..bb1eaee 100644 --- a/Briefing-Api/src/main/resources/application.yml +++ b/Briefing-Api/src/main/resources/application.yml @@ -20,6 +20,7 @@ swagger: password : ${SWAGGER_PASS} fcm: key: ${FCM_KEY} + permit-flag : 1 topic: daily-push : dailyPush --- From 565f696047e12a946b4e28fb383fb1e855a52b70 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 14:33:26 +0900 Subject: [PATCH 03/15] =?UTF-8?q?:construction=5Fworker:=20Ci=20:=20deploy?= =?UTF-8?q?.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 24e9adb..6d49bb1 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -27,8 +27,9 @@ jobs: run: chmod +x ./gradlew shell: bash # (6).권한 부여 +# clean build -x test - name: Build with Gradle - run: ./gradlew clean build -x test + run: ./gradlew Briefing-Api:bootJar shell: bash # (7).build 시작 - name: Get current time From 1488ff57cfce978b0f01b7f965377a7dfedbb922 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 14:38:01 +0900 Subject: [PATCH 04/15] =?UTF-8?q?:construction=5Fworker:=20Ci=20:=20deploy?= =?UTF-8?q?.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git push origin feature/156 --- .github/workflows/dev_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 6d49bb1..015810b 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -46,7 +46,7 @@ jobs: - name: Generate deployment package run: | mkdir -p deploy - cp build/libs/*.jar deploy/application.jar + cp Briefing-Api/build/libs/*.jar deploy/Briefing-Api-application.jar cp Procfile deploy/Procfile cp -r .ebextensions-dev deploy/.ebextensions cp -r .platform deploy/.platform From d62a0639a4b202a59f8aadda38b25a2009ccec4b Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 15:06:44 +0900 Subject: [PATCH 05/15] =?UTF-8?q?ebextensions=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions-dev/00-makeFiles.config | 2 +- .github/workflows/dev_deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ebextensions-dev/00-makeFiles.config b/.ebextensions-dev/00-makeFiles.config index 2fa8507..a472578 100644 --- a/.ebextensions-dev/00-makeFiles.config +++ b/.ebextensions-dev/00-makeFiles.config @@ -9,4 +9,4 @@ files: # run app killall java - java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar $JAR_PATH + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar /var/app/current/Briefing-Api-application.jar diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 015810b..ec56b11 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -50,7 +50,7 @@ jobs: cp Procfile deploy/Procfile cp -r .ebextensions-dev deploy/.ebextensions cp -r .platform deploy/.platform - cd deploy && zip -r deploy.zip . + cd deploy && zip -r deploy. zip . - name: Beanstalk Deploy uses: einaregilsson/beanstalk-deploy@v20 From a0446c0623d0cb720957aba2b36bfa5b8121edd8 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 15:10:04 +0900 Subject: [PATCH 06/15] =?UTF-8?q?:construction=5Fworker:=20Ci=20:=20deploy?= =?UTF-8?q?.yml=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index ec56b11..015810b 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -50,7 +50,7 @@ jobs: cp Procfile deploy/Procfile cp -r .ebextensions-dev deploy/.ebextensions cp -r .platform deploy/.platform - cd deploy && zip -r deploy. zip . + cd deploy && zip -r deploy.zip . - name: Beanstalk Deploy uses: einaregilsson/beanstalk-deploy@v20 From a2910eb1c0d57fe5ffaf39a6a2d19cb13e8e4871 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 15:20:28 +0900 Subject: [PATCH 07/15] =?UTF-8?q?ci=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions-dev/00-makeFiles.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ebextensions-dev/00-makeFiles.config b/.ebextensions-dev/00-makeFiles.config index a472578..febd29e 100644 --- a/.ebextensions-dev/00-makeFiles.config +++ b/.ebextensions-dev/00-makeFiles.config @@ -5,8 +5,8 @@ files: group: webapp content: | #!/usr/bin/env bash - JAR_PATH=/var/app/current/application.jar + JAR_PATH=/var/app/current/Briefing-Api-application.jar # run app killall java - java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar /var/app/current/Briefing-Api-application.jar + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar $JAR_PATH From 8fbd2dbed4eb6c54ab1b3839131e41bfb017b017 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 16:29:07 +0900 Subject: [PATCH 08/15] =?UTF-8?q?ci/cd=20=ED=8A=B8=EB=9F=AC=EB=B8=94=20?= =?UTF-8?q?=EC=8A=88=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions-dev/00-makeFiles.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ebextensions-dev/00-makeFiles.config b/.ebextensions-dev/00-makeFiles.config index febd29e..2fa8507 100644 --- a/.ebextensions-dev/00-makeFiles.config +++ b/.ebextensions-dev/00-makeFiles.config @@ -5,7 +5,7 @@ files: group: webapp content: | #!/usr/bin/env bash - JAR_PATH=/var/app/current/Briefing-Api-application.jar + JAR_PATH=/var/app/current/application.jar # run app killall java From 4f9cfe260d999e9304e272b0bb07955e4dd568be Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 16:41:42 +0900 Subject: [PATCH 09/15] =?UTF-8?q?ci/cd=20=ED=8A=B8=EB=9F=AC=EB=B8=94=20?= =?UTF-8?q?=EC=8A=88=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions-dev/00-makeFiles.config | 2 +- .github/workflows/dev_deploy.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.ebextensions-dev/00-makeFiles.config b/.ebextensions-dev/00-makeFiles.config index f239da9..febd29e 100644 --- a/.ebextensions-dev/00-makeFiles.config +++ b/.ebextensions-dev/00-makeFiles.config @@ -9,4 +9,4 @@ files: # run app killall java - java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar /var/app/current/Briefing-Api-application.jar + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar $JAR_PATH diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index ec56b11..f8d7765 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -27,7 +27,6 @@ jobs: run: chmod +x ./gradlew shell: bash # (6).권한 부여 -# clean build -x test - name: Build with Gradle run: ./gradlew Briefing-Api:bootJar shell: bash # (7).build 시작 @@ -62,5 +61,4 @@ jobs: version_label: github-action-${{ steps.current-time.outputs.formattedTime }} region: ap-northeast-2 deployment_package: deploy/deploy.zip - wait_for_deployment: false - + wait_for_deployment: false \ No newline at end of file From 88426f4318659dc44703d7c1134e68c44c1d7e4d Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Wed, 24 Jan 2024 16:49:33 +0900 Subject: [PATCH 10/15] =?UTF-8?q?ci/cd=20=ED=8A=B8=EB=9F=AC=EB=B8=94?= =?UTF-8?q?=EC=8A=88=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index f8d7765..109df4b 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -49,7 +49,7 @@ jobs: cp Procfile deploy/Procfile cp -r .ebextensions-dev deploy/.ebextensions cp -r .platform deploy/.platform - cd deploy && zip -r deploy. zip . + cd deploy && zip -r deploy.zip . - name: Beanstalk Deploy uses: einaregilsson/beanstalk-deploy@v20 From ad6a44883325e4c54c378f51c0eef44da54eb8e2 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Fri, 16 Feb 2024 15:31:48 +0900 Subject: [PATCH 11/15] =?UTF-8?q?:bug:=20Fix=20:=20accessToken=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=9C=A0?= =?UTF-8?q?=ED=9A=A8=EC=8B=9C=EA=B0=84=20=EC=9E=84=EC=8B=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/briefingapi/member/presentation/MemberApi.java | 7 +++++++ Briefing-Api/src/main/resources/application.yml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java index 33fa2d7..8aa05ab 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/member/presentation/MemberApi.java @@ -45,6 +45,13 @@ public CommonResponse testGenerateToken() { @Operation(summary = "02-01 Member\uD83D\uDC64 소셜 로그인 V1", description = "구글, 애플 소셜로그인 API입니다.") @PostMapping("/members/auth/{socialType}") + @ApiResponses({ + @ApiResponse(responseCode = "1000", description = "OK, 성공"), + @ApiResponse( + responseCode = "COMMON001", + description = "request body에 담길 값이 이상함, result를 확인해주세요!", + content = @Content(schema = @Schema(implementation = CommonResponse.class))), + }) public CommonResponse login( @Parameter(description = "소셜로그인 종류", example = "google") @PathVariable final SocialType socialType, diff --git a/Briefing-Api/src/main/resources/application.yml b/Briefing-Api/src/main/resources/application.yml index bb1eaee..5167afd 100644 --- a/Briefing-Api/src/main/resources/application.yml +++ b/Briefing-Api/src/main/resources/application.yml @@ -119,7 +119,7 @@ jwt: secret: ${JWT_SECRET} # secret : ${JWT_SECRET} authorities-key: authoritiesKey - access-token-validity-in-seconds: 1210000000 # 30 m + access-token-validity-in-seconds: 30 # 30 m refresh-token-validity-in-seconds: 1210000000 # 14 d openai: @@ -159,7 +159,7 @@ jwt: secret: ${JWT_SECRET} # secret : ${JWT_SECRET} authorities-key: authoritiesKey - access-token-validity-in-seconds: 1210000000 # 30 m + access-token-validity-in-seconds: 1800 # 30 m refresh-token-validity-in-seconds: 1210000000 # 14 d openai: From 0f9bfe4c04e9c688806e622eb63e91bb0b7307cc Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Fri, 16 Feb 2024 19:17:59 +0900 Subject: [PATCH 12/15] =?UTF-8?q?:bug:=20Fix=20:=20=EB=A6=AC=ED=94=84?= =?UTF-8?q?=EB=A0=88=EC=8B=9C=20=ED=86=A0=ED=81=B0=20=EB=AC=B4=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20access=20Token=EA=B3=BC=20=EC=9E=AC=EB=B0=9C?= =?UTF-8?q?=EA=B8=89=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../briefingapi/redis/service/RedisServiceImpl.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java index 29ef3ce..8d9ccce 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java @@ -47,7 +47,7 @@ public RefreshToken generateRefreshToken(String socialId, SocialType socialType) LocalDateTime currentTime = LocalDateTime.now(); - LocalDateTime expireTime = currentTime.plus(1000, ChronoUnit.MINUTES); + LocalDateTime expireTime = currentTime.plus(90, ChronoUnit.SECONDS); return refreshTokenRepository.save( RefreshToken.builder() @@ -68,8 +68,6 @@ public RefreshToken reGenerateRefreshToken(MemberRequest.ReissueDTO request) { () -> new RefreshTokenException(ErrorCode.INVALID_REFRESH_TOKEN)); LocalDateTime expireTime = findRefreshToken.getExpireTime(); LocalDateTime current = LocalDateTime.now(); - // 테스트용, 실제로는 현재 시간 + accessToken 만료 시간 - LocalDateTime expireDeadLine = current.plusSeconds(20); Member member = memberRepository @@ -80,13 +78,8 @@ public RefreshToken reGenerateRefreshToken(MemberRequest.ReissueDTO request) { logger.error("이미 만료된 리프레시 토큰 발견"); throw new RefreshTokenException(ErrorCode.RELOGIN_EXCEPTION); } - - // 새로 발급할 accessToken보다 refreshToken이 먼저 만료 될 경우인가? - if (expireTime.isAfter(expireDeadLine)) { - logger.info("기존 리프레시 토큰 발급"); - return findRefreshToken; - } else { - logger.info("accessToken보다 먼저 만료될 예정인 리프레시 토큰 발견"); + else{ + logger.info("리프레시 토큰과 access 토큰 재발급"); deleteRefreshToken(request.getRefreshToken()); return generateRefreshToken(member.getSocialId(), member.getSocialType()); } From 31a74d6f1621b3b41b15bd893c13f461a9b41013 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Fri, 16 Feb 2024 20:08:54 +0900 Subject: [PATCH 13/15] =?UTF-8?q?:bug:=20Fix=20:=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20spring=20security=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/briefingapi/security/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java index a474b9d..ad1f4d3 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java @@ -82,7 +82,7 @@ public WebSecurityCustomizer webSecurityCustomizer() { "/schedule", "/v3/api-docs", "/v3/api-docs/**", - "/docs/**","/fcms/**", + "/docs/**","/fcms/**","/members/auth/**", "/briefings/temp"); } @@ -138,6 +138,7 @@ public SecurityFilterChain JwtFilterChain(HttpSecurity http) throws Exception { .authenticated(); authorize.requestMatchers("/v2/scraps/**").authenticated(); authorize.requestMatchers("/scraps/**").authenticated(); + authorize.requestMatchers("/members/auth/token").permitAll(); authorize.anyRequest().authenticated(); }) .exceptionHandling( From 1768379d6af07c323cac60f8ce328e0ca03f3c61 Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Fri, 16 Feb 2024 21:15:17 +0900 Subject: [PATCH 14/15] =?UTF-8?q?:bug:=20Fix=20:=20access=20token,=20refre?= =?UTF-8?q?sh=20=ED=86=A0=ED=81=B0=20=EC=9C=A0=ED=9A=A8=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/briefingapi/redis/service/RedisServiceImpl.java | 2 +- Briefing-Api/src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java index 8d9ccce..e1d3b04 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/redis/service/RedisServiceImpl.java @@ -47,7 +47,7 @@ public RefreshToken generateRefreshToken(String socialId, SocialType socialType) LocalDateTime currentTime = LocalDateTime.now(); - LocalDateTime expireTime = currentTime.plus(90, ChronoUnit.SECONDS); + LocalDateTime expireTime = currentTime.plus(62, ChronoUnit.SECONDS); return refreshTokenRepository.save( RefreshToken.builder() diff --git a/Briefing-Api/src/main/resources/application.yml b/Briefing-Api/src/main/resources/application.yml index 5167afd..bd7503c 100644 --- a/Briefing-Api/src/main/resources/application.yml +++ b/Briefing-Api/src/main/resources/application.yml @@ -66,7 +66,7 @@ jwt: # dev server secret: ${JWT_SECRET} authorities-key: authoritiesKey - access-token-validity-in-seconds: 1210000000 # 30 m + access-token-validity-in-seconds: 30000 refresh-token-validity-in-seconds: 1210000000 # 14 d openai: @@ -119,7 +119,7 @@ jwt: secret: ${JWT_SECRET} # secret : ${JWT_SECRET} authorities-key: authoritiesKey - access-token-validity-in-seconds: 30 # 30 m + access-token-validity-in-seconds: 30000 # 30 m refresh-token-validity-in-seconds: 1210000000 # 14 d openai: From 61bdcf36676b20e533ac1caaae78a7e56848bf8e Mon Sep 17 00:00:00 2001 From: CYY1007 Date: Fri, 16 Feb 2024 21:36:34 +0900 Subject: [PATCH 15/15] =?UTF-8?q?:bug:=20Fix=20:=20v2=EC=97=90=EB=8F=84=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/briefingapi/security/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java b/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java index ad1f4d3..a1cb924 100644 --- a/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java +++ b/Briefing-Api/src/main/java/com/example/briefingapi/security/config/SecurityConfig.java @@ -82,7 +82,7 @@ public WebSecurityCustomizer webSecurityCustomizer() { "/schedule", "/v3/api-docs", "/v3/api-docs/**", - "/docs/**","/fcms/**","/members/auth/**", + "/docs/**","/fcms/**","/members/auth/**","/v2/members/auth/**", "/briefings/temp"); }