Tweaking models to match the data model. Added more tests to validate

code.

Author: OpenDataAlex

.gitignore

@@ -8,9 +8,7 @@ verify_ssl = true
 [packages]
 sqlalchemy = "*"
 sqlalchemy-utils = "*"
-dateutil = "*"
 python-dateutil = "*"
-psycopg2 = "*"
 psycopg2-binary = "*"
 
 [requires]

.idea/vcs.xml

@@ -10,5 +10,5 @@ class Actor(Base):
 
     __tablename__ = "actor_lkup"
 
-    actor_uuid = Column(uuid.UUIDType, primary_key=True)
+    actor_id = Column(Integer, Sequence('actor_lkup_actor_id_seq'), primary_key=True)
     actor_name = Column(String(250), nullable=False, unique=True)

LICENSE

@@ -11,7 +11,7 @@ class Extract(Base):
 
     __tablename__ = "extract_tracking"
 
-    extract_id = Column(Integer, Sequence('extract_tracking_extract_id_seq01'), primary_key=True)
+    extract_id = Column(Integer, Sequence('extract_tracking_extract_id_seq'), primary_key=True)
     extract_source_id = Column(Integer, ForeignKey("source_lkup.source_id"))
     extract_filename = Column(String(750), nullable=False, unique=True)
     extract_location_id = Column(Integer, ForeignKey('location_lkup.location_id'))
@@ -21,8 +21,8 @@ class Location(Base):
 
     __tablename__ = "location_lkup"
 
-    location_id = Column(Integer, Sequence('location_lkup_location_id_seq01'), primary_key=True)
-    location_name = Column(String(250), nullable=False, unique=True)
-    location_path = Column(String(250), nullable=False, unique=True)
+    location_id = Column(Integer, Sequence('location_lkup_location_id_seq'), primary_key=True)
+    location_name = Column(String(750), nullable=False, unique=True)
+    location_path = Column(String(750), nullable=False, unique=True)
 
     extracts = relationship("Extract")

Pipfile

@@ -4,7 +4,6 @@
 
 from sqlalchemy import Column, DateTime, ForeignKey, Integer, Sequence, String
 from sqlalchemy.orm import relationship
-from sqlalchemy_utils.types import uuid
 
 from models.model_base import default_date, Base
 
@@ -13,7 +12,7 @@ class ErrorType(Base):
 
     __tablename__ = 'error_type_lkup'
 
-    error_type_id = Column(Integer, Sequence('error_type_lkup_error_type_id_seq01'), primary_key=True)
+    error_type_id = Column(Integer, Sequence('error_type_lkup_error_type_id_seq'), primary_key=True)
     error_type_name = Column(String(250), unique=True, nullable=False)
 
     process_errors = relationship("ErrorTracking")
@@ -27,7 +26,7 @@ class ErrorTracking(Base):
 
     __tablename__ = 'error_tracking'
 
-    error_tracking_id = Column(Integer, Sequence('error_tracking_error_tracking_id_seq01'), primary_key=True)
+    error_tracking_id = Column(Integer, Sequence('error_tracking_error_tracking_id_seq'), primary_key=True)
     error_type_id = Column(Integer, ForeignKey('error_type_lkup.error_type_id'))
     error_description = Column(String(750))
     error_occurrence_date_time = Column(DateTime, nullable=False)
@@ -60,7 +59,7 @@ class ProcessType(Base):
 
     __tablename__ = 'process_type_lkup'
 
-    process_type_id = Column(Integer, Sequence('process_type_lkup_process_type_id_seq01'), primary_key=True)
+    process_type_id = Column(Integer, Sequence('process_type_lkup_process_type_id_seq'), primary_key=True)
     process_type_name = Column(String(250), nullable=False)
 
     processes = relationship("Process")
@@ -74,7 +73,7 @@ class Process(Base):
 
     __tablename__ = 'process'
 
-    process_uuid = Column(uuid.UUIDType(binary=False), primary_key=True)
+    process_id = Column(Integer, Sequence('process_process_id_seq'), primary_key=True)
     process_name = Column(String(250), nullable=False, unique=True)
     process_source_id = Column(Integer, ForeignKey('source_lkup.source_id'))
 #    latest_run_low_date_time = Column(DateTime(timezone=True), nullable=False, default=default_date)
