process_tracker_python-157 Config file being reset on import

🐛 Issue with logic when config_location provided

Logical fault caused the config file in config_location to be overwritten as if it
didn't exist.

Author: Alex Meadows

process_tracker/models/actor.py

@@ -2,10 +2,10 @@
 # Models for Actor entities
 
 from sqlalchemy import Column, Integer, Sequence, String
-from process_tracker.models.model_base import Base
+from process_tracker.models.model_base import Base, BaseColumn
 
 
-class Actor(Base):
+class Actor(Base, BaseColumn):
 
     __tablename__ = "actor_lkup"
     __table_args__ = {"schema": "process_tracker"}

process_tracker/models/capacity.py

@@ -5,10 +5,10 @@
 from sqlalchemy import Column, ForeignKey, Integer, Sequence, String
 from sqlalchemy.orm import relationship
 
-from process_tracker.models.model_base import Base
+from process_tracker.models.model_base import Base, BaseColumn
 
 
-class Cluster(Base):
+class Cluster(Base, BaseColumn):
 
     __tablename__ = "cluster_tracking_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -34,7 +34,7 @@ def __repr__(self):
         return "<Cluster (name=%s)>" % self.cluster_name
 
 
-class ClusterProcess(Base):
+class ClusterProcess(Base, BaseColumn):
 
     __tablename__ = "cluster_process"
     __table_args__ = {"schema": "process_tracker"}

process_tracker/models/contact.py

@@ -2,10 +2,10 @@
 # Models for Contact entities
 
 from sqlalchemy import Column, Integer, Sequence, String
-from process_tracker.models.model_base import Base
+from process_tracker.models.model_base import Base, BaseColumn
 
 
-class Contact(Base):
+class Contact(Base, BaseColumn):
 
     __tablename__ = "contact_lkup"
     __table_args__ = {"schema": "process_tracker"}

process_tracker/models/extract.py

@@ -16,10 +16,10 @@
 )
 from sqlalchemy.orm import relationship
 
-from process_tracker.models.model_base import Base
+from process_tracker.models.model_base import Base, BaseColumn
 
 
-class ExtractStatus(Base):
+class ExtractStatus(Base, BaseColumn):
 
     __tablename__ = "extract_status_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -42,7 +42,7 @@ def __repr__(self):
         )
 
 
-class ExtractCompressionType(Base):
+class ExtractCompressionType(Base, BaseColumn):
 
     __tablename__ = "extract_compression_type_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -63,7 +63,7 @@ def __repr__(self):
         return "<Extract Compression Type name=%s>" % (self.extract_compression_type)
 
 
-class ExtractFileType(Base):
+class ExtractFileType(Base, BaseColumn):
 
     __tablename__ = "extract_filetype_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -88,7 +88,7 @@ def __repr__(self):
         )
 
 
-class Extract(Base):
+class Extract(Base, BaseColumn):
 
     __tablename__ = "extract_tracking"
     __table_args__ = {"schema": "process_tracker"}
@@ -164,7 +164,7 @@ def full_filepath(self):
         return str(Path(self.locations.location_path).joinpath(self.extract_filename))
 
 
-class ExtractDatasetType(Base):
+class ExtractDatasetType(Base, BaseColumn):
 
     __tablename__ = "extract_dataset_type"
     __table_args__ = {"schema": "process_tracker"}
@@ -194,7 +194,7 @@ def __repr__(self):
         )
 
 
-class ExtractDependency(Base):
+class ExtractDependency(Base, BaseColumn):
 
     __tablename__ = "extract_dependency"
     __table_args__ = {"schema": "process_tracker"}
@@ -223,7 +223,7 @@ def __repr__(self):
         )
 
 
-class ExtractProcess(Base):
+class ExtractProcess(Base, BaseColumn):
 
     __tablename__ = "extract_process_tracking"
     __table_args__ = {"schema": "process_tracker"}
@@ -263,7 +263,7 @@ def __repr__(self):
         )
 
 
-class ExtractSource(Base):
+class ExtractSource(Base, BaseColumn):
 
     __tablename__ = "extract_source"
     __table_args__ = {"schema": "process_tracker"}
@@ -294,7 +294,7 @@ def __repr__(self):
         )
 
 
-class ExtractSourceObject(Base):
+class ExtractSourceObject(Base, BaseColumn):
 
     __tablename__ = "extract_source_object"
     __table_args__ = {"schema": "process_tracker"}
@@ -325,7 +325,7 @@ def __repr__(self):
         )
 
 
-class FileSizeType(Base):
+class FileSizeType(Base, BaseColumn):
     __tablename__ = "filesize_type_lkup"
     __table_args__ = {"schema": "process_tracker"}
 
@@ -349,7 +349,7 @@ def __repr__(self):
         )
 
 
-class LocationType(Base):
+class LocationType(Base, BaseColumn):
 
     __tablename__ = "location_type_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -374,7 +374,7 @@ def __repr__(self):
         )
 
 
-class Location(Base):
+class Location(Base, BaseColumn):
 
     __tablename__ = "location_lkup"
     __table_args__ = {"schema": "process_tracker"}

process_tracker/models/model_base.py

@@ -1,8 +1,20 @@
 # Base Model class for other data models.
 
+from datetime import datetime
 from dateutil import parser
 
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column, Integer, DateTime
 
 Base = declarative_base()
 default_date = parser.parse("1900-01-01 00:00:00")
