Feature/fixvips

mock_services/all_mock_svc/routes.py

@@ -95,14 +95,14 @@ def contravention():
                     }
                 }), 404)
 
-@application.route('/digitalforms-viirp/v1/documents/CreateDocument', methods=['POST'])
+@application.route('/digitalforms-viirp/v1/documents/<correlation_id>', methods=['POST'])
 @basic_auth_required
 def vipsdoc():
     if request.method == 'POST':
         logging.debug('request: {}'.format(request.json))
         try:
             doc = {
-                "documentId": "123"
+                "document_id": "123"
             }
             return make_response(jsonify(doc), 200)
         except Exception as e:
@@ -116,7 +116,7 @@ def vipsdoc():
                     }
                 }), 404)
 
-@application.route('/digitalforms-viirp/v1/impoundments/CreateImpoundment', methods=['POST'])
+@application.route('/digitalforms-viirp/v1/impoundments/<correlation_id>', methods=['POST'])
 @basic_auth_required
 def vipsimp():
     if request.method == 'POST':

python/form_handler/actions.py

@@ -12,7 +12,7 @@
 from datetime import datetime
 from minio import Minio
 from minio.error import S3Error
-from python.form_handler.models import Event,FormStorageRefs,VIForm,TwentyFourHourForm,TwelveHourForm,IRPForm,User
+from python.form_handler.models import Event,FormStorageRefs,VIForm,TwentyFourHourForm,TwelveHourForm,IRPForm,User,AgencyCrossref
 from python.form_handler.icbc_service import submit_to_icbc
 from python.form_handler.vips_service import create_vips_doc,create_vips_imp
 from python.form_handler.payloads import vips_payload,vips_document_payload
@@ -423,7 +423,8 @@ def send_to_icbc(**args)->tuple:
 #   "type_code": "MV2721",
 #   "mime_sub_type": "pdf",
 #   "mime_type": "application",
-#   "file_object": "JVBERi0xLjIgCjkgMCBvYmoKPDwKPj4Kc3RyZWFtCkJULyA5IFRmKFRlc3QpJyBFVAplbmRzdHJlYW0KZW5kb2JqCjQgMCBvYmoKPDwKL1R5cGUgL1BhZ2UKL1BhcmVudCA1IDAgUgovQ29udGVudHMgOSAwIFIKPj4KZW5kb2JqCjUgMCBvYmoKPDwKL0tpZHMgWzQgMCBSIF0KL0NvdW50IDEKL1R5cGUgL1BhZ2VzCi9NZWRpYUJveCBbIDAgMCA5OSA5IF0KPj4KZW5kb2JqCjMgMCBvYmoKPDwKL1BhZ2VzIDUgMCBSCi9UeXBlIC9DYXRhbG9nCj4+CmVuZG9iagp0cmFpbGVyCjw8Ci9Sb290IDMgMCBSCj4+CiUlRU9G",
+#   "file_object": "
+
 #   "notice_type_code": "IMP",
 #   "notice_subject_code": "VEHI",
 #   "pageCount": 1
@@ -504,6 +505,27 @@ def prep_vips_payload(**args)->tuple:
         tmp_payload=vips_payload.copy()
         logging.debug(tmp_payload)
 
+        # get data from db
+        application = args.get('app')
+        db = args.get('db')
+        with application.app_context():
+            # get detachment data
+            policeDetatchmentId=''
+            agency_name=''
+            if "agency" in user_data: 
+                agency_name=user_data["agency"].upper()
+                agency_data = db.session.query(AgencyCrossref) \
+                    .filter(AgencyCrossref.agency_name == agency_name) \
+                    .all()
+                if len(agency_data) == 0:
+                    pass
+                else:
+                    for a in agency_data:
+                        agency_dict = a.__dict__
+                        agency_dict.pop('_sa_instance_state', None)
+                        policeDetatchmentId=agency_dict["vips_policedetachments_agency_id"]
+                        break
+
         # vipsImpoundCreate payload
         if "driver_jurisdiction" in event_data: tmp_payload["vipsImpoundCreate"]["dlJurisdictionCd"]=event_data["driver_jurisdiction"]
         if "driver_licence_no" in event_data: tmp_payload["vipsImpoundCreate"]["driverLicenceNo"]=event_data["driver_licence_no"]
