process_tracker_python-84 Add contact to process relationship

✨ Added Contact Process relationship

ProcessContact relationship added.  Added to the finder for obtaining contacts.

Closes #84

Author: Alex Meadows

dbscripts/mysql_process_tracker.sql

@@ -144,15 +144,26 @@ create table source_lkup
 		unique (source_name)
 );
 
-create table process_tracker.source_contact
+create table source_contact
 (
 	source_id int not null,
 	contact_id int not null,
 	primary key (source_id, contact_id),
 	constraint source_contact_fk01
-		foreign key (source_id) references process_tracker.source_lkup (source_id),
+		foreign key (source_id) references source_lkup (source_id),
 	constraint source_contact_fk02
-		foreign key (contact_id) references process_tracker.contact_lkup (contact_id)
+		foreign key (contact_id) references contact_lkup (contact_id)
+);
+
+create table process_contact
+(
+	process_id int not null,
+	contact_id int not null,
+	primary key (process_id, contact_id),
+	constraint process_contact_fk01
+		foreign key (process_id) references process (process_id),
+	constraint process_contact_fk02
+		foreign key (contact_id) references contact_lkup (contact_id)
 );
 
 create table system_lkup

dbscripts/postgresql_process_tracker.sql

@@ -122,6 +122,20 @@ create table process_tracker.source_contact
 
 alter table process_tracker.source_contact owner to pt_admin;
 
+create table process_tracker.process_contact
+(
+	process_id integer not null
+		constraint process_contact_fk01
+			references process_tracker.process,
+	contact_id integer not null
+		constraint process_contact_fk02
+			references process_tracker.contact_lkup,
+	constraint process_contact_pk
+		primary key (process_id, contact_id)
+);
+
+alter table process_tracker.process_contact owner to pt_admin;
+
 create table process_status_lkup
 (
 	process_status_id serial not null

process_tracker/models/process.py

@@ -164,6 +164,37 @@ def __repr__(self):
         )
 
 
+class ProcessContact(Base):
+
+    __tablename__ = "process_contact"
+    __table_args__ = {"schema": "process_tracker"}
+
+    process_id = Column(
+        Integer,
+        ForeignKey("process_tracker.process.process_id"),
+        primary_key=True,
+        nullable=False,
+    )
+    contact_id = Column(
+        Integer,
+        ForeignKey("process_tracker.contact_lkup.contact_id"),
+        primary_key=True,
+        nullable=False,
+    )
+
+    UniqueConstraint(process_id, contact_id)
+
+    processes = relationship("Process")
+    contacts = relationship("Contact")
+
+    def __repr__(self):
+
+        return "<ProcessContact process=%s, contact=%s>" % (
+            self.process_id,
+            self.contact_id,
+        )
+
+
 class ProcessDatasetType(Base):
 
     __tablename__ = "process_dataset_type"

process_tracker/process_tracker.py

@@ -27,6 +27,7 @@
     ErrorTracking,
     ErrorType,
     Process,
+    ProcessContact,
     ProcessDatasetType,
     ProcessDependency,
     ProcessTracking,
@@ -417,8 +418,7 @@ def find_process_contacts(self, process):
             .join(Source)
             .join(ProcessSource)
             .join(Process)
-            .join(ProcessTracking)
-            .filter(ProcessTracking.process_id == process)
+            .filter(Process.process_id == process)
         )
 
         for contact in result:
@@ -430,6 +430,22 @@ def find_process_contacts(self, process):
                 }
             )
 
+        result = (
+            self.session.query(Contact.contact_name, Contact.contact_email)
+            .join(ProcessContact)
+            .join(Process)
+            .filter(Process.process_id == process)
+        )
+
+        for contact in result:
+            contacts.append(
+                {
+                    "contact_name": contact.contact_name,
+                    "contact_email": contact.contact_email,
+                    "contact_type": "process",
+                }
+            )
+
         return contacts
 
     def get_latest_tracking_record(self, process):

tests/test_process_tracker.py

@@ -25,6 +25,7 @@
     ErrorType,
     ErrorTracking,
     Process,
+    ProcessContact,
     ProcessDatasetType,
     ProcessDependency,
     ProcessSource,
@@ -67,6 +68,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.session.query(ClusterProcess).delete()
+        cls.session.query(ProcessContact).delete()
         cls.session.query(Location).delete()
         cls.session.query(DatasetType).delete()
         cls.session.query(ProcessSourceObject).delete()
@@ -661,21 +663,33 @@ def test_find_extracts_by_process_not_descending(self):
 
     def test_find_process_contacts(self):
         """
-        Testing that when passed a process_id, a list of source contacts will be returned.
+        Testing that when passed a process_id, a list of source and process contacts will be returned.
         :return:
         """
-        contact = DataStore().get_or_create_item(
+        source_contact = DataStore().get_or_create_item(
             model=Contact,
             contact_name="Test Contact",
             contact_email="testcontact@test.com",
         )
 
+        process_contact = DataStore().get_or_create_item(
+            model=Contact,
+            contact_name="Process Contact",
+            contact_email="processcontact@test.com",
+        )
+
         source = DataStore().get_or_create_item(model=Source, source_name="Unittests")
 
         DataStore().get_or_create_item(
             model=SourceContact,
             source_id=source.source_id,
-            contact_id=contact.contact_id,
+            contact_id=source_contact.contact_id,
+        )
+
+        DataStore().get_or_create_item(
+            model=ProcessContact,
+            process_id=self.process_id,
+            contact_id=process_contact.contact_id,
         )
 
         given_result = self.process_tracker.find_process_contacts(
@@ -687,7 +701,12 @@ def test_find_process_contacts(self):
                 "contact_name": "Test Contact",
                 "contact_email": "testcontact@test.com",
                 "contact_type": "source",
-            }
+            },
+            {
+                "contact_name": "Process Contact",
+                "contact_email": "processcontact@test.com",
+                "contact_type": "process",
+            },
         ]
 
         self.assertEqual(expected_result, given_result)