Skip to content
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

chore(bo): send manual callback without internalId #917

Merged
merged 1 commit into from
Nov 27, 2024
Merged

chore(bo): send manual callback without internalId #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOTenantController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
48 changes: 0 additions & 48 deletions dossierfacile-bo/src/main/java/fr/gouv/bo/service/TenantUserApiService.java
View file
Open in desktop

This file was deleted.

33 changes: 4 additions & 29 deletions dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,37 +80,28 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header" style="background: #f18686;padding: 10px;">
<h5 class="modal-title bold"
style="width: 80%;float: left;font-size: 20px;">Select</h5>
<h5 class="modal-title bold">Select</h5>
<button aria-label="Close" class="btn-close" data-bs-dismiss="modal"
type="button"></button>
</div>
<div class="modal-body bg-body-tertiary" >
<form method="get"
<form method="post"
style="margin-top: 8px;"
th:action="@{/bo/tenant/partner/}+${tenantPrincipal.getId()}"
th:object="${partnerUpdate}">
<label for="action2" style="margin-left: 5px">partner:</label>
<select id="action2" name="action"
style=" border-radius: 3px; padding-left: 5px !important;padding-right: 5px; width: 26%"
style=" border-radius: 3px; padding-left: 5px !important;padding-right: 5px;"
th:field="*{partner}">
<option selected="selected" value="">-----------------</option>
<option th:each="partner:${partnersList}"
th:text="${partner.getName()}"
th:value="${partner.getId()}"></option>
</select>

<label class="active"
style="margin-left: 5px;">internalPartnerId:</label>
<input class="inputPartner"
style="width: 23%;border: 1px solid #c6d6f3 !important;height: auto;border-radius: 3px;padding-left: 5px !important;padding-right: 5px;"
th:field="*{internalPartnerId}"
th:placeholder="'-- type here --'"
type="text">

<div class="modal-footer bg-body-tertiary"
style="padding: 5px;margin-top: 20px;">
<button class="btn btn-primary buttonPartner"
<button class="btn btn-primary"
id="hrefPartner" name="submit"
style="border-radius: 50px;font-size: 15px;line-height: 1;padding: 5px 8px 7px;"
type="submit"
Expand All @@ -125,22 +116,6 @@
</div>
</form>
</div>
<script>
let input = document.querySelector(".inputPartner");
let button = document.querySelector(".buttonPartner");

button.disabled = true;

input.addEventListener("change", stateHandle);

function stateHandle() {
if (document.querySelector(".inputPartner").value === "-- type here --") {
button.disabled = true;
} else {
button.disabled = false;
}
}
</script>

</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions ...mon-library/src/main/java/fr/dossierfacile/common/repository/TenantUserApiRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
public interface TenantUserApiRepository extends JpaRepository<TenantUserApi, TenantUserApiKey> {
Optional<TenantUserApi> findFirstByTenantAndUserApi(Tenant tenant, UserApi userApi);

Optional<TenantUserApi> findFirstByTenantAndUserApiId(Tenant tenant, Long userApi);

@Query("""
select tua from TenantUserApi tua, Tenant t
where t.apartmentSharing.id = :apartmentSharingId
Expand Down