From 7d5c0d9d62e9bd0e3da586e701a602e9964797ce Mon Sep 17 00:00:00 2001 From: kimday0326 Date: Thu, 4 Jul 2024 14:16:44 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20local=20ddl-auto=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(create-auto=20>=20create)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-infra-db/src/main/resources/application-db.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/core-infra-db/src/main/resources/application-db.yml b/core/core-infra-db/src/main/resources/application-db.yml index 8f76970d..02b6b6d3 100644 --- a/core/core-infra-db/src/main/resources/application-db.yml +++ b/core/core-infra-db/src/main/resources/application-db.yml @@ -9,11 +9,11 @@ spring: jpa: database: mysql hibernate: - ddl-auto: create-drop + ddl-auto: create open-in-view: false show-sql: true -# generate-ddl: true -# defer-datasource-initialization: true +# generate-ddl: false +# defer-datasource-initialization: false # # sql: # init: From 6d5214cd9d5ae82b10cf6adcec81efd9ff6c1882 Mon Sep 17 00:00:00 2001 From: kimday0326 Date: Thu, 4 Jul 2024 14:52:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=8B=A8=EC=B2=B4=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=97=94=EB=93=9C=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD(Id=20>=20me)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/club/controller/ClubController.java | 8 +++++--- .../company/controller/CompanyController.java | 11 +++++++---- .../controller/OrganizationController.java | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/api/src/main/java/com/sponus/sponusbe/domain/organization/club/controller/ClubController.java b/api/src/main/java/com/sponus/sponusbe/domain/organization/club/controller/ClubController.java index e076cd49..6248c257 100644 --- a/api/src/main/java/com/sponus/sponusbe/domain/organization/club/controller/ClubController.java +++ b/api/src/main/java/com/sponus/sponusbe/domain/organization/club/controller/ClubController.java @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import com.sponus.coredomain.domain.common.ApiResponse; +import com.sponus.coredomain.domain.organization.Organization; +import com.sponus.coreinfrasecurity.annotation.AuthOrganization; import com.sponus.sponusbe.domain.organization.club.dto.ClubGetResponse; import com.sponus.sponusbe.domain.organization.club.dto.ClubUpdateRequest; import com.sponus.sponusbe.domain.organization.club.service.ClubService; @@ -28,11 +30,11 @@ public ApiResponse getClub(@PathVariable Long clubId) { return ApiResponse.onSuccess(clubService.getClub(clubId)); } - @PatchMapping("/{clubId}") + @PatchMapping("/me") public ApiResponse updateClub( - @PathVariable Long clubId, + @AuthOrganization Organization authOrganization, @Valid @RequestBody ClubUpdateRequest request) { - clubService.updateClub(clubId, request); + clubService.updateClub(authOrganization.getId(), request); return ApiResponse.onSuccess(null); } } diff --git a/api/src/main/java/com/sponus/sponusbe/domain/organization/company/controller/CompanyController.java b/api/src/main/java/com/sponus/sponusbe/domain/organization/company/controller/CompanyController.java index d1aa73d5..2ff898c1 100644 --- a/api/src/main/java/com/sponus/sponusbe/domain/organization/company/controller/CompanyController.java +++ b/api/src/main/java/com/sponus/sponusbe/domain/organization/company/controller/CompanyController.java @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RestController; import com.sponus.coredomain.domain.common.ApiResponse; +import com.sponus.coredomain.domain.organization.Organization; +import com.sponus.coreinfrasecurity.annotation.AuthOrganization; import com.sponus.sponusbe.domain.organization.company.dto.CompanyGetResponse; import com.sponus.sponusbe.domain.organization.company.dto.CompanyUpdateRequest; import com.sponus.sponusbe.domain.organization.company.service.CompanyService; @@ -28,11 +30,12 @@ public ApiResponse getCompany(@PathVariable Long companyId) return ApiResponse.onSuccess(companyService.getCompany(companyId)); } - @PatchMapping("/{companyId}") + @PatchMapping("/me") public ApiResponse updateCompany( - @PathVariable Long companyId, - @Valid @RequestBody CompanyUpdateRequest request) { - companyService.updateCompany(companyId, request); + @AuthOrganization Organization authOrganization, + @Valid @RequestBody CompanyUpdateRequest request + ) { + companyService.updateCompany(authOrganization.getId(), request); return ApiResponse.onSuccess(null); } } diff --git a/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java b/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java index 3ae9b57e..b2fc088d 100644 --- a/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java +++ b/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java @@ -52,11 +52,11 @@ public ApiResponse> getOrganizations( organizationService.getOrganizations(authOrganization, pageCondition, organizationType)); } - @PostMapping(value = "/{organizationId}/profileImage", consumes = "multipart/form-data") + @PostMapping(value = "/me/profileImage", consumes = "multipart/form-data") public ApiResponse uploadProfileImage( - @PathVariable Long organizationId, + @AuthOrganization Organization organization, @RequestPart(name = "profileImage") MultipartFile file) { - return ApiResponse.onSuccess(organizationService.uploadProfileImage(organizationId, file)); + return ApiResponse.onSuccess(organizationService.uploadProfileImage(organization.getId(), file)); } @GetMapping("/exists") From 506c05fd3ce33900603de4541dcc70de0d84b96d Mon Sep 17 00:00:00 2001 From: kimday0326 Date: Thu, 4 Jul 2024 15:08:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=B3=B8=EC=9D=B8=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20api=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationController.java | 14 ++++++++++++++ .../organization/service/OrganizationService.java | 10 +++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java b/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java index b2fc088d..475c6f0d 100644 --- a/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java +++ b/api/src/main/java/com/sponus/sponusbe/domain/organization/controller/OrganizationController.java @@ -20,7 +20,9 @@ import com.sponus.coredomain.domain.organization.Organization; import com.sponus.coredomain.domain.organization.enums.OrganizationType; import com.sponus.coreinfrasecurity.annotation.AuthOrganization; +import com.sponus.sponusbe.domain.organization.club.service.ClubService; import com.sponus.sponusbe.domain.organization.company.dto.OrganizationGetResponse; +import com.sponus.sponusbe.domain.organization.company.service.CompanyService; import com.sponus.sponusbe.domain.organization.dto.request.OrganizationCreateRequest; import com.sponus.sponusbe.domain.organization.dto.request.OrganizationSearchRequest; import com.sponus.sponusbe.domain.organization.dto.request.PageCondition; @@ -37,6 +39,8 @@ @RequiredArgsConstructor public class OrganizationController { private final OrganizationService organizationService; + private final ClubService clubService; + private final CompanyService companyService; @PostMapping("/join") public ApiResponse join(@RequestBody OrganizationCreateRequest request) { @@ -52,6 +56,16 @@ public ApiResponse> getOrganizations( organizationService.getOrganizations(authOrganization, pageCondition, organizationType)); } + @GetMapping("/me") + public ApiResponse getMyProfile( + @AuthOrganization Organization authOrganization) { + if (authOrganization.isClub()) { + return ApiResponse.onSuccess(clubService.getClub(authOrganization.getId())); + } else { + return ApiResponse.onSuccess(companyService.getCompany(authOrganization.getId())); + } + } + @PostMapping(value = "/me/profileImage", consumes = "multipart/form-data") public ApiResponse uploadProfileImage( @AuthOrganization Organization organization, diff --git a/api/src/main/java/com/sponus/sponusbe/domain/organization/service/OrganizationService.java b/api/src/main/java/com/sponus/sponusbe/domain/organization/service/OrganizationService.java index b76634fb..9f9afb10 100644 --- a/api/src/main/java/com/sponus/sponusbe/domain/organization/service/OrganizationService.java +++ b/api/src/main/java/com/sponus/sponusbe/domain/organization/service/OrganizationService.java @@ -72,11 +72,6 @@ public void deleteOrganization(Long organizationId) { organization.delete(); } - private Organization findOrganizationById(Long organizationId) { - return organizationRepository.findById(organizationId) - .orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND)); - } - public PageResponse getOrganizations( Organization authOrganization, PageCondition pageCondition, @@ -163,4 +158,9 @@ public void deleteAllSearchKeyword(Long organizationId) { searchHistory.getKeywords().clear(); searchHistoryRepository.save(searchHistory); } + + private Organization findOrganizationById(Long organizationId) { + return organizationRepository.findById(organizationId) + .orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND)); + } }