Skip to content

[project] 프로젝트 수정 승인 시 datagsm 프로젝트 이름 중복 오류 해결 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZaMan0806 merged 2 commits into from
Jun 9, 2026
Merged

[project] 프로젝트 수정 승인 시 datagsm 프로젝트 이름 중복 오류 해결 #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8b9f7b
fix(project): 수정 승인 시 datagsm 프로젝트 이름 중복(409) 해결
ZaMan0806 Jun 8, 2026
8d28b4e
fix(admin): datagsm 응답 객체 null 방어 추가
ZaMan0806 Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions ...va/team/themoment/everygsm/server/v2/domain/admin/service/AdminApproveProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@
import org.springframework.transaction.annotation.Transactional;

import lombok.RequiredArgsConstructor;
import team.themoment.datagsm.sdk.openapi.DataGsmOpenApiClient;
import team.themoment.datagsm.sdk.openapi.client.ProjectApi;
import team.themoment.datagsm.sdk.openapi.model.Project;
import team.themoment.datagsm.sdk.openapi.model.ProjectResponse;
import team.themoment.everygsm.server.v2.domain.project.dto.response.ProjectResDto;
import team.themoment.everygsm.server.v2.domain.project.entity.ProjectJpaEntity;
import team.themoment.everygsm.server.v2.domain.project.mapper.ProjectMapper;
import team.themoment.everygsm.server.v2.domain.project.repository.ProjectRepository;
import team.themoment.everygsm.server.v2.global.exception.error.ExpectedException;
import team.themoment.everygsm.server.v2.global.thirdparty.feign.datagsm.DatagsmApiClient;
import team.themoment.everygsm.server.v2.global.thirdparty.feign.datagsm.dto.ClubListResDto;
import team.themoment.everygsm.server.v2.global.thirdparty.feign.datagsm.dto.DatagsmProjectResDto;
import team.themoment.everygsm.server.v2.global.thirdparty.feign.datagsm.dto.ProjectReqDto;
import team.themoment.everygsm.server.v2.global.thirdparty.feign.datagsm.dto.QueryClubReqDto;
import team.themoment.everygsm.server.v2.global.thirdparty.feign.datagsm.dto.QueryStudentReqDto;
Expand All @@ -27,6 +32,7 @@ public class AdminApproveProjectService {
private final ProjectRepository projectRepository;
private final ProjectMapper projectMapper;
private final DatagsmApiClient datagsmApiClient;
private final DataGsmOpenApiClient dataGsmOpenApiClient;

@Transactional
public ProjectResDto execute(Long projectId) {
Expand Down Expand Up @@ -54,6 +60,13 @@ public ProjectResDto execute(Long projectId) {
}

private void registerToDatagsm(ProjectJpaEntity project) {
// datagsm에는 프로젝트 update API가 없으므로, 이미 같은 이름이 등록돼 있으면 그 id를 매핑하고 생성을 생략한다.
Long existingId = findExistingExternalId(project.getTitle());
if (existingId != null) {
project.assignExternalProjectId(existingId);
return;
}

Long clubId = resolveClubId(project.getAffiliation());
List<Long> participantIds = project.getUser() != null
? resolveParticipantIds(project.getUser().getEmail())
Expand All @@ -62,8 +75,22 @@ private void registerToDatagsm(ProjectJpaEntity project) {
ProjectReqDto reqDto = ProjectReqDto.builder().name(project.getTitle()).description(project.getDescription())
.startYear(project.getStartYear()).clubId(clubId).participantIds(participantIds).build();

Long externalProjectId = datagsmApiClient.createProject(reqDto).getId();
project.assignExternalProjectId(externalProjectId);
DatagsmProjectResDto response = datagsmApiClient.createProject(reqDto);
if (response == null || response.getId() == null) {
throw new ExpectedException("datagsm 프로젝트 등록 응답에 id가 없습니다. title=" + project.getTitle(),
HttpStatus.INTERNAL_SERVER_ERROR);
}
project.assignExternalProjectId(response.getId());
}

private Long findExistingExternalId(String title) {
ProjectResponse response = dataGsmOpenApiClient.projects()
.getProjects(new ProjectApi.ProjectRequest().projectName(title).size(100));
if (response == null || response.getProjects() == null) {
return null;
}
return response.getProjects().stream().filter(p -> title.equals(p.getName())).map(Project::getId).findFirst()
.orElse(null);
}

private Long resolveClubId(String affiliation) {
Expand Down
Loading