fix: fixes to StatesAccountingAgent for new fields

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Agent/StatesAccountingAgent.py

@@ -31,8 +31,8 @@ class StatesAccountingAgent(AgentModule):
     __summaryKeyFieldsMapping = [
         "Status",
         "Site",
-        "User",
-        "UserGroup",
+        "Owner",
+        "OwnerGroup",
         "JobGroup",
         "VO",
         "JobType",
@@ -41,7 +41,7 @@ class StatesAccountingAgent(AgentModule):
     ]
     __summaryDefinedFields = [("ApplicationStatus", "unset"), ("MinorStatus", "unset")]
     __summaryValueFieldsMapping = ["Jobs", "Reschedules"]
-    __renameFieldsMapping = {"JobType": "JobSplitType"}
+    __renameFieldsMapping = {"Owner": "User", "OwnerGroup": "UserGroup", "JobType": "JobSplitType"}
 
     # PilotsHistory fields
     __pilotsMapping = ["GridSite", "ComputingElement", "GridType", "Status", "VO", "NumOfPilots"]
@@ -95,7 +95,7 @@ def execute(self):
                     f"{result['Message']}: won't commit PilotsHistory at this cycle",
                 )
 
-            values = result["Value"][1]
+            values = result["Value"]
             for record in values:
                 rD = {}
                 for iP, _ in enumerate(self.__pilotsMapping):
@@ -111,21 +111,21 @@ def execute(self):
 
         # WMSHistory to Monitoring or Accounting
         self.log.info(f"Committing WMSHistory to {'and '.join(self.jobMonitoringOption)} backend")
-        result = JobDB()._query("SELECT * FROM JobsHistorySummary")
+        result = JobDB()._query(
+            f"SELECT {self.__summaryKeyFieldsMapping} FROM JobsHistorySummary ORDER BY {','.join(self.__summaryKeyFieldsMapping)}"
+        )
         if not result["OK"]:
             self.log.error("Can't get the JobDB summary", f"{result['Message']}: won't commit WMSHistory at this cycle")
             return S_ERROR()
 
-        values = result["Value"][1]
-
+        values = result["Value"]
         now = datetime.datetime.utcnow()
         self.log.info("Start sending WMSHistory records")
         for record in values:
             rD = {}
             for fV in self.__summaryDefinedFields:
                 rD[fV[0]] = fV[1]
-            for iP, _ in enumerate(self.__summaryKeyFieldsMapping):
-                fieldName = self.__summaryKeyFieldsMapping[iP]
+            for iP, fieldName in enumerate(self.__summaryKeyFieldsMapping):
                 rD[self.__renameFieldsMapping.get(fieldName, fieldName)] = record[iP]
             record = record[len(self.__summaryKeyFieldsMapping) :]
             for iP, _ in enumerate(self.__summaryValueFieldsMapping):