@@ -85,17 +84,19 @@ class Process(Base):
 #    latest_run_process_status = Column(Integer, nullable=False, default=0)
 #    latest_run_record_count = Column(Integer, nullable=False, default=0)
     total_record_count = Column(Integer, nullable=False, default=0)
-#    latest_run_actor_id = Column(uuid.UUIDType, ForeignKey('actor.actor_uuid'))
+#    latest_run_actor_id = Column(id.idType, ForeignKey('actor.actor_id'))
     process_type_id = Column(Integer, ForeignKey('process_type_lkup.process_type_id'))
+    process_tool_id = Column(Integer, ForeignKey('tool_lkup.tool_id'))
     last_failed_run_date_time = Column(DateTime(timezone=True), nullable=False, default=default_date)
 
     process_tracking = relationship("ProcessTracking")
     process_type = relationship("ProcessType", back_populates="processes")
     source = relationship("Source")
+    tool = relationship("Tool")
 
     def __repr__(self):
 
-        return "<Process (uuid=%s, name=%s, source=%s, type=%s)>" % (self.process_uuid
+        return "<Process (id=%s, name=%s, source=%s, type=%s)>" % (self.process_id
                                                                      , self.process_name
                                                                      , self.process_source_id
                                                                      , self.process_type_id)
@@ -105,38 +106,38 @@ class ProcessDependency(Base):
 
     __tablename__ = 'process_dependency'
 
-    parent_process_uuid = Column(uuid.UUIDType, ForeignKey('process.process_uuid'), primary_key=True)
-    child_process_uuid = Column(uuid.UUIDType, ForeignKey('process.process_uuid'), primary_key=True)
+    parent_process_id = Column(Integer, ForeignKey('process.process_id'), primary_key=True)
+    child_process_id = Column(Integer, ForeignKey('process.process_id'), primary_key=True)
 
-    child_process = relationship('Process', foreign_keys=[child_process_uuid])
-    parent_process = relationship('Process', foreign_keys=[parent_process_uuid])
+    child_process = relationship('Process', foreign_keys=[child_process_id])
+    parent_process = relationship('Process', foreign_keys=[parent_process_id])
 
     def __repr__(self):
 
-        return "<ProcessDependency (parent_process=%s, child_process=%s)>" % (self.parent_process_uuid
-                                                                              , self.child_process_uuid)
+        return "<ProcessDependency (parent_process=%s, child_process=%s)>" % (self.parent_process_id
+                                                                              , self.child_process_id)
 
 
 class ProcessTracking(Base):
 
     __tablename__ = 'process_tracking'
 
-    process_tracking_id = Column(Integer, Sequence('process_tracking_process_tracking_id_seq01'), primary_key=True)
-    process_uuid = Column(uuid.UUIDType, ForeignKey('process.process_uuid'))
-    process_status = Column(Integer, ForeignKey('process_status_lkup.process_type_id'))
+    process_tracking_id = Column(Integer, Sequence('process_tracking_process_tracking_id_seq'), primary_key=True)
+    process_id = Column(Integer, ForeignKey('process.process_id'))
+    process_status_id = Column(Integer, ForeignKey('process_status_lkup.process_status_id'))
     process_run_id = Column(Integer, nullable=False)
     process_run_low_date_time = Column(DateTime, nullable=True)
     process_run_high_date_time = Column(DateTime, nullable=True)
     process_run_start_date_time = Column(DateTime, nullable=False)
     process_run_end_date_time = Column(DateTime, nullable=True)
     process_run_record_count = Column(Integer, nullable=False, default=0)
-    process_run_actor_uuid = Column(uuid.UUIDType, ForeignKey('actor.actor_uuid'))
+    process_run_actor_id = Column(Integer, ForeignKey('actor_lkup.actor_id'))
 
     process = relationship("Process", back_populates="process_tracking")
     errors = relationship("ErrorTracking", back_populates="error_tracking")
 
     def __repr__(self):
 
         return "<ProcessTracking id=%s, process=%s, process_status=%s)>" % (self.process_tracking_id
-                                                                            , self.process_uuid
-                                                                            , self.process_status)
+                                                                            , self.process_id
+                                                                            , self.process_status_id)