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.

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: circular import #118

Merged
merged 1 commit into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 uniride_sme/service/documents_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions uniride_sme/service/user_service.py
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down Expand Up @@ -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:
Expand Down
Loading