From 3871a466fa21ed7ecb6a7b1d1d5ef4d14b736a48 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 2 Dec 2024 11:45:35 +0200
Subject: Add tenant id to tenant service notifications and callbacks

---
 mod/ci-common.hxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'mod/ci-common.hxx')

diff --git a/mod/ci-common.hxx b/mod/ci-common.hxx
index b32d397..a38ac54 100644
--- a/mod/ci-common.hxx
+++ b/mod/ci-common.hxx
@@ -242,7 +242,8 @@ namespace brep
     rebuild (odb::core::database&,
              size_t retry,
              const build_id&,
-             function<optional<string> (const tenant_service&,
+             function<optional<string> (const string& tenant_id,
+                                        const tenant_service&,
                                         build_state)> = nullptr) const;
 
     // Find the tenant given the tenant service type and id and return the
@@ -251,7 +252,14 @@ namespace brep
     //
     // Note: should be called out of the database transaction.
     //
-    optional<pair<tenant_service, bool /*archived*/>>
+    struct tenant_data
+    {
+      string tenant_id;
+      tenant_service service;
+      bool archived;
+    };
+
+    optional<tenant_data>
     find (odb::core::database&,
           const string& type,
           const string& id) const;
-- 
cgit v1.1