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

Fix unlink API validation #27

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Fix unlink API validation #27

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
17 changes: 6 additions & 11 deletions src/openg2p_spar_mapper_api/services/id_fa_mapping_validations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,22 @@ async def validate_unlink_request(
validation_error_type=UnlinkStatusReasonCode.rjct_id_invalid,
)

if not single_unlink_request.fa:
raise UnlinkValidationException(
message="FA is null",
status=StatusEnum.rjct,
validation_error_type=UnlinkStatusReasonCode.rjct_fa_invalid,
)
result = await connection.execute(
select(IdFaMapping).where(
and_(
IdFaMapping.id_value == single_unlink_request.id,
IdFaMapping.fa_value == single_unlink_request.fa,
)
IdFaMapping.id_value == single_unlink_request.id,
)
)

if single_unlink_request.fa:
result = result.where(IdFaMapping.fa_value == single_unlink_request.fa)

unlink_request_from_db = result.first()

if not unlink_request_from_db:
raise UnlinkValidationException(
message="ID doesnt exist please link first",
status=StatusEnum.rjct,
validation_error_type=UnlinkStatusReasonCode.rjct_reference_id_duplicate,
validation_error_type=UnlinkStatusReasonCode.rjct_id_invalid,
)

return None
10 changes: 0 additions & 10 deletions src/openg2p_spar_mapper_api/services/mapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,6 @@ async def unlink(self, unlink_request: UnlinkRequest):
await session.commit()
return single_unlink_responses

def unlink_id_fa_mapping(self, single_unlink_request):
return IdFaMapping(
id_value=single_unlink_request.id,
fa_value=single_unlink_request.fa,
name=single_unlink_request.name,
phone=single_unlink_request.phone_number,
additional_info=single_unlink_request.additional_info,
active=True,
)

def construct_single_unlink_response_for_success(self, single_unlink_request):
return SingleUnlinkResponse(
reference_id=single_unlink_request.reference_id,
Expand Down
Loading