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

Merge dev to 1.0.0 #38

Merged
merged 5 commits into from
May 2, 2024
Merged

Merge dev to 1.0.0 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfa85cf
Fix link request validation
PSNAppz May 2, 2024
dfdc8de
Merge pull request #36 from PSNAppz/develop
venky-ganapathy May 2, 2024
ec6465d
Update pip install commands
PSNAppz May 2, 2024
f724bd7
fix Mapper API update
PSNAppz May 2, 2024
00a3f5c
Merge pull request #37 from PSNAppz/develop
venky-ganapathy May 2, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/openapi-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
python-version: "3.10"
- name: Install app
run: |
python -m pip install git+https://github.com/openg2p/openg2p-fastapi-common@develop\#subdirectory=openg2p-fastapi-common
python -m pip install git+https://github.com/openg2p/openg2p-g2pconnect-common-lib@develop\#subdirectory=openg2p-g2pconnect-common-lib
python -m pip install git+https://github.com/openg2p/openg2p-g2pconnect-common-lib@develop\#subdirectory=openg2p-g2pconnect-mapper-lib
python -m pip install openg2p-fastapi-common==1.0.0
python -m pip install openg2p-g2pconnect-common-lib==1.0.0
python -m pip install openg2p-g2pconnect-mapper-lib==1.0.0
python -m pip install .
- name: Generate openapi json
run: |
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ ADD --chown=${container_user}:${container_user_group} main.py /app
RUN python3 -m venv venv \
&& . ./venv/bin/activate
RUN python3 -m pip install \
git+https://github.com/openg2p/openg2p-fastapi-common@develop\#subdirectory=openg2p-fastapi-common \
git+https://github.com/OpenG2P/openg2p-g2pconnect-common-lib@develop\#subdirectory=openg2p-g2pconnect-common-lib \
git+https://github.com/OpenG2P/openg2p-g2pconnect-common-lib@develop\#subdirectory=openg2p-g2pconnect-mapper-lib \
openg2p-fastapi-common==1.0.0 \
openg2p-g2pconnect-common-lib==1.0.0 \
openg2p-g2pconnect-mapper-lib==1.0.0 \
./src

CMD python3 main.py migrate; \
Expand Down
5 changes: 1 addition & 4 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 @@ -44,10 +44,7 @@ async def validate_link_request(
# Check if the ID is already mapped
result = await connection.execute(
select(IdFaMapping).where(
and_(
IdFaMapping.id_value == single_link_request.id,
IdFaMapping.fa_value == single_link_request.fa,
)
IdFaMapping.id_value == single_link_request.id,
)
)
link_request_from_db = result.first()
Expand Down
5 changes: 1 addition & 4 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 @@ -168,10 +168,7 @@ async def update_mapping(self, session, single_update_request):
if single_update_request.phone_number:
result.phone = single_update_request.phone_number
if single_update_request.additional_info:
addl_info_copy = (
result.additional_info.copy() if result.additional_info else []
)
result.additional_info = addl_info_copy
result.additional_info = single_update_request.additional_info
else:
single_response.status = StatusEnum.rjct
single_response.status_reason_code = UpdateStatusReasonCode.rjct_id_invalid
Expand Down
6 changes: 3 additions & 3 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pytest-asyncio
pytest-cov
git+https://github.com/openg2p/openg2p-fastapi-common@develop#subdirectory=openg2p-fastapi-common
git+https://github.com/openg2p/openg2p-g2pconnect-common@develop#subdirectory=openg2p-g2pconnect-common-lib
git+https://github.com/OpenG2P/openg2p-g2pconnect-common@develop#subdirectory=openg2p-g2pconnect-mapper-lib
openg2p-fastapi-common==1.0.0
openg2p-g2pconnect-common-lib==1.0.0
openg2p-g2pconnect-mapper-lib==1.0.0
Loading