process_tracker_python-90 Add contact information to data source

✨ Added Contact

Author: Alex Meadows

process_tracker/cli.py

@@ -72,11 +72,12 @@ def upgrade():
     help="For clusters, the unit of processing ability (Ghz, CPU, DPU, etc.",
 )
 @click.option(
-    "--memory-unit", help="For clusters, the unit of allocated memory (MB, GB, etc."
+    "--memory-unit", help="For clusters, the unit of allocated memory (MB, GB, etc.)"
 )
 @click.option(
     "--cluster", help="For cluster/process relationships, the name of the cluster"
 )
+@click.option("--email", help="For contacts, the contact's email address.")
 def create(
     topic,
     name,
@@ -87,6 +88,7 @@ def create(
     max_memory=None,
     memory_unit=None,
     cluster=None,
+    email=None,
 ):
     """
     Create an item that is within the valid topics list.
@@ -109,6 +111,8 @@ def create(
     :type memory_unit: string
     :param cluster: For cluster/process relationships, the name of the cluster.
     :type cluster: string
+    :param email: For contacts, the contact's email address.
+    :type email: string
     """
     click.echo("Attempting to create %s with name %s" % (topic, name))
     data_store.topic_creator(
@@ -121,6 +125,7 @@ def create(
         processing_unit=processing_unit,
         memory_unit=memory_unit,
         cluster=cluster,
+        email=email,
     )
 
 
@@ -175,6 +180,7 @@ def delete(topic, name, parent=None, child=None, cluster=None):
 @click.option(
     "--memory-unit", help="For clusters, the unit of allocated memory (MB, GB, etc."
 )
+@click.option("--email", help="For contacts, the contact's email address.")
 def update(
     topic,
     name,
@@ -183,6 +189,7 @@ def update(
     max_memory=None,
     processing_unit=None,
     memory_unit=None,
+    email=None,
 ):
     """
     Update an item that is within the valid topics list and not a pre-loaded item.
@@ -200,6 +207,8 @@ def update(
     :type processing_unit: string
     :param memory_unit: For performance clusters, the unit of allocated memory to the cluster
     :type memory_unit: string
+    :param email: For contacts, the contact's email address.
+    :type email: string
     """
     click.echo(
         "Attempting to update %s with name %s to %s" % (topic, initial_name, name)
@@ -212,6 +221,7 @@ def update(
         max_memory=max_memory,
         processing_unit=processing_unit,
         memory_unit=memory_unit,
+        email=email,
     )
 
 

process_tracker/models/contact.py

@@ -0,0 +1,23 @@
+# SQLAlchemy Models
+# Models for Contact entities
+
+from sqlalchemy import Column, Integer, Sequence, String
+from process_tracker.models.model_base import Base
+
+
+class Contact(Base):
+
+    __tablename__ = "contact_lkup"
+    __table_args__ = {"schema": "process_tracker"}
+
+    contact_id = Column(
+        Integer,
+        Sequence("contact_lkup_contact_id_seq", schema="process_tracker"),
+        primary_key=True,
+        nullable=False,
+    )
+    contact_name = Column(String(250), nullable=False, unique=True)
+    contact_email = Column(String(750), nullable=True, unique=True)
+
+    def __repr__(self):
+        return "<Contact id=%s, name=%s>" % (self.contact_id, self.contact_name)

process_tracker/models/source.py

@@ -50,6 +50,29 @@ def __repr__(self):
         return "<Source (name=%s)>" % self.source_name
 
 
+class SourceContact(Base):
+
+    __tablename__ = "source_contact"
+    __table_args__ = {"schema": "process_tracker"}
+
+    source_id = Column(
+        Integer,
+        ForeignKey("process_tracker.source_lkup.source_id"),
+        nullable=False,
+        primary_key=True,
+    )
+    contact_id = Column(
+        Integer,
+        ForeignKey("process_tracker.contact_lkup.contact_id"),
+        nullable=False,
+        primary_key=True,
+    )
+
+    UniqueConstraint(source_id, contact_id)
+    sources = relationship("Source")
+    contacts = relationship("Contact")
+
+
 class SourceDatasetType(Base):
 
     __tablename__ = "source_dataset_type"

process_tracker/utilities/data_store.py

@@ -12,6 +12,7 @@
 from process_tracker.models.model_base import Base
 from process_tracker.models.actor import Actor
 from process_tracker.models.capacity import Cluster, ClusterProcess
+from process_tracker.models.contact import Contact
 from process_tracker.models.extract import ExtractStatus
 from process_tracker.models.process import (
     ErrorType,
@@ -198,6 +199,7 @@ def topic_creator(
         max_memory=None,
         memory_unit=None,
         cluster=None,
+        email=None,
     ):
         """
         For the command line tool, validate the topic and create the new instance.
@@ -220,6 +222,8 @@ def topic_creator(
         :type memory_unit: string
         :param cluster: For cluster/process relationships, the name of the cluster.
         :type cluster: string
+        :param email:  For contacts, the contact's email address
+        :type email: string
         :return:
         """
         self.logger.info("Attempting to create %s item: %s" % (topic, name))
@@ -230,6 +234,12 @@ def topic_creator(
                 item = self.get_or_create_item(model=Actor, actor_name=name)
                 self.logger.info("Actor created: %s" % item.__repr__)
 
+            elif topic == "contact":
+                item = self.get_or_create_item(
+                    model=Contact, contact_name=name, contact_email=email
+                )
+                self.logger.info("Contact created: %s" % item.__repr__)
+
             elif topic == "cluster":
                 item = self.get_or_create_item(
                     model=Cluster,
@@ -257,16 +267,16 @@ def topic_creator(
 
                 self.logger.info("Cluster Process created: %s" % item.__repr__)
 
+            elif topic == "error type":
+                item = self.get_or_create_item(model=ErrorType, error_type_name=name)
+                self.logger.info("Error Type created: %s" % item.__repr__)
+
             elif topic == "extract status":
                 item = self.get_or_create_item(
                     model=ExtractStatus, extract_status_name=name
                 )
                 self.logger.info("Extract Status created: %s" % item.__repr__)
 
-            elif topic == "error type":
-                item = self.get_or_create_item(model=ErrorType, error_type_name=name)
-                self.logger.info("Error Type created: %s" % item.__repr__)
-
             elif topic == "process dependency":
                 parent_process = self.get_or_create_item(
                     model=Process, process_name=parent, create=False
@@ -283,18 +293,18 @@ def topic_creator(
 
                 self.logger.info("Process Dependency created: %s" % item.__repr__)
 
-            elif topic == "process type":
-                item = self.get_or_create_item(
-                    model=ProcessType, process_type_name=name
-                )
-                self.logger.info("Process Type created: %s" % item.__repr__)
-
             elif topic == "process status":
                 item = self.get_or_create_item(
                     model=ProcessStatus, process_status_name=name
                 )
                 self.logger.info("Process Status created: %s" % item.__repr__)
 
+            elif topic == "process type":
+                item = self.get_or_create_item(
+                    model=ProcessType, process_type_name=name
+                )
+                self.logger.info("Process Type created: %s" % item.__repr__)
+
             elif topic == "source":
                 item = self.get_or_create_item(model=Source, source_name=name)
                 self.logger.info("Source created: %s" % item.__repr__)
@@ -339,6 +349,13 @@ def topic_deleter(self, topic, name, parent=None, child=None, cluster=None):
                 self.session.query(Actor).filter(Actor.actor_name == name).delete()
                 self.logger.info("%s %s deleted." % (topic, name))
 
+            elif topic == "contact":
+                item_delete = True
+                self.session.query(Contact).filter(
+                    Contact.contact_name == name
+                ).delete()
+                self.logger.info("%s %s deleted." % (topic, name))
+
             elif topic == "cluster":
                 item_delete = True
                 self.session.query(Cluster).filter(
@@ -448,6 +465,7 @@ def topic_updater(
         processing_unit=None,
         max_memory=None,
         memory_unit=None,
+        email=None,
     ):
         """
         For the command line tool, validate that the topic name is not a default value and if not, update it.
@@ -465,6 +483,8 @@ def topic_updater(
         :type processing_unit: string
         :param memory_unit: For performance clusters, the unit of allocated memory to the cluster
         :type memory_unit: string
+        :param email: For contacts, the contact's email address
+        :type email: string
         :return:
         """
         if self.topic_validator(topic=topic):
@@ -475,6 +495,17 @@ def topic_updater(
                 item.actor_name = name
                 self.logger.info("%s %s updated." % (topic, name))
 
+            elif topic == "contact":
+                item = self.get_or_create_item(
+                    model=Contact, create=False, contact_name=initial_name
+                )
+
+                item.contact_name = name
+
+                if email is not None:
+                    item.contact_email = email
+                self.logger.info("%s %s updated." % (topic, name))
+
             elif topic == "cluster":
                 item = self.get_or_create_item(
                     model=Cluster, create=False, cluster_name=initial_name
@@ -615,13 +646,15 @@ def topic_validator(self, topic):
             "actor",
             "cluster",
             "cluster process",
+            "contact",
             "error type",
             "extract status",
             "process dependency",
             "process run",
             "process status",
             "process type",
             "source",
+            "source contact",
             "tool",
         ]