+current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+class BaseColumn(object):
+    created_date_time = Column(DateTime, nullable=False, default=current_time)
+    created_by = Column(DateTime, nullable=False, default=0)
+    update_date_time = Column(
+        DateTime, nullable=False, default=current_time, onupdate=current_time
+    )
+    updated_by = Column(DateTime, nullable=False, default=0)

process_tracker/models/process.py

@@ -15,10 +15,10 @@
 )
 from sqlalchemy.orm import relationship
 
-from process_tracker.models.model_base import default_date, Base
+from process_tracker.models.model_base import default_date, Base, BaseColumn
 
 
-class ErrorType(Base):
+class ErrorType(Base, BaseColumn):
 
     __tablename__ = "error_type_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -38,7 +38,7 @@ def __repr__(self):
         return "<ErrorType (name=%s)>" % self.error_type_name
 
 
-class ErrorTracking(Base):
+class ErrorTracking(Base, BaseColumn):
 
     __tablename__ = "error_tracking"
     __table_args__ = {"schema": "process_tracker"}
@@ -78,7 +78,7 @@ def __repr__(self):
         )
 
 
-class ProcessStatus(Base):
+class ProcessStatus(Base, BaseColumn):
 
     __tablename__ = "process_status_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -101,7 +101,7 @@ def __repr__(self):
         )
 
 
-class ProcessType(Base):
+class ProcessType(Base, BaseColumn):
 
     __tablename__ = "process_type_lkup"
     __table_args__ = {"schema": "process_tracker"}
@@ -124,7 +124,7 @@ def __repr__(self):
         )
 
 
-class Process(Base):
+class Process(Base, BaseColumn):
 
     __tablename__ = "process"
     __table_args__ = {"schema": "process_tracker"}
@@ -179,7 +179,7 @@ def __repr__(self):
         )
 
 
-class ProcessContact(Base):
+class ProcessContact(Base, BaseColumn):
 
     __tablename__ = "process_contact"
     __table_args__ = {"schema": "process_tracker"}
@@ -210,7 +210,7 @@ def __repr__(self):
         )
 
 
-class ProcessDatasetType(Base):
+class ProcessDatasetType(Base, BaseColumn):
 
     __tablename__ = "process_dataset_type"
     __table_args__ = {"schema": "process_tracker"}
@@ -241,7 +241,7 @@ def __repr__(self):
         )
 
 
-class ProcessFilter(Base):
+class ProcessFilter(Base, BaseColumn):
 
     __tablename__ = "process_filter"
     __table_args__ = {"schema": "process_tracker"}
@@ -283,7 +283,7 @@ def __repr__(self):
         )
 
 
-class ProcessSource(Base):
+class ProcessSource(Base, BaseColumn):
 
     __tablename__ = "process_source"
     __table_args__ = {"schema": "process_tracker"}
@@ -312,7 +312,7 @@ def __repr__(self):
         )
 
 
-class ProcessSourceObject(Base):
+class ProcessSourceObject(Base, BaseColumn):
     __tablename__ = "process_source_object"
     __table_args__ = {"schema": "process_tracker"}
 
@@ -339,7 +339,7 @@ def __repr__(self):
         )
 
 
-class ProcessSourceObjectAttribute(Base):
+class ProcessSourceObjectAttribute(Base, BaseColumn):
     __tablename__ = "process_source_object_attribute"
     __table_args__ = {"schema": "process_tracker"}
 
@@ -370,7 +370,7 @@ def __repr__(self):
         )
 
 
-class ProcessTarget(Base):
+class ProcessTarget(Base, BaseColumn):
     __tablename__ = "process_target"
     __table_args__ = {"schema": "process_tracker"}
 
@@ -397,7 +397,7 @@ def __repr__(self):
         )
 
 
-class ProcessTargetObject(Base):
+class ProcessTargetObject(Base, BaseColumn):
 
     __tablename__ = "process_target_object"
     __table_args__ = {"schema": "process_tracker"}
@@ -425,7 +425,7 @@ def __repr__(self):
         )
 
 
-class ProcessTargetObjectAttribute(Base):
+class ProcessTargetObjectAttribute(Base, BaseColumn):
     __tablename__ = "process_target_object_attribute"
     __table_args__ = {"schema": "process_tracker"}
 
@@ -456,7 +456,7 @@ def __repr__(self):
         )
 
 
-class ProcessDependency(Base):
+class ProcessDependency(Base, BaseColumn):
 
     __tablename__ = "process_dependency"
     __table_args__ = {"schema": "process_tracker"}
@@ -485,7 +485,7 @@ def __repr__(self):
         )
 
 
-class ProcessTracking(Base):
+class ProcessTracking(Base, BaseColumn):
 
     __tablename__ = "process_tracking"
     __table_args__ = {"schema": "process_tracker"}

process_tracker/models/schedule.py

@@ -4,10 +4,10 @@
 
 from sqlalchemy import Column, Integer, Sequence, String
 
-from process_tracker.models.model_base import Base
+from process_tracker.models.model_base import Base, BaseColumn
 
 
-class ScheduleFrequency(Base):
+class ScheduleFrequency(Base, BaseColumn):
 
     __tablename__ = "schedule_frequency_lkup"
     __table_args__ = {"schema": "process_tracker"}