From ac588d8976e6344f3f25f5a7d2160110ab922de5 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Mon, 6 Nov 2023 17:49:13 -0500
Subject: [PATCH] original job uid

---
 wrenchboard/src/shared_tool/jobs_manager.cc | 11 ++++++++++-
 www-api/app/Models/ResultFormatter.php      |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc
index 55cf836f..b494cebe 100644
--- a/wrenchboard/src/shared_tool/jobs_manager.cc
+++ b/wrenchboard/src/shared_tool/jobs_manager.cc
@@ -125,6 +125,9 @@ long WrenchJobManagerOffers( CVars in, CVars &out){
                     snprintf(vname, sizeof (vname), "job_uid_%05d", i);
                     out[vname] = rec["uid"];
 
+                    snprintf(vname, sizeof (vname), "origin_job_uid_%05d", i); // added to support original job UID
+                    out[vname] = rec["job_uid"];
+
                     snprintf(vname, sizeof (vname), "expire_%05d", i);
                     out[vname] = rec["expire"];
 
@@ -442,6 +445,9 @@ long WrenchJobManagerActiveTasksList(CVars in, CVars &out) {
                 snprintf(vname, sizeof (vname), "job_uid_%05d", i);
                 out[vname] = rec["job_uid"];
 
+                snprintf(vname, sizeof (vname), "origin_job_uid_%05d", i); // added to support original job UID
+                out[vname] = rec["job_uid"];
+
                 snprintf(vname, sizeof (vname), "job_to_%05d", i);
                 out[vname] = rec["job_to"];
 
@@ -504,7 +510,7 @@ long WrenchUsersActiveTasksList(CVars in, CVars &out) {
         const PGresult *res;
         res = pgsql_query("SELECT mc.id AS contract_id, mc.job_id AS job_id, mc.price, mc.timeline_days,mc.contract, "
                 "  mj.title, mj.description AS description,mc.job_detail AS job_description,mc.uid AS contract_uid, "
-                "  mj.banner AS banner, c.code AS currency_code, c.description AS currency_description, "
+                "  mj.banner AS banner, c.code AS currency_code, c.description AS currency_description, mj.uid AS job_uid, "
                 " (CASE WHEN mc.status=4 THEN 'REVIEW' "
                 "  WHEN mc.status = 1 AND mc.delivery_date > now() THEN 'ACTIVE' "
                 "  WHEN mc.status = 1 AND mc.delivery_date <now() THEN 'PASTDUE' "
@@ -568,6 +574,9 @@ long WrenchUsersActiveTasksList(CVars in, CVars &out) {
                 snprintf(vname, sizeof (vname), "job_id_%05d", i);
                 out[vname] = rec["job_id"];
 
+                snprintf(vname, sizeof (vname), "origin_job_uid_%05d", i); // added to support original job UID
+                out[vname] = rec["job_uid"];
+
 				snprintf(vname, sizeof (vname), "contract_id_%05d", i);
                 out[vname] = rec["contract_id"];
 
diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php
index 6b129252..2170c6ef 100644
--- a/www-api/app/Models/ResultFormatter.php
+++ b/www-api/app/Models/ResultFormatter.php
@@ -581,6 +581,7 @@ class ResultFormatter extends Model
                         "offer_uid" => $out["offer_uid_${key}"],
                         "family_uid" => $out["family_uid_${key}"],
                         "job_uid" => $out["job_uid_${key}"],
+                        "origin_job_uid" => $out["origin_job_uid_${key}"],
                         "expire" => $out["expire_${key}"],
                         "sent" => $out["sent_${key}"],
                         "offer_code" => $out["offer_code_${key}"],