diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 688674a5..c6e28bc6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,9 +11,9 @@ defaults: shell: bash env: - AWS_S3_BUCKET: howabouttrip-backend-bucket - AWS_CODE_DEPLOY_APPLICATION: HowAboutTrip-Backend-CD - AWS_CODE_DEPLOY_GROUP: HowAboutTrip-Backend-CD-Group + AWS_S3_BUCKET: howabouttrip-bucket + AWS_CODE_DEPLOY_APPLICATION: HowAboutTrip-CD + AWS_CODE_DEPLOY_GROUP: HowAboutTrip-CD-Group jobs: deploy: @@ -36,6 +36,13 @@ jobs: working-directory: ./backend run: ./gradlew build test + - name: Setup MySQL + uses: mirromutth/mysql-action@v1.1 + with: + mysql database: 'trip' + mysql user: ${DB_USERNAME} + mysql password: ${DB_PASSWORD} + - name: Configure AWS credential uses: aws-actions/configure-aws-credentials@v1 with: @@ -44,7 +51,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: Upload to S3 - run: aws deploy push --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://$AWS_S3_BUCKET/HowAboutTrip-Backend-EC2/$GITHUB_SHA.zip --source . + run: aws deploy push --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://$AWS_S3_BUCKET/HowAboutTrip-EC2/$GITHUB_SHA.zip --source . - name: Code Deploy to EC2 - run: aws deploy create-deployment --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} --s3-location bucket=$AWS_S3_BUCKET,key=HowAboutTrip-Backend-EC2/$GITHUB_SHA.zip,bundleType=zip + run: aws deploy create-deployment --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} --s3-location bucket=$AWS_S3_BUCKET,key=HowAboutTrip-EC2/$GITHUB_SHA.zip,bundleType=zip diff --git a/.idea/sonarlint/issuestore/0/6/065e95c874597c49590257f1b37ccd1a809185ce b/.idea/sonarlint/issuestore/0/6/065e95c874597c49590257f1b37ccd1a809185ce new file mode 100644 index 00000000..4d440a06 --- /dev/null +++ b/.idea/sonarlint/issuestore/0/6/065e95c874597c49590257f1b37ccd1a809185ce @@ -0,0 +1,3 @@ + +{ +java:S1128"`Remove this unused import 'com.isp.backend.global.exception.member.MemberNotActivatedException'.(ٟ \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/1/9/19c8a86591d69e8a9ee853ac6b2a015b9e9a75f9 b/.idea/sonarlint/issuestore/1/2/12e74ec3d058fd5c3591dbd03535b11ce2aa099a similarity index 100% rename from .idea/sonarlint/issuestore/1/9/19c8a86591d69e8a9ee853ac6b2a015b9e9a75f9 rename to .idea/sonarlint/issuestore/1/2/12e74ec3d058fd5c3591dbd03535b11ce2aa099a diff --git a/.idea/sonarlint/issuestore/1/a/1a790e8df66ff79834187100aa54d881719ccd82 b/.idea/sonarlint/issuestore/1/9/1971a7780cde29eecf35980e90fd6a543f2272ce similarity index 100% rename from .idea/sonarlint/issuestore/1/a/1a790e8df66ff79834187100aa54d881719ccd82 rename to .idea/sonarlint/issuestore/1/9/1971a7780cde29eecf35980e90fd6a543f2272ce diff --git a/.idea/sonarlint/issuestore/3/3/33633e3a9eefbe48bcd3c206c80e66d4c371a6b9 b/.idea/sonarlint/issuestore/2/3/2363d464b7abe433f93c6cab2d693ce0bd00ed52 similarity index 100% rename from .idea/sonarlint/issuestore/3/3/33633e3a9eefbe48bcd3c206c80e66d4c371a6b9 rename to .idea/sonarlint/issuestore/2/3/2363d464b7abe433f93c6cab2d693ce0bd00ed52 diff --git a/.idea/sonarlint/issuestore/5/8/588b830544ac874bd4f631bda5310f1f91e195c3 b/.idea/sonarlint/issuestore/2/5/25e7bc2e784c14c74b34d15b334f63726e22b891 similarity index 100% rename from .idea/sonarlint/issuestore/5/8/588b830544ac874bd4f631bda5310f1f91e195c3 rename to .idea/sonarlint/issuestore/2/5/25e7bc2e784c14c74b34d15b334f63726e22b891 diff --git a/.idea/sonarlint/issuestore/3/3/330813660e7d0a96999bd35a5cebf19a0e34105b b/.idea/sonarlint/issuestore/3/3/330813660e7d0a96999bd35a5cebf19a0e34105b new file mode 100644 index 00000000..3b3481d4 --- /dev/null +++ b/.idea/sonarlint/issuestore/3/3/330813660e7d0a96999bd35a5cebf19a0e34105b @@ -0,0 +1,2 @@ + +o java:S120"ZRename this package name to match the regular expression '^[a-z_]+(\.[a-z_][a-z0-9_]*)*$'.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 b/.idea/sonarlint/issuestore/3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 new file mode 100644 index 00000000..3b525412 --- /dev/null +++ b/.idea/sonarlint/issuestore/3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 @@ -0,0 +1,2 @@ + +t java:S120"ZRename this package name to match the regular expression '^[a-z_]+(\.[a-z_][a-z0-9_]*)*$'.(¯ \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/8/d/8d0402f9638fd4582735ae94036ef40d9a0cc8d9 b/.idea/sonarlint/issuestore/4/7/4782521f7af0b5e4af513038bfb522ed4dc91c53 similarity index 100% rename from .idea/sonarlint/issuestore/8/d/8d0402f9638fd4582735ae94036ef40d9a0cc8d9 rename to .idea/sonarlint/issuestore/4/7/4782521f7af0b5e4af513038bfb522ed4dc91c53 diff --git a/.idea/sonarlint/issuestore/4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 b/.idea/sonarlint/issuestore/4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 new file mode 100644 index 00000000..39e0c846 --- /dev/null +++ b/.idea/sonarlint/issuestore/4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 @@ -0,0 +1,7 @@ + +f +java:S11925"KDefine a constant instead of duplicating this literal "token_type" 4 times.( +~ +java:S14889"cImmediately return this expression instead of assigning it to the temporary variable "accessToken".(글 +z +java:S1488M"dImmediately return this expression instead of assigning it to the temporary variable "refreshToken".(Ж \ No newline at end of file diff --git a/.idea/sonarlint/securityhotspotstore/1/9/19c8a86591d69e8a9ee853ac6b2a015b9e9a75f9 b/.idea/sonarlint/issuestore/5/4/5427e158efe231e7f47bb4a5853deac93cbcae0f similarity index 100% rename from .idea/sonarlint/securityhotspotstore/1/9/19c8a86591d69e8a9ee853ac6b2a015b9e9a75f9 rename to .idea/sonarlint/issuestore/5/4/5427e158efe231e7f47bb4a5853deac93cbcae0f diff --git a/.idea/sonarlint/securityhotspotstore/1/a/1a790e8df66ff79834187100aa54d881719ccd82 b/.idea/sonarlint/issuestore/6/4/64208b6155f2d4e2e3fe0106eb90088af7d3b2e4 similarity index 100% rename from .idea/sonarlint/securityhotspotstore/1/a/1a790e8df66ff79834187100aa54d881719ccd82 rename to .idea/sonarlint/issuestore/6/4/64208b6155f2d4e2e3fe0106eb90088af7d3b2e4 diff --git a/.idea/sonarlint/securityhotspotstore/3/3/33633e3a9eefbe48bcd3c206c80e66d4c371a6b9 b/.idea/sonarlint/issuestore/6/a/6a2dd50a3f6743dd249b62f3b60675b35f1da4c3 similarity index 100% rename from .idea/sonarlint/securityhotspotstore/3/3/33633e3a9eefbe48bcd3c206c80e66d4c371a6b9 rename to .idea/sonarlint/issuestore/6/a/6a2dd50a3f6743dd249b62f3b60675b35f1da4c3 diff --git a/.idea/sonarlint/securityhotspotstore/5/8/588b830544ac874bd4f631bda5310f1f91e195c3 b/.idea/sonarlint/issuestore/7/3/739b9a34c92bd055e28df022d452c330a2c0c3c2 similarity index 100% rename from .idea/sonarlint/securityhotspotstore/5/8/588b830544ac874bd4f631bda5310f1f91e195c3 rename to .idea/sonarlint/issuestore/7/3/739b9a34c92bd055e28df022d452c330a2c0c3c2 diff --git a/.idea/sonarlint/securityhotspotstore/8/d/8d0402f9638fd4582735ae94036ef40d9a0cc8d9 b/.idea/sonarlint/issuestore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb similarity index 100% rename from .idea/sonarlint/securityhotspotstore/8/d/8d0402f9638fd4582735ae94036ef40d9a0cc8d9 rename to .idea/sonarlint/issuestore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb diff --git a/.idea/sonarlint/issuestore/7/e/7e16691a9fc60084a157565ec422c8094d3df67c b/.idea/sonarlint/issuestore/7/e/7e16691a9fc60084a157565ec422c8094d3df67c new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/7/e/7e30ae1cb84f6db862cf23385cd180d2ee224023 b/.idea/sonarlint/issuestore/7/e/7e30ae1cb84f6db862cf23385cd180d2ee224023 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/7/f/7f150bb1711df2425db4160648cf05d67e224656 b/.idea/sonarlint/issuestore/7/f/7f150bb1711df2425db4160648cf05d67e224656 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/8/a/8acaf61470b8ba9aa6049283e1007d390bfaa9be b/.idea/sonarlint/issuestore/8/a/8acaf61470b8ba9aa6049283e1007d390bfaa9be new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 b/.idea/sonarlint/issuestore/8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 new file mode 100644 index 00000000..aad5046c --- /dev/null +++ b/.idea/sonarlint/issuestore/8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 @@ -0,0 +1,3 @@ + +H +java:S2699 "-Add at least one assertion to this test case.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/9/5/95352dc9683fc5665e000eb792c2e520ec020fa5 b/.idea/sonarlint/issuestore/9/5/95352dc9683fc5665e000eb792c2e520ec020fa5 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/9/5/954cd358297ecfdc47b7f4515dcf34dfb67f86aa b/.idea/sonarlint/issuestore/9/5/954cd358297ecfdc47b7f4515dcf34dfb67f86aa new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/9/8/982d85ea34e066de5118505e73079ae8c0bbd2f1 b/.idea/sonarlint/issuestore/9/8/982d85ea34e066de5118505e73079ae8c0bbd2f1 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/a/4/a4d45d939048b362dfb05cd73baff88946c380da b/.idea/sonarlint/issuestore/a/4/a4d45d939048b362dfb05cd73baff88946c380da new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/a/9/a9e70078b70425918411b78b3c53d5603c3ce5c7 b/.idea/sonarlint/issuestore/a/9/a9e70078b70425918411b78b3c53d5603c3ce5c7 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/a/d/ad8639f749dc49476f473a3e26d54daae5f52c58 b/.idea/sonarlint/issuestore/a/d/ad8639f749dc49476f473a3e26d54daae5f52c58 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/a/d/ade58d0c2cdff8bd319d05c89afd49ae61d4c888 b/.idea/sonarlint/issuestore/a/d/ade58d0c2cdff8bd319d05c89afd49ae61d4c888 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/b/5/b556167afb84bda333b2fab7fc28934e32b459d9 b/.idea/sonarlint/issuestore/b/5/b556167afb84bda333b2fab7fc28934e32b459d9 new file mode 100644 index 00000000..17cc0b43 --- /dev/null +++ b/.idea/sonarlint/issuestore/b/5/b556167afb84bda333b2fab7fc28934e32b459d9 @@ -0,0 +1,7 @@ + +x +java:S1128"]Remove this unused import 'org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder'.(څ +s +java:S1128"]Remove this unused import 'org.springframework.security.crypto.password.NoOpPasswordEncoder'.( +t +java:S1128"YRemove this unused import 'org.springframework.security.crypto.password.PasswordEncoder'.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/b/d/bd7108983578f649cb6893456714cdace9161089 b/.idea/sonarlint/issuestore/b/d/bd7108983578f649cb6893456714cdace9161089 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 b/.idea/sonarlint/issuestore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 new file mode 100644 index 00000000..655798a3 --- /dev/null +++ b/.idea/sonarlint/issuestore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 @@ -0,0 +1,7 @@ + +G +java:S1128 "*Remove this unused import 'lombok.Getter'.(ҵ8ָ1 +u +java:S1128 "SRemove this unused import 'org.springframework.beans.factory.annotation.Autowired'.(8ָ1 +m +java:S1128"PRemove this unused import 'org.springframework.validation.annotation.Validated'.(փ8ָ1 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477 b/.idea/sonarlint/issuestore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477 new file mode 100644 index 00000000..b870085d --- /dev/null +++ b/.idea/sonarlint/issuestore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477 @@ -0,0 +1,7 @@ + +c +java:S11921"MDefine a constant instead of duplicating this literal "Access-Token" 3 times.( +i +java:S11922"NDefine a constant instead of duplicating this literal "Refresh-Token" 3 times.( +d +java:S1612O"IReplace this lambda with method reference 'MemberNotFoundException::new'.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be b/.idea/sonarlint/issuestore/c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be new file mode 100644 index 00000000..7bd64b1e --- /dev/null +++ b/.idea/sonarlint/issuestore/c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be @@ -0,0 +1,3 @@ + +C +java:S1948"(Make "member" transient or serializable.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/d/1/d182d300d8cf0365314284068d27e6ffb1939b79 b/.idea/sonarlint/issuestore/d/1/d182d300d8cf0365314284068d27e6ffb1939b79 new file mode 100644 index 00000000..661057b5 --- /dev/null +++ b/.idea/sonarlint/issuestore/d/1/d182d300d8cf0365314284068d27e6ffb1939b79 @@ -0,0 +1,5 @@ + +e java:S117 +"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +e java:S117 "QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +f java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ނ \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/d/b/db1536a26c9263d5e45b08349b584c33c298dbd0 b/.idea/sonarlint/issuestore/d/b/db1536a26c9263d5e45b08349b584c33c298dbd0 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/e/1/e10abc7399415ec6de9fa8a14b8845937b6998be b/.idea/sonarlint/issuestore/e/1/e10abc7399415ec6de9fa8a14b8845937b6998be new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/e/7/e77af17cae7e49a4d884fa6f143aebb97d82cca0 b/.idea/sonarlint/issuestore/e/7/e77af17cae7e49a4d884fa6f143aebb97d82cca0 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/e/b/ebb2b87f801ec556cbe2fd6342ba3bcda8bf2b00 b/.idea/sonarlint/issuestore/e/b/ebb2b87f801ec556cbe2fd6342ba3bcda8bf2b00 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a b/.idea/sonarlint/issuestore/f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a new file mode 100644 index 00000000..04792156 --- /dev/null +++ b/.idea/sonarlint/issuestore/f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a @@ -0,0 +1,2 @@ + +o java:S120"ZRename this package name to match the regular expression '^[a-z_]+(\.[a-z_][a-z0-9_]*)*$'.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/c/fc6ebdc81738c6847619d528d8e049c462568f71 b/.idea/sonarlint/issuestore/f/c/fc6ebdc81738c6847619d528d8e049c462568f71 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf b/.idea/sonarlint/issuestore/f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf new file mode 100644 index 00000000..baa702a2 --- /dev/null +++ b/.idea/sonarlint/issuestore/f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf @@ -0,0 +1,2 @@ + +o java:S120"ZRename this package name to match the regular expression '^[a-z_]+(\.[a-z_][a-z0-9_]*)*$'.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/f/ffc9ece1d1bc95d7bb466fa3733967163c4d7780 b/.idea/sonarlint/issuestore/f/f/ffc9ece1d1bc95d7bb466fa3733967163c4d7780 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index a7cf7ccc..d978be9a 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -10,18 +10,12 @@ Ybackend/src/main/java/com/isp/backend/domain/schedules/controller/ScheduleContr Sbackend/src/main/java/com/isp/backend/domain/schedules/service/ScheduleService.java,9/8/988ee194fffff9c0b19490c3f17aec47381ae2a0 Z *backend/src/main/resources/application.yml,9/6/9691797aa04d85d3238a4a45d4fa240168a3d92d -T -$backend/.elasticbeanstalk/config.yml,8/d/8d0402f9638fd4582735ae94036ef40d9a0cc8d9 G backend/settings.gradle,b/3/b329b210b93dd6d96e8198d55bd14bd3361ac708 C backend/gradlew.bat,7/b/7b3a79f800e85c8b44fcfc250f8be64bf945f627 ? backend/gradlew,c/2/c2919d98ae33730c77963d99ccd650551213ef68 -@ -backend/Procfile,5/8/588b830544ac874bd4f631bda5310f1f91e195c3 -R -"backend/.platform/nginx/nginx.conf,1/9/19c8a86591d69e8a9ee853ac6b2a015b9e9a75f9 D backend/build.gradle,2/1/21d4b1ec4e3be89735ba8533a58eee07a372667a p @@ -42,7 +36,83 @@ Dbackend/src/main/java/com/isp/backend/domain/image/entity/Image.java,3/e/3e7ba Vbackend/src/main/java/com/isp/backend/domain/receipt/controller/ReceiptController.java,8/6/86da04119b555391860b194466103596afaf9d52 ; appspec.yml,3/2/323482c68cf68aa6001a3280b1dbb38f31ee6cbc -? -scripts/stop.sh,3/3/33633e3a9eefbe48bcd3c206c80e66d4c371a6b9 -@ -scripts/start.sh,1/a/1a790e8df66ff79834187100aa54d881719ccd82 \ No newline at end of file + +Tbackend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java,b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 +~ +Nbackend/src/main/java/com/isp/backend/domain/member/service/MemberService.java,c/5/c50f0cf17624e9670cc09596eb1c566241c04477 +v +Fbackend/src/main/java/com/isp/backend/domain/member/entity/Member.java,a/4/a4d45d939048b362dfb05cd73baff88946c380da + +Tbackend/src/main/java/com/isp/backend/domain/member/repository/MemberRepository.java,d/1/d182d300d8cf0365314284068d27e6ffb1939b79 +x +Hbackend/src/main/java/com/isp/backend/domain/receipt/entity/Receipt.java,1/9/1971a7780cde29eecf35980e90fd6a543f2272ce + +Pbackend/src/main/java/com/isp/backend/domain/receipt/service/ReceiptService.java,f/f/ffc9ece1d1bc95d7bb466fa3733967163c4d7780 + +Qbackend/src/main/java/com/isp/backend/domain/schedules/entity/SharedSchedule.java,2/3/2363d464b7abe433f93c6cab2d693ce0bd00ed52 +} +Mbackend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedule.java,9/5/954cd358297ecfdc47b7f4515dcf34dfb67f86aa +u +Ebackend/src/main/java/com/isp/backend/global/exception/ErrorCode.java,6/4/64208b6155f2d4e2e3fe0106eb90088af7d3b2e4 +{ +Kbackend/src/main/java/com/isp/backend/global/exception/CustomException.java,7/f/7f150bb1711df2425db4160648cf05d67e224656 + +Rbackend/src/main/java/com/isp/backend/global/exception/GlobalExceptionHandler.java,7/3/739b9a34c92bd055e28df022d452c330a2c0c3c2 +y +Ibackend/src/main/java/com/isp/backend/global/exception/ErrorResponse.java,d/b/db1536a26c9263d5e45b08349b584c33c298dbd0 + +[backend/src/main/java/com/isp/backend/domain/schedules/repository/MyScheduleRepository.java,1/2/12e74ec3d058fd5c3591dbd03535b11ce2aa099a + +_backend/src/main/java/com/isp/backend/domain/schedules/repository/SharedScheduleRepository.java,b/d/bd7108983578f649cb6893456714cdace9161089 +s +Cbackend/src/main/java/com/isp/backend/global/common/BaseEntity.java,9/8/982d85ea34e066de5118505e73079ae8c0bbd2f1 +| +Lbackend/src/main/java/com/isp/backend/global/security/WebSecurityConfig.java,b/5/b556167afb84bda333b2fab7fc28934e32b459d9 +r +Bbackend/src/test/java/com/isp/backend/BackendApplicationTests.java,8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 + +Sbackend/src/main/java/com/isp/backend/global/security/CustomUserDetailsService.java,0/6/065e95c874597c49590257f1b37ccd1a809185ce +| +Lbackend/src/main/java/com/isp/backend/global/security/CustomUserDetails.java,c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be +| +Lbackend/src/main/java/com/isp/backend/global/jwt/JwtAccessDeniedHandler.java,7/e/7e30ae1cb84f6db862cf23385cd180d2ee224023 + +Qbackend/src/main/java/com/isp/backend/global/jwt/JwtAuthenticationEntryPoint.java,8/a/8acaf61470b8ba9aa6049283e1007d390bfaa9be +} +Mbackend/src/main/java/com/isp/backend/global/jwt/JwtAuthenticationFilter.java,a/d/ad8639f749dc49476f473a3e26d54daae5f52c58 +s +Cbackend/src/main/java/com/isp/backend/global/jwt/TokenProvider.java,4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 + +Zbackend/src/main/java/com/isp/backend/global/exception/member/MemberNotFoundException.java,f/c/fc6ebdc81738c6847619d528d8e049c462568f71 + +_backend/src/main/java/com/isp/backend/global/exception/member/RefreshTokenInvalidException.java,9/5/95352dc9683fc5665e000eb792c2e520ec020fa5 + +^backend/src/main/java/com/isp/backend/global/exception/member/MemberNotActivatedException.java,e/b/ebb2b87f801ec556cbe2fd6342ba3bcda8bf2b00 + +`backend/src/main/java/com/isp/backend/global/exception/member/AuthenticationFailedException.java,a/d/ade58d0c2cdff8bd319d05c89afd49ae61d4c888 + +^backend/src/main/java/com/isp/backend/global/exception/member/AccessTokenInvalidException.java,5/4/5427e158efe231e7f47bb4a5853deac93cbcae0f + +Qbackend/src/main/java/com/isp/backend/domain/member/dto/MemberDetailResponse.java,6/a/6a2dd50a3f6743dd249b62f3b60675b35f1da4c3 +z +Jbackend/src/main/java/com/isp/backend/domain/member/dto/SignUpRequest.java,4/7/4782521f7af0b5e4af513038bfb522ed4dc91c53 + +Obackend/src/main/java/com/isp/backend/domain/member/dto/GoogleLoginRequest.java,2/5/25e7bc2e784c14c74b34d15b334f63726e22b891 + +Pbackend/src/main/java/com/isp/backend/domain/member/dto/AuthRecreateRequest.java,a/9/a9e70078b70425918411b78b3c53d5603c3ce5c7 +` +0backend/gradle/wrapper/gradle-wrapper.properties,e/7/e77af17cae7e49a4d884fa6f143aebb97d82cca0 +A +android/README.md,e/1/e10abc7399415ec6de9fa8a14b8845937b6998be +B +backend/.gitignore,7/e/7e16691a9fc60084a157565ec422c8094d3df67c + +Xbackend/src/main/java/com/isp/backend/domain/travelPlace/service/TravelPlaceService.java,3/3/330813660e7d0a96999bd35a5cebf19a0e34105b + +Pbackend/src/main/java/com/isp/backend/domain/travelPlace/entity/TravelPlace.java,f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a + +^backend/src/main/java/com/isp/backend/domain/travelPlace/repository/TravelPlaceRepository.java,3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 + +^backend/src/main/java/com/isp/backend/domain/travelPlace/controller/TravelPlaceController.java,f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf +A +scripts/deploy.sh,7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb \ No newline at end of file diff --git a/.idea/sonarlint/securityhotspotstore/0/6/065e95c874597c49590257f1b37ccd1a809185ce b/.idea/sonarlint/securityhotspotstore/0/6/065e95c874597c49590257f1b37ccd1a809185ce new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/1/2/12e74ec3d058fd5c3591dbd03535b11ce2aa099a b/.idea/sonarlint/securityhotspotstore/1/2/12e74ec3d058fd5c3591dbd03535b11ce2aa099a new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/1/9/1971a7780cde29eecf35980e90fd6a543f2272ce b/.idea/sonarlint/securityhotspotstore/1/9/1971a7780cde29eecf35980e90fd6a543f2272ce new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/2/3/2363d464b7abe433f93c6cab2d693ce0bd00ed52 b/.idea/sonarlint/securityhotspotstore/2/3/2363d464b7abe433f93c6cab2d693ce0bd00ed52 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/2/5/25e7bc2e784c14c74b34d15b334f63726e22b891 b/.idea/sonarlint/securityhotspotstore/2/5/25e7bc2e784c14c74b34d15b334f63726e22b891 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/3/3/330813660e7d0a96999bd35a5cebf19a0e34105b b/.idea/sonarlint/securityhotspotstore/3/3/330813660e7d0a96999bd35a5cebf19a0e34105b new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 b/.idea/sonarlint/securityhotspotstore/3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/4/7/4782521f7af0b5e4af513038bfb522ed4dc91c53 b/.idea/sonarlint/securityhotspotstore/4/7/4782521f7af0b5e4af513038bfb522ed4dc91c53 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 b/.idea/sonarlint/securityhotspotstore/4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/5/4/5427e158efe231e7f47bb4a5853deac93cbcae0f b/.idea/sonarlint/securityhotspotstore/5/4/5427e158efe231e7f47bb4a5853deac93cbcae0f new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/6/4/64208b6155f2d4e2e3fe0106eb90088af7d3b2e4 b/.idea/sonarlint/securityhotspotstore/6/4/64208b6155f2d4e2e3fe0106eb90088af7d3b2e4 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/6/a/6a2dd50a3f6743dd249b62f3b60675b35f1da4c3 b/.idea/sonarlint/securityhotspotstore/6/a/6a2dd50a3f6743dd249b62f3b60675b35f1da4c3 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/7/3/739b9a34c92bd055e28df022d452c330a2c0c3c2 b/.idea/sonarlint/securityhotspotstore/7/3/739b9a34c92bd055e28df022d452c330a2c0c3c2 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb b/.idea/sonarlint/securityhotspotstore/7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/7/e/7e16691a9fc60084a157565ec422c8094d3df67c b/.idea/sonarlint/securityhotspotstore/7/e/7e16691a9fc60084a157565ec422c8094d3df67c new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/7/e/7e30ae1cb84f6db862cf23385cd180d2ee224023 b/.idea/sonarlint/securityhotspotstore/7/e/7e30ae1cb84f6db862cf23385cd180d2ee224023 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/7/f/7f150bb1711df2425db4160648cf05d67e224656 b/.idea/sonarlint/securityhotspotstore/7/f/7f150bb1711df2425db4160648cf05d67e224656 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/8/a/8acaf61470b8ba9aa6049283e1007d390bfaa9be b/.idea/sonarlint/securityhotspotstore/8/a/8acaf61470b8ba9aa6049283e1007d390bfaa9be new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 b/.idea/sonarlint/securityhotspotstore/8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/9/5/95352dc9683fc5665e000eb792c2e520ec020fa5 b/.idea/sonarlint/securityhotspotstore/9/5/95352dc9683fc5665e000eb792c2e520ec020fa5 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/9/5/954cd358297ecfdc47b7f4515dcf34dfb67f86aa b/.idea/sonarlint/securityhotspotstore/9/5/954cd358297ecfdc47b7f4515dcf34dfb67f86aa new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/9/8/982d85ea34e066de5118505e73079ae8c0bbd2f1 b/.idea/sonarlint/securityhotspotstore/9/8/982d85ea34e066de5118505e73079ae8c0bbd2f1 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/a/4/a4d45d939048b362dfb05cd73baff88946c380da b/.idea/sonarlint/securityhotspotstore/a/4/a4d45d939048b362dfb05cd73baff88946c380da new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/a/9/a9e70078b70425918411b78b3c53d5603c3ce5c7 b/.idea/sonarlint/securityhotspotstore/a/9/a9e70078b70425918411b78b3c53d5603c3ce5c7 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/a/d/ad8639f749dc49476f473a3e26d54daae5f52c58 b/.idea/sonarlint/securityhotspotstore/a/d/ad8639f749dc49476f473a3e26d54daae5f52c58 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/a/d/ade58d0c2cdff8bd319d05c89afd49ae61d4c888 b/.idea/sonarlint/securityhotspotstore/a/d/ade58d0c2cdff8bd319d05c89afd49ae61d4c888 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/b/5/b556167afb84bda333b2fab7fc28934e32b459d9 b/.idea/sonarlint/securityhotspotstore/b/5/b556167afb84bda333b2fab7fc28934e32b459d9 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/b/d/bd7108983578f649cb6893456714cdace9161089 b/.idea/sonarlint/securityhotspotstore/b/d/bd7108983578f649cb6893456714cdace9161089 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 b/.idea/sonarlint/securityhotspotstore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477 b/.idea/sonarlint/securityhotspotstore/c/5/c50f0cf17624e9670cc09596eb1c566241c04477 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be b/.idea/sonarlint/securityhotspotstore/c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/d/1/d182d300d8cf0365314284068d27e6ffb1939b79 b/.idea/sonarlint/securityhotspotstore/d/1/d182d300d8cf0365314284068d27e6ffb1939b79 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/d/b/db1536a26c9263d5e45b08349b584c33c298dbd0 b/.idea/sonarlint/securityhotspotstore/d/b/db1536a26c9263d5e45b08349b584c33c298dbd0 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/e/1/e10abc7399415ec6de9fa8a14b8845937b6998be b/.idea/sonarlint/securityhotspotstore/e/1/e10abc7399415ec6de9fa8a14b8845937b6998be new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/e/7/e77af17cae7e49a4d884fa6f143aebb97d82cca0 b/.idea/sonarlint/securityhotspotstore/e/7/e77af17cae7e49a4d884fa6f143aebb97d82cca0 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/e/b/ebb2b87f801ec556cbe2fd6342ba3bcda8bf2b00 b/.idea/sonarlint/securityhotspotstore/e/b/ebb2b87f801ec556cbe2fd6342ba3bcda8bf2b00 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a b/.idea/sonarlint/securityhotspotstore/f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/f/c/fc6ebdc81738c6847619d528d8e049c462568f71 b/.idea/sonarlint/securityhotspotstore/f/c/fc6ebdc81738c6847619d528d8e049c462568f71 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf b/.idea/sonarlint/securityhotspotstore/f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/f/f/ffc9ece1d1bc95d7bb466fa3733967163c4d7780 b/.idea/sonarlint/securityhotspotstore/f/f/ffc9ece1d1bc95d7bb466fa3733967163c4d7780 new file mode 100644 index 00000000..e69de29b diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb index f4cbef08..0b3136ff 100644 --- a/.idea/sonarlint/securityhotspotstore/index.pb +++ b/.idea/sonarlint/securityhotspotstore/index.pb @@ -10,18 +10,12 @@ Ybackend/src/main/java/com/isp/backend/domain/schedules/controller/ScheduleContr Sbackend/src/main/java/com/isp/backend/domain/schedules/service/ScheduleService.java,9/8/988ee194fffff9c0b19490c3f17aec47381ae2a0 Z *backend/src/main/resources/application.yml,9/6/9691797aa04d85d3238a4a45d4fa240168a3d92d -T -$backend/.elasticbeanstalk/config.yml,8/d/8d0402f9638fd4582735ae94036ef40d9a0cc8d9 G backend/settings.gradle,b/3/b329b210b93dd6d96e8198d55bd14bd3361ac708 C backend/gradlew.bat,7/b/7b3a79f800e85c8b44fcfc250f8be64bf945f627 ? backend/gradlew,c/2/c2919d98ae33730c77963d99ccd650551213ef68 -@ -backend/Procfile,5/8/588b830544ac874bd4f631bda5310f1f91e195c3 -R -"backend/.platform/nginx/nginx.conf,1/9/19c8a86591d69e8a9ee853ac6b2a015b9e9a75f9 D backend/build.gradle,2/1/21d4b1ec4e3be89735ba8533a58eee07a372667a p @@ -42,7 +36,83 @@ t Dbackend/src/main/java/com/isp/backend/domain/image/entity/Image.java,3/e/3e7baf5788b82805f2e8de304ea856c7f50e4463 ; appspec.yml,3/2/323482c68cf68aa6001a3280b1dbb38f31ee6cbc -? -scripts/stop.sh,3/3/33633e3a9eefbe48bcd3c206c80e66d4c371a6b9 -@ -scripts/start.sh,1/a/1a790e8df66ff79834187100aa54d881719ccd82 \ No newline at end of file + +Tbackend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java,b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 +~ +Nbackend/src/main/java/com/isp/backend/domain/member/service/MemberService.java,c/5/c50f0cf17624e9670cc09596eb1c566241c04477 +v +Fbackend/src/main/java/com/isp/backend/domain/member/entity/Member.java,a/4/a4d45d939048b362dfb05cd73baff88946c380da + +Tbackend/src/main/java/com/isp/backend/domain/member/repository/MemberRepository.java,d/1/d182d300d8cf0365314284068d27e6ffb1939b79 +x +Hbackend/src/main/java/com/isp/backend/domain/receipt/entity/Receipt.java,1/9/1971a7780cde29eecf35980e90fd6a543f2272ce + +Pbackend/src/main/java/com/isp/backend/domain/receipt/service/ReceiptService.java,f/f/ffc9ece1d1bc95d7bb466fa3733967163c4d7780 + +Qbackend/src/main/java/com/isp/backend/domain/schedules/entity/SharedSchedule.java,2/3/2363d464b7abe433f93c6cab2d693ce0bd00ed52 +} +Mbackend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedule.java,9/5/954cd358297ecfdc47b7f4515dcf34dfb67f86aa +u +Ebackend/src/main/java/com/isp/backend/global/exception/ErrorCode.java,6/4/64208b6155f2d4e2e3fe0106eb90088af7d3b2e4 +{ +Kbackend/src/main/java/com/isp/backend/global/exception/CustomException.java,7/f/7f150bb1711df2425db4160648cf05d67e224656 + +Rbackend/src/main/java/com/isp/backend/global/exception/GlobalExceptionHandler.java,7/3/739b9a34c92bd055e28df022d452c330a2c0c3c2 +y +Ibackend/src/main/java/com/isp/backend/global/exception/ErrorResponse.java,d/b/db1536a26c9263d5e45b08349b584c33c298dbd0 + +[backend/src/main/java/com/isp/backend/domain/schedules/repository/MyScheduleRepository.java,1/2/12e74ec3d058fd5c3591dbd03535b11ce2aa099a + +_backend/src/main/java/com/isp/backend/domain/schedules/repository/SharedScheduleRepository.java,b/d/bd7108983578f649cb6893456714cdace9161089 +s +Cbackend/src/main/java/com/isp/backend/global/common/BaseEntity.java,9/8/982d85ea34e066de5118505e73079ae8c0bbd2f1 +| +Lbackend/src/main/java/com/isp/backend/global/security/WebSecurityConfig.java,b/5/b556167afb84bda333b2fab7fc28934e32b459d9 +r +Bbackend/src/test/java/com/isp/backend/BackendApplicationTests.java,8/e/8eb84e93349d79436a7fe24fb4d9f0c36b25c479 + +Sbackend/src/main/java/com/isp/backend/global/security/CustomUserDetailsService.java,0/6/065e95c874597c49590257f1b37ccd1a809185ce +| +Lbackend/src/main/java/com/isp/backend/global/security/CustomUserDetails.java,c/a/ca737cdd4f2161c06e102b9e8f86432a41ab47be +| +Lbackend/src/main/java/com/isp/backend/global/jwt/JwtAccessDeniedHandler.java,7/e/7e30ae1cb84f6db862cf23385cd180d2ee224023 + +Qbackend/src/main/java/com/isp/backend/global/jwt/JwtAuthenticationEntryPoint.java,8/a/8acaf61470b8ba9aa6049283e1007d390bfaa9be +} +Mbackend/src/main/java/com/isp/backend/global/jwt/JwtAuthenticationFilter.java,a/d/ad8639f749dc49476f473a3e26d54daae5f52c58 +s +Cbackend/src/main/java/com/isp/backend/global/jwt/TokenProvider.java,4/b/4bea8a271179cc56b85f48f234ab6200a9668cc5 + +Zbackend/src/main/java/com/isp/backend/global/exception/member/MemberNotFoundException.java,f/c/fc6ebdc81738c6847619d528d8e049c462568f71 + +_backend/src/main/java/com/isp/backend/global/exception/member/RefreshTokenInvalidException.java,9/5/95352dc9683fc5665e000eb792c2e520ec020fa5 + +^backend/src/main/java/com/isp/backend/global/exception/member/MemberNotActivatedException.java,e/b/ebb2b87f801ec556cbe2fd6342ba3bcda8bf2b00 + +`backend/src/main/java/com/isp/backend/global/exception/member/AuthenticationFailedException.java,a/d/ade58d0c2cdff8bd319d05c89afd49ae61d4c888 + +^backend/src/main/java/com/isp/backend/global/exception/member/AccessTokenInvalidException.java,5/4/5427e158efe231e7f47bb4a5853deac93cbcae0f + +Qbackend/src/main/java/com/isp/backend/domain/member/dto/MemberDetailResponse.java,6/a/6a2dd50a3f6743dd249b62f3b60675b35f1da4c3 +z +Jbackend/src/main/java/com/isp/backend/domain/member/dto/SignUpRequest.java,4/7/4782521f7af0b5e4af513038bfb522ed4dc91c53 + +Obackend/src/main/java/com/isp/backend/domain/member/dto/GoogleLoginRequest.java,2/5/25e7bc2e784c14c74b34d15b334f63726e22b891 + +Pbackend/src/main/java/com/isp/backend/domain/member/dto/AuthRecreateRequest.java,a/9/a9e70078b70425918411b78b3c53d5603c3ce5c7 +` +0backend/gradle/wrapper/gradle-wrapper.properties,e/7/e77af17cae7e49a4d884fa6f143aebb97d82cca0 +A +android/README.md,e/1/e10abc7399415ec6de9fa8a14b8845937b6998be +B +backend/.gitignore,7/e/7e16691a9fc60084a157565ec422c8094d3df67c + +Xbackend/src/main/java/com/isp/backend/domain/travelPlace/service/TravelPlaceService.java,3/3/330813660e7d0a96999bd35a5cebf19a0e34105b + +Pbackend/src/main/java/com/isp/backend/domain/travelPlace/entity/TravelPlace.java,f/6/f6e5a13ee0018176668e55abdfbc79383e3fca3a + +^backend/src/main/java/com/isp/backend/domain/travelPlace/repository/TravelPlaceRepository.java,3/d/3de99115bf130d9ac74cb84cf73160d47a7d6f22 + +^backend/src/main/java/com/isp/backend/domain/travelPlace/controller/TravelPlaceController.java,f/f/ffc0d4916e8272a132bc762e4cfb73dd5a013adf +A +scripts/deploy.sh,7/c/7cb9bbdbbfab39da291abf148abedfdfbe6adebb \ No newline at end of file diff --git a/appspec.yml b/appspec.yml index e75130a5..f663dbbc 100644 --- a/appspec.yml +++ b/appspec.yml @@ -2,19 +2,11 @@ version: 0.0 os: linux files: - - source: / - destination: /home/ubuntu/spring-github-action - overwrite: yes - -permissions: - - object: / - owner: ubuntu - group: ubuntu + - source: / + destination: /home/ubuntu/app # 인스턴스에서 파일이 저장될 위치 hooks: AfterInstall: - - location: scripts/stop.sh + - location: scripts/deploy.sh timeout: 60 - ApplicationStart: - - location: scripts/start.sh - timeout: 60 \ No newline at end of file + runas: ubuntu \ No newline at end of file diff --git a/backend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java b/backend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java index 5b412d1f..dc547d4a 100644 --- a/backend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java +++ b/backend/src/main/java/com/isp/backend/domain/member/controller/MemberController.java @@ -22,18 +22,11 @@ public class MemberController { private final MemberService memberService; - /** - * test API - */ @GetMapping("/test") - public ResponseEntity privateEndpoint() { -// System.out.println("이메일 출력 = " + customUserDetails.getUsername()); -// String member = customUserDetails.getUsername(); - return ResponseEntity.ok("hi"); + public String testEndpoint() { + return "Test endpoint response"; } - - /** * 로그인 API */ diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 192e00a5..d940df6e 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,5 +1,7 @@ server: port: 5000 + servlet: + context-path: / spring: jpa: @@ -15,4 +17,4 @@ spring: password: ${DB_PASSWORD} jwt: - secret : ${JWT_SECRET_KEY} \ No newline at end of file + secret : ${JWT_SECRET_KEY} diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100644 index 00000000..b801d9fc --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,22 @@ +REPOSITORY=/home/ubuntu/app +cd $REPOSITORY + +APP_NAME=demo +JAR_NAME=$(ls $REPOSITORY/backend/build/libs/ | grep '.jar' | tail -n 1) +JAR_PATH=$REPOSITORY/backend/build/libs/$JAR_NAME + +CURRENT_PID=$(pgrep -f $APP_NAME) + +if [ -z $CURRENT_PID ] #2 +then + echo "> 현재 구동중인 애플리케이션이 없으므로 종료하지 않습니다." +else + echo "> kill -15 $CURRENT_PID" + sudo kill -15 $CURRENT_PID + sleep 5 +fi + +echo "> $JAR_PATH 배포" #3 +nohup java -jar \ + -Dspring.profiles.active=dev \ + backend/build/libs/$JAR_NAME > $REPOSITORY/nohup.out 2>&1 & \ No newline at end of file diff --git a/scripts/start.sh b/scripts/start.sh deleted file mode 100644 index 6d31b3ca..00000000 --- a/scripts/start.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -ROOT_PATH="/home/ubuntu/spring-github-action" -JAR="$ROOT_PATH/application.jar" - -APP_LOG="$ROOT_PATH/application.log" -ERROR_LOG="$ROOT_PATH/error.log" -START_LOG="$ROOT_PATH/start.log" - -NOW=$(date +%c) - -echo "[$NOW] $JAR 복사" >> $START_LOG -cp $ROOT_PATH/build/libs/spring-github-action-1.0.0.jar $JAR - -echo "[$NOW] > $JAR 실행" >> $START_LOG -nohup java -jar $JAR > $APP_LOG 2> $ERROR_LOG & - -SERVICE_PID=$(pgrep -f $JAR) -echo "[$NOW] > 서비스 PID: $SERVICE_PID" >> $START_LOG \ No newline at end of file diff --git a/scripts/stop.sh b/scripts/stop.sh deleted file mode 100644 index 9bc99c7f..00000000 --- a/scripts/stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -ROOT_PATH="/home/ubuntu/spring-github-action" -JAR="$ROOT_PATH/application.jar" -STOP_LOG="$ROOT_PATH/stop.log" -SERVICE_PID=$(pgrep -f $JAR) - -if [ -z "$SERVICE_PID" ]; then - echo "서비스 NouFound" >> $STOP_LOG -else - echo "서비스 종료 " >> $STOP_LOG - kill "$SERVICE_PID" -fi \ No newline at end of file