@@ -519,7 +541,8 @@ def prep_vips_payload(**args)->tuple:
         tmp_payload["vipsImpoundCreate"]["noticeSubjectCd"]="VEHI"
 
         if "notice_type_cd" in form_data: tmp_payload["vipsImpoundCreate"]["noticeTypeCd"]="IMP"
-        if "agency" in user_data: tmp_payload["vipsImpoundCreate"]["policeDetatchmentId"]=user_data["agency"].upper()
+        tmp_payload["vipsImpoundCreate"]["policeDetatchmentId"]=policeDetatchmentId
+        # if "agency" in user_data: tmp_payload["vipsImpoundCreate"]["policeDetatchmentId"]=user_data["agency"].upper()
 
 
         officer_name=f'{user_data["first_name"]} {user_data["last_name"]}'
@@ -581,7 +604,8 @@ def prep_vips_payload(**args)->tuple:
 
         # vipsVehicleCreate payload
         # TODO: to confirm
-        if "nsc_no" in event_data: tmp_payload["vipsVehicleCreate"]["commercialMotorCarrierId"]=event_data["nsc_no"]
+        # if "nsc_no" in event_data: tmp_payload["vipsVehicleCreate"]["commercialMotorCarrierId"]=event_data["nsc_no"]
+        tmp_payload["vipsVehicleCreate"]["commercialMotorCarrierId"]=None
 
         if "vehicle_plate_no" in event_data: tmp_payload["vipsVehicleCreate"]["licencePlateNo"]=event_data["vehicle_plate_no"].upper()
         tmp_payload["vipsVehicleCreate"]["lpDecalValidYy"]=None
@@ -592,7 +616,8 @@ def prep_vips_payload(**args)->tuple:
 
         if "vehicle_year" in event_data: tmp_payload["vipsVehicleCreate"]["manufacturedYy"]=event_data["vehicle_year"]
 
-        if "nsc_prov_state" in event_data: tmp_payload["vipsVehicleCreate"]["nscJurisdictionTxt"]=event_data["nsc_prov_state"].upper()
+        # if "nsc_prov_state" in event_data: tmp_payload["vipsVehicleCreate"]["nscJurisdictionTxt"]=event_data["nsc_prov_state"].upper()
+        tmp_payload["vipsVehicleCreate"]["nscJurisdictionTxt"]=None
         if "vehicle_colour" in event_data: tmp_payload["vipsVehicleCreate"]["vehicleColourTxt"]=event_data["vehicle_colour"].upper()
 
         if "vehicle_vin_no" in event_data: tmp_payload["vipsVehicleCreate"]["vehicleIdentificationNo"]=event_data["vehicle_vin_no"].upper()  
@@ -614,7 +639,7 @@ def prep_vips_payload(**args)->tuple:
 
         # vipsImpoundmentArray payload
         vipsImpoundmentArray=[]
-        if "VI_number" in form_data: vipsImpoundmentArray.append(form_data["VI_number"])
+        # if "VI_number" in form_data: vipsImpoundmentArray.append(form_data["VI_number"])
         tmp_payload["vipsImpoundmentArray"]=vipsImpoundmentArray
 
         args['vips_payload']=tmp_payload

python/form_handler/models.py

@@ -380,7 +380,7 @@ class Event(db.Model):
     vehicle_year = db.Column(db.String)
     vehicle_mk_md = db.Column(db.String)
     vehicle_style = db.Column(db.String)
-    vehicle_type = db.Column(db.Integer)
+    vehicle_type = db.Column(db.Integer, db.ForeignKey('vehicle_type.type_cd'))
     vehicle_colour = db.Column(db.String)
     vehicle_vin_no = db.Column(db.String)
     nsc_prov_state = db.Column(db.String)
@@ -563,6 +563,7 @@ class VIForm(db.Model):
     out_of_province_dl: str
     out_of_province_dl_number: str
     out_of_province_dl_expiry: str
+    out_of_province_dl_jurisdiction: str
     date_of_impound: datetime
     irp_impound: str
     irp_impound_duration: str
@@ -601,6 +602,7 @@ class VIForm(db.Model):
     out_of_province_dl = db.Column(db.String)
     out_of_province_dl_number = db.Column(db.String)
     out_of_province_dl_expiry = db.Column(db.String)
+    out_of_province_dl_jurisdiction = db.Column(db.String)
     date_of_impound = db.Column(db.DateTime)
     irp_impound = db.Column(db.String)
     irp_impound_duration = db.Column(db.String)
@@ -659,3 +661,28 @@ class FormStorageRefs(db.Model):
     encryptiv = db.Column(db.String)
     created_dt = db.Column(db.DateTime)
     updated_dt = db.Column(db.DateTime)
+
+
+
+@dataclass
+class AgencyCrossref(db.Model):
+    __tablename__ = 'agency_cross_refs'
+
+    agency_name: str
+    agency_id: str
+    agency_city: str
+    prime_vjur: str
+    icbc_detachment_name: str
+    icbc_city_name: str
+    vips_policedetachments_agency_id: str
+    vips_policedetachments_agency_nm: str
+
+    agency_name = db.Column(db.String, primary_key=True)
+    agency_id = db.Column(db.String)
+    agency_city = db.Column(db.String)
+    prime_vjur = db.Column(db.String)
+    icbc_detachment_name = db.Column(db.String)
+    icbc_city_name = db.Column(db.String)
+    vips_policedetachments_agency_id = db.Column(db.String)
+    vips_policedetachments_agency_nm = db.Column(db.String)
+

python/prohibition_web_svc/migrations/versions/f76bbde02978_.py

@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: f76bbde02978
+Revises: 0134c884845f
+Create Date: 2023-11-22 20:03:25.778970
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f76bbde02978'
+down_revision = '0134c884845f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('agency_cross_refs',
+    sa.Column('agency_name', sa.String(), nullable=False),
+    sa.Column('agency_id', sa.String(), nullable=True),
+    sa.Column('agency_city', sa.String(), nullable=True),
+    sa.Column('prime_vjur', sa.String(), nullable=True),
+    sa.Column('icbc_detachment_name', sa.String(), nullable=True),
+    sa.Column('icbc_city_name', sa.String(), nullable=True),
+    sa.Column('vips_policedetachments_agency_id', sa.String(), nullable=True),
+    sa.Column('vips_policedetachments_agency_nm', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('agency_name')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('agency_cross_refs')
+    # ### end Alembic commands ###

python/prohibition_web_svc/models.py

@@ -661,3 +661,28 @@ class FormStorageRefs(db.Model):
     encryptiv = db.Column(db.String)
     created_dt = db.Column(db.DateTime)
     updated_dt = db.Column(db.DateTime)
+
+
+
+@dataclass
+class AgencyCrossref(db.Model):
+    __tablename__ = 'agency_cross_refs'
+
+    agency_name: str
+    agency_id: str
+    agency_city: str
+    prime_vjur: str
+    icbc_detachment_name: str
+    icbc_city_name: str
+    vips_policedetachments_agency_id: str
+    vips_policedetachments_agency_nm: str
+
+    agency_name = db.Column(db.String, primary_key=True)
+    agency_id = db.Column(db.String)
+    agency_city = db.Column(db.String)
+    prime_vjur = db.Column(db.String)
+    icbc_detachment_name = db.Column(db.String)
+    icbc_city_name = db.Column(db.String)
+    vips_policedetachments_agency_id = db.Column(db.String)
+    vips_policedetachments_agency_nm = db.Column(db.String)
+

python/task_scheduler/models.py

@@ -7,8 +7,14 @@
 db = SQLAlchemy()
 migrate = Migrate()
 
-
+@dataclass
 class Form(db.Model):
+    id: str
+    form_type: str
+    lease_expiry: datetime
+    printed_timestamp: datetime
+    user_guid: str
+
     id = db.Column('id', db.String(20), primary_key=True)
     form_type = db.Column(db.String(20), nullable=False)
     lease_expiry = db.Column(db.Date, nullable=True)
@@ -25,16 +31,6 @@ def __init__(self, form_id, form_type, printed=None, lease_expiry=None, user_gui
         self.lease_expiry = lease_expiry
         self.user_guid = user_guid
 
-    @staticmethod
-    def serialize(form):
-        return {
-            "id": form.id,
-            "form_type": form.form_type,
-            "lease_expiry": Form._format_lease_expiry(form.lease_expiry),
-            "printed_timestamp": form.printed_timestamp,
-            "user_guid": form.user_guid
-        }
-
     def lease(self, user_guid):
         today = datetime.now()
         lease_expiry = today + timedelta(days=30)
@@ -155,7 +151,7 @@ def get_roles(user_guid):
         return UserRole.collection_to_list_roles(rows)
 
 
-@dataclass
+@dataclass 
 class Agency(db.Model):
     __tablename__ = 'agency'
 
@@ -259,6 +255,16 @@ class VehicleStyle(db.Model):
 
     code = db.Column(db.String, primary_key=True)
     name = db.Column(db.String)
+
+@dataclass
+class VehicleType(db.Model):
+    __tablename__ = 'vehicle_type'
+
+    type_cd: int
+    description: str
+
+    type_cd = db.Column(db.Integer, primary_key=True)
+    description = db.Column(db.String)
 
 
 @dataclass
@@ -316,6 +322,7 @@ class Event(db.Model):
     vehicle_year: str
     vehicle_mk_md: str
     vehicle_style: str
+    vehicle_type: int
     vehicle_colour: str
     vehicle_vin_no: str
     nsc_prov_state: str
@@ -373,6 +380,7 @@ class Event(db.Model):
     vehicle_year = db.Column(db.String)
     vehicle_mk_md = db.Column(db.String)
     vehicle_style = db.Column(db.String)
+    vehicle_type = db.Column(db.Integer, db.ForeignKey('vehicle_type.type_cd'))
     vehicle_colour = db.Column(db.String)
     vehicle_vin_no = db.Column(db.String)
     nsc_prov_state = db.Column(db.String)
@@ -464,6 +472,7 @@ class TwentyFourHourForm(db.Model):
     admission_by_driver: bool
     independent_witness: bool
     reasonable_ground_other: bool
+    twenty_four_hour_number: str
     created_dt: datetime
     updated_dt: datetime
 
@@ -498,6 +507,7 @@ class TwentyFourHourForm(db.Model):
     admission_by_driver = db.Column(db.Boolean)
     independent_witness = db.Column(db.Boolean)
     reasonable_ground_other = db.Column(db.Boolean)
+    twenty_four_hour_number = db.Column(db.String)
     created_dt = db.Column(db.DateTime)
     updated_dt = db.Column(db.DateTime)
 
@@ -511,12 +521,14 @@ class TwelveHourForm(db.Model):
     created_dt: datetime
     updated_dt: datetime
     driver_phone: str
+    twelve_hour_number: str
 
     form_id = db.Column(db.Integer, primary_key=True)
     event_id = db.Column(db.Integer, db.ForeignKey('event.event_id'))
     created_dt = db.Column(db.DateTime)
     updated_dt = db.Column(db.DateTime)
     driver_phone = db.Column(db.String)
+    twelve_hour_number = db.Column(db.String)
 
 
 @dataclass
@@ -551,6 +563,7 @@ class VIForm(db.Model):
     out_of_province_dl: str
     out_of_province_dl_number: str
     out_of_province_dl_expiry: str
+    out_of_province_dl_jurisdiction: str
     date_of_impound: datetime
     irp_impound: str
     irp_impound_duration: str
@@ -589,6 +602,7 @@ class VIForm(db.Model):
     out_of_province_dl = db.Column(db.String)
     out_of_province_dl_number = db.Column(db.String)
     out_of_province_dl_expiry = db.Column(db.String)
+    out_of_province_dl_jurisdiction = db.Column(db.String)
     date_of_impound = db.Column(db.DateTime)
     irp_impound = db.Column(db.String)
     irp_impound_duration = db.Column(db.String)
@@ -647,3 +661,28 @@ class FormStorageRefs(db.Model):
     encryptiv = db.Column(db.String)
     created_dt = db.Column(db.DateTime)
     updated_dt = db.Column(db.DateTime)
+
+
+
+@dataclass
+class AgencyCrossref(db.Model):
+    __tablename__ = 'agency_cross_refs'
+
+    agency_name: str
+    agency_id: str
+    agency_city: str
+    prime_vjur: str
+    icbc_detachment_name: str
+    icbc_city_name: str
+    vips_policedetachments_agency_id: str
+    vips_policedetachments_agency_nm: str
+
+    agency_name = db.Column(db.String, primary_key=True)
+    agency_id = db.Column(db.String)
+    agency_city = db.Column(db.String)
+    prime_vjur = db.Column(db.String)
+    icbc_detachment_name = db.Column(db.String)
+    icbc_city_name = db.Column(db.String)
+    vips_policedetachments_agency_id = db.Column(db.String)
+    vips_policedetachments_agency_nm = db.Column(db.String)
+