darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-09 22:51:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more tests

Browse Source
This commit is contained in:
alexjanousekGSA
2025-05-30 16:23:47 -04:00
parent 7c1f3f2c3a
commit aa445f5f40
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/schemas.py
View File

@@ -791,3 +791,4 @@ template_history_schema = TemplateHistorySchema()
event_schema = EventSchema()
provider_details_schema = ProviderDetailsSchema()
provider_details_history_schema = ProviderDetailsHistorySchema()
job_schema = JobSchema()

35
app/service_invite/rest.py
View File

@@ -110,19 +110,37 @@ def create_invited_user(service_id):
invite_data = _create_service_invite(invited_user, nonce, state)
return jsonify(data=InvitedUserSchema(session=db.session).dump(invited_user), invite=invite_data), 201
return (
jsonify(
data=InvitedUserSchema(session=db.session).dump(invited_user),
invite=invite_data,
),
201,
)
@service_invite.route("/service/<service_id>/invite/expired", methods=["GET"])
def get_expired_invited_users_by_service(service_id):
expired_invited_users = get_expired_invited_users_for_service(service_id)
return jsonify(data=InvitedUserSchema(session=db.session).dump(expired_invited_users, many=True)), 200
return (
jsonify(
data=InvitedUserSchema(session=db.session).dump(
expired_invited_users, many=True
)
),
200,
)
@service_invite.route("/service/<service_id>/invite", methods=["GET"])
def get_invited_users_by_service(service_id):
invited_users = get_invited_users_for_service(service_id)
return jsonify(data=InvitedUserSchema(session=db.session).dump(invited_users, many=True)), 200
return (
jsonify(
data=InvitedUserSchema(session=db.session).dump(invited_users, many=True)
),
200,
)
@service_invite.route("/service/<service_id>/invite/<invited_user_id>", methods=["GET"])
@@ -178,14 +196,21 @@ def resend_service_invite(service_id, invited_user_id):
fetched.created_at = utc_now()
fetched.status = InvitedUserStatus.PENDING
current_data = {k: v for k, v in InvitedUserSchema(session=db.session).dump(fetched).items()}
current_data = {
k: v for k, v in InvitedUserSchema(session=db.session).dump(fetched).items()
}
update_dict = InvitedUserSchema(session=db.session).load(current_data)
save_invited_user(update_dict)
invite_data = _create_service_invite(fetched, nonce, state)
return jsonify(data=InvitedUserSchema(session=db.session).dump(fetched), invite=invite_data), 200
return (
jsonify(
data=InvitedUserSchema(session=db.session).dump(fetched), invite=invite_data
),
200,
)
def invited_user_url(invited_user_id, invite_link_host=None):

10
tests/app/service/test_rest.py
View File

@@ -1356,7 +1356,7 @@ def test_add_existing_user_to_another_service_with_send_permissions(
user_to_add = User(
name="Invited User",
email_address="invited@digital.fake.gov",
password="password", # pragma: allowlist secret
password="password", # pragma: allowlist secret
mobile_number="+14254147755",
)
save_model_user(user_to_add, validated_email_access=True)
@@ -1406,7 +1406,7 @@ def test_add_existing_user_to_another_service_with_manage_permissions(
user_to_add = User(
name="Invited User",
email_address="invited@digital.fake.gov",
password="password", # pragma: allowlist secret
password="password", # pragma: allowlist secret
mobile_number="+14254147755",
)
save_model_user(user_to_add, validated_email_access=True)
@@ -1457,7 +1457,7 @@ def test_add_existing_user_to_another_service_with_folder_permissions(
user_to_add = User(
name="Invited User",
email_address="invited@digital.fake.gov",
password="password", # pragma: allowlist secret
password="password", # pragma: allowlist secret
mobile_number="+14254147755",
)
save_model_user(user_to_add, validated_email_access=True)
@@ -1498,7 +1498,7 @@ def test_add_existing_user_to_another_service_with_manage_api_keys(
user_to_add = User(
name="Invited User",
email_address="invited@digital.fake.gov",
password="password", # pragma: allowlist secret: keyword
password="password", # pragma: allowlist secret: keyword
mobile_number="+14254147755",
)
save_model_user(user_to_add, validated_email_access=True)
@@ -1538,7 +1538,7 @@ def test_add_existing_user_to_non_existing_service_returns404(
user_to_add = User(
name="Invited User",
email_address="invited@digital.fake.gov",
password="password", # pragma: allowlist secret: keyword
password="password", # pragma: allowlist secret: keyword
mobile_number="+14254147755",
)
save_model_user(user_to_add, validated_email_access=True)