diff --git a/dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOTenantController.java b/dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOTenantController.java index f9bc795ae..183b65944 100644 --- a/dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOTenantController.java +++ b/dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOTenantController.java @@ -25,7 +25,6 @@ import fr.gouv.bo.service.TenantLogService; import fr.gouv.bo.service.MessageService; import fr.gouv.bo.service.TenantService; -import fr.gouv.bo.service.TenantUserApiService; import fr.gouv.bo.service.UserApiService; import fr.gouv.bo.service.UserService; import lombok.RequiredArgsConstructor; @@ -71,7 +70,6 @@ public class BOTenantController { private final MessageService messageService; private final DocumentService documentService; private final UserApiService userApiService; - private final TenantUserApiService tenantUserApiService; private final PartnerCallBackService partnerCallBackService; private final UserService userService; private final TenantLogService logService; @@ -111,12 +109,11 @@ public String deleteApartmentSharing(@PathVariable("id") Long id, Principal prin return REDIRECT_BO; } - @GetMapping("/partner/{id}") - public String addNewPartnerInfo(@PathVariable("id") Long id, PartnerDTO partnerDTO) { + @PostMapping("/partner/{id}") + public String sendCallbackToPartner(@PathVariable("id") Long id, PartnerDTO partnerDTO) { Tenant tenant = tenantService.find(id); UserApi userApi = userApiService.findById(partnerDTO.getPartner()); - tenantUserApiService.addInternalPartnerIdToTenantUserApi(tenant, partnerDTO.getPartner(), partnerDTO.getInternalPartnerId()); PartnerCallBackType partnerCallBackType = tenant.getStatus() == TenantFileStatus.VALIDATED ? PartnerCallBackType.VERIFIED_ACCOUNT : PartnerCallBackType.CREATED_ACCOUNT; diff --git a/dossierfacile-bo/src/main/java/fr/gouv/bo/service/TenantUserApiService.java b/dossierfacile-bo/src/main/java/fr/gouv/bo/service/TenantUserApiService.java deleted file mode 100644 index 7c47bc932..000000000 --- a/dossierfacile-bo/src/main/java/fr/gouv/bo/service/TenantUserApiService.java +++ /dev/null @@ -1,48 +0,0 @@ -package fr.gouv.bo.service; - -import fr.dossierfacile.common.config.ApiVersion; -import fr.dossierfacile.common.entity.Tenant; -import fr.dossierfacile.common.entity.TenantUserApi; -import fr.dossierfacile.common.entity.TenantUserApiKey; -import fr.dossierfacile.common.entity.UserApi; -import fr.dossierfacile.common.repository.TenantUserApiRepository; -import fr.gouv.bo.repository.UserApiRepository; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.Collections; - -@RequiredArgsConstructor -@Service -@Slf4j -public class TenantUserApiService { - - private final TenantUserApiRepository tenantUserApiRepository; - private final UserApiRepository userApiRepository; - - public void addInternalPartnerIdToTenantUserApi(Tenant tenant, Long id, String internalPartnerId) { - UserApi userApi = userApiRepository.getReferenceById(id); - if (ApiVersion.V3.is(userApi.getVersion())) { - TenantUserApi tenantUserApi = tenantUserApiRepository.findFirstByTenantAndUserApi(tenant, userApi).orElse( - TenantUserApi.builder() - .id(new TenantUserApiKey(tenant.getId(), userApi.getId())) - .tenant(tenant) - .userApi(userApi) - .build() - ); - if (internalPartnerId != null && !internalPartnerId.isEmpty()) { - if (tenantUserApi.getAllInternalPartnerId() == null) { - tenantUserApi.setAllInternalPartnerId(Collections.singletonList(internalPartnerId)); - } else if (!tenantUserApi.getAllInternalPartnerId().contains(internalPartnerId)) { - tenantUserApi.getAllInternalPartnerId().add(internalPartnerId); - } - tenantUserApiRepository.save(tenantUserApi); - } - } - } - - public void save(TenantUserApi tenantUserApi) { - tenantUserApiRepository.save(tenantUserApi); - } -} diff --git a/dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html b/dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html index 67069465a..d1851417a 100644 --- a/dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html +++ b/dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html @@ -80,19 +80,18 @@