From 882603193941ac24bc14ade5cfbb4411ba0a6193 Mon Sep 17 00:00:00 2001
From: stephb9959 <stephane.bourque@gmail.com>
Date: Tue, 12 Sep 2023 07:45:44 -0700
Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-7831

Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
---
 openapi/openroaming_globalreach.yaml    | 2 ++
 src/RESTObjects/RESTAPI_ProvObjects.cpp | 2 ++
 src/RESTObjects/RESTAPI_ProvObjects.h   | 1 +
 src/storage/storage_glblraccounts.cpp   | 5 ++++-
 src/storage/storage_glblraccounts.h     | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/openapi/openroaming_globalreach.yaml b/openapi/openroaming_globalreach.yaml
index 9e9b5ff..56c7b42 100644
--- a/openapi/openroaming_globalreach.yaml
+++ b/openapi/openroaming_globalreach.yaml
@@ -55,6 +55,8 @@ components:
           type: string
         CSR:
           type: string
+        GlobalReachAcctId:
+          type: string
 
     GLBLRCertificateInfo:
       type: object
diff --git a/src/RESTObjects/RESTAPI_ProvObjects.cpp b/src/RESTObjects/RESTAPI_ProvObjects.cpp
index 05de8f9..6254e4a 100644
--- a/src/RESTObjects/RESTAPI_ProvObjects.cpp
+++ b/src/RESTObjects/RESTAPI_ProvObjects.cpp
@@ -1203,6 +1203,7 @@ namespace OpenWifi::ProvObjects {
         field_to_json(Obj, "organization", organization);
         field_to_json(Obj, "commonName", commonName);
         field_to_json(Obj, "CSR", CSR);
+        field_to_json(Obj, "GlobalReachAcctId", GlobalReachAcctId);
     }
 
     bool GLBLRAccountInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -1215,6 +1216,7 @@ namespace OpenWifi::ProvObjects {
             field_from_json(Obj, "organization", organization);
             field_from_json(Obj, "commonName", commonName);
             field_from_json(Obj, "CSR", CSR);
+            field_from_json(Obj, "GlobalReachAcctId", GlobalReachAcctId);
             return true;
         } catch (const Poco::Exception &E) {
 
diff --git a/src/RESTObjects/RESTAPI_ProvObjects.h b/src/RESTObjects/RESTAPI_ProvObjects.h
index 7116b8b..1ef7b27 100644
--- a/src/RESTObjects/RESTAPI_ProvObjects.h
+++ b/src/RESTObjects/RESTAPI_ProvObjects.h
@@ -752,6 +752,7 @@ namespace OpenWifi::ProvObjects {
         std::string     privateKey;
         std::string     country, province, city, organization, commonName;
         std::string     CSR;
+        std::string     GlobalReachAcctId;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
diff --git a/src/storage/storage_glblraccounts.cpp b/src/storage/storage_glblraccounts.cpp
index ab0441f..37210b0 100644
--- a/src/storage/storage_glblraccounts.cpp
+++ b/src/storage/storage_glblraccounts.cpp
@@ -24,7 +24,8 @@ namespace OpenWifi {
             ORM::Field{"city", ORM::FieldType::FT_TEXT},
             ORM::Field{"organization", ORM::FieldType::FT_TEXT},
             ORM::Field{"commonName", ORM::FieldType::FT_TEXT},
-            ORM::Field{"CSR", ORM::FieldType::FT_TEXT}
+            ORM::Field{"CSR", ORM::FieldType::FT_TEXT},
+            ORM::Field{"GlobalReachAcctId", ORM::FieldType::FT_TEXT}
     };
 
     static ORM::IndexVec GLBLRAccountInfoDB_Indexes{
@@ -67,6 +68,7 @@ void ORM::DB<OpenWifi::GLBLRAccountsDBRecordType, OpenWifi::ProvObjects::GLBLRAc
     Out.organization = In.get<10>();
     Out.commonName = In.get<11>();
     Out.CSR = In.get<12>();
+    Out.GlobalReachAcctId = In.get<13>();
 }
 
 template <>
@@ -85,4 +87,5 @@ void ORM::DB<OpenWifi::GLBLRAccountsDBRecordType, OpenWifi::ProvObjects::GLBLRAc
     Out.set<10>(In.organization);
     Out.set<11>(In.commonName);
     Out.set<12>(In.CSR);
+    Out.set<13>(In.GlobalReachAcctId);
 }
diff --git a/src/storage/storage_glblraccounts.h b/src/storage/storage_glblraccounts.h
index 577769a..dc0f8d3 100644
--- a/src/storage/storage_glblraccounts.h
+++ b/src/storage/storage_glblraccounts.h
@@ -18,6 +18,7 @@ namespace OpenWifi {
             std::string,
             std::string,
             std::string,
+            std::string,
             std::string>
         GLBLRAccountsDBRecordType;