From 3ddd33bc8d3e146c8f53e835058abfdd7369be71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominic=20K=C3=B6nig?= <dominic@nursix.org>
Date: Wed, 30 Nov 2022 15:21:50 +0100
Subject: [PATCH] RLPPTM: include commission details in TestFacilityInfo API

---
 VERSION                             |  2 +-
 modules/templates/RLPPTM/helpers.py | 32 +++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 8b5a631bb..d219748fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-dev-5554-g9e3545071 (2022-11-30 14:59:28)
+nursix-dev-5555-g829dd3571 (2022-11-30 15:21:50)
diff --git a/modules/templates/RLPPTM/helpers.py b/modules/templates/RLPPTM/helpers.py
index 836a4408a..cdb96a821 100644
--- a/modules/templates/RLPPTM/helpers.py
+++ b/modules/templates/RLPPTM/helpers.py
@@ -2326,6 +2326,13 @@ def facility_info(r, **attr):
                      "name": "ORG-NAME",    - the organisation name
                      "type": "ORG-TYPE",    - the organisation type
                      "website": "URL"       - the organisation website URL
+                     "commission": [        - commissioning details
+                        {"start": YYYY-MM-DD,
+                        "end": YYYY-MM-DD,
+                        "status": CURRENT|SUSPENDED|REVOKED|EXPIRED,
+                        "status_date": YYYY-MM-DD,
+                        }, ...
+                       ]
                      },
                  "location":
                     {"L1": "L1-NAME",       - the L1 name (state)
@@ -2338,7 +2345,7 @@ def facility_info(r, **attr):
                  "report": ["start","end"], - echoed from input, ISO-format dates YYYY-MM-DD
                  "activity":
                     {"tests": NN            - the total number of tests reported for the period
-                    }
+                    },
                  }
         """
 
@@ -2431,7 +2438,8 @@ def facility_info(r, **attr):
                 ]
         query = (otable.id == facility.organisation_id) & \
                 (otable.deleted == False)
-        row = db(query).select(otable.name,
+        row = db(query).select(otable.id,
+                               otable.name,
                                otable.website,
                                ttable.name,
                                ottable.value,
@@ -2447,6 +2455,26 @@ def facility_info(r, **attr):
                        "type": orgtype.name,
                        "website": organisation.website,
                        }
+
+            # Add commission data
+            ctable = s3db.org_commission
+            query = (ctable.organisation_id == organisation.id) & \
+                    (ctable.deleted == False)
+            commissions = db(query).select(ctable.date,
+                                           ctable.end_date,
+                                           ctable.status,
+                                           ctable.status_date,
+                                           )
+            dtfmt = lambda dt: dt.isoformat() if dt else '--'
+            clist = []
+            for commission in commissions:
+                clist.append({"start": dtfmt(commission.date),
+                              "end": dtfmt(commission.end_date),
+                              "status": commission.status,
+                              "status_date": dtfmt(commission.status_date),
+                              })
+            orgdata["commission"] = clist
+
             output["organisation"] = orgdata
 
         # Look up location data