From 20aad82fcb340593b4a0029120e4b25c5fda4fd6 Mon Sep 17 00:00:00 2001 From: Rayan Date: Thu, 13 Jun 2024 16:46:20 +0200 Subject: [PATCH] fix: circular import --- uniride_sme/service/documents_service.py | 6 +++--- uniride_sme/service/user_service.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/uniride_sme/service/documents_service.py b/uniride_sme/service/documents_service.py index 3f2376e..b83cddd 100644 --- a/uniride_sme/service/documents_service.py +++ b/uniride_sme/service/documents_service.py @@ -4,7 +4,7 @@ from uniride_sme import app, connect_pg from uniride_sme.model.bo.documents_bo import DocumentsBO -from uniride_sme.service import admin_service +from uniride_sme.service import admin_service, user_service from uniride_sme.utils.exception.documents_exceptions import ( DocumentsNotFoundException, DocumentsTypeException) from uniride_sme.utils.exception.exceptions import MissingInputException @@ -323,9 +323,9 @@ def document_check(data): return {"message": "DOCUMENT_STATUS_UPDATED"} -def update_role(user_bo, column=None) -> None: +def update_role(user_id, column=None) -> None: """Update r_id to 1 if both v_license_verified and v_id_card_verified are 1""" - + user_bo = user_service.get_label(user_id) conn = connect_pg.connect() query = """ SELECT v_license_verified, v_id_card_verified, v_school_certificate_verified, v_insurance_verified, d_license, d_id_card, d_school_certificate, d_insurance diff --git a/uniride_sme/service/user_service.py b/uniride_sme/service/user_service.py index 21b7b36..1818cd9 100644 --- a/uniride_sme/service/user_service.py +++ b/uniride_sme/service/user_service.py @@ -1,12 +1,12 @@ """User service module""" + import re import bcrypt from uniride_sme import app, connect_pg from uniride_sme.model.bo.user_bo import UserBO -from uniride_sme.service import admin_service -from uniride_sme.service.documents_service import update_role +from uniride_sme.service import admin_service, documents_service from uniride_sme.service.trip_service import get_trip_by_id from uniride_sme.utils.exception.exceptions import InvalidInputException, MissingInputException from uniride_sme.utils.exception.user_exceptions import ( @@ -265,8 +265,7 @@ def verify_student_email(student_email) -> None: connect_pg.execute_command(conn, query, (student_email,)) connect_pg.disconnect(conn) - user_bo = get_user_by_id(email_verified[0][1]) - update_role(user_bo) + documents_service.update_role(email_verified[0][1]) def _validate_firstname(firstname) -> None: