From 87650e1fbd11c5ce7ec87a872e0262e237ddfc24 Mon Sep 17 00:00:00 2001
From: jiangyilin123 <yilin.jiang@pnnl.gov>
Date: Fri, 15 Mar 2024 16:07:59 -0700
Subject: [PATCH] correct ChargingSessionData published format

---
 .../interfaces/chargepoint/__init__.py         | 18 +++++++++++++++---
 .../interfaces/chargepoint/service.py          | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/__init__.py b/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/__init__.py
index de3c7786ac..a106540650 100644
--- a/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/__init__.py
+++ b/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/__init__.py
@@ -138,6 +138,16 @@ def read_only_check(self):
             raise IOError("Trying to write to a point configured read only: {0}".format(self.attribute_name))
         return True
 
+    def get_last_non_none_value(self,lst):
+        """
+        Depends on port number, the result could be a list with None value
+        get last non-None value as result
+        """
+        for item in reversed(lst):
+            if item is not None:
+                return item
+        return None
+
     def get_register(self, result, method, port_flag=True):
         """Gets correct register from API response.
 
@@ -150,9 +160,10 @@ def get_register(self, result, method, port_flag=True):
         :return: Correct register value cast to appropriate python type. Returns None if there is an error.
         """
         try:
-            value = getattr(result, self.attribute_name)(self.port)[0] \
+            _log.debug(f'In get_register, to get {self.attribute_name}, the port_flag is {port_flag}')
+            value = self.get_last_non_none_value(getattr(result, self.attribute_name)(self.port)) \
                 if port_flag \
-                else getattr(result, self.attribute_name)(None)[0]
+                else self.get_last_non_none_value(getattr(result, self.attribute_name)(None))
             return self.sanitize_output(self.data_type, value)
         except cps.CPAPIException as exception:
             if exception._responseCode not in ['153']:
@@ -386,7 +397,8 @@ def value(self):
         result.wait()
 
         # Of Note, due to API limitations, port number is ignored for these calls
-        return self.get_register(result.value, method, False)
+        # NOTE: Change this port number for Chargingsession data. 
+        return self.get_register(result.value, method)
 
     @value.setter
     def value(self, x):
diff --git a/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/service.py b/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/service.py
index 559f78e5ca..f9b404a723 100644
--- a/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/service.py
+++ b/services/core/PlatformDriverAgent/platform_driver/interfaces/chargepoint/service.py
@@ -416,8 +416,17 @@ def get_port_value(port_number, data, attribute):
             if flag:
                 logger.warning("Station does not have a definition for port {0}".format(port_number))
         else:
-            logger.warning("Response does not have Ports defined")
-            return None
+            if (attribute in ['sessionID', 'startTime', 'endTime', 'Energy', 'rfidSerialNumber', 'driverAccountNumber',
+                      'driverName']) and int(data['portNumber']) == port_number:
+                try:
+                    data_attribute = data[attribute]
+                    return data_attribute
+                except:
+                    logger.warning(f'Response does not have {attribute} field')
+                    return None 
+            else:
+                logger.warning("Response does not have Ports defined")
+                return None
 
     @staticmethod
     def check_output(attribute, parent_dict):
@@ -441,6 +450,7 @@ def get_attr_from_response(name_string, response, portNum=None):
                             else CPAPIResponse.is_not_found(name_string))
             else:
                 list.append(CPAPIResponse.get_port_value(portNum, item, name_string))
+        logger.debug(f'{name_string} list for {portNum} is {list}')
         return list
 
 
@@ -632,12 +642,14 @@ def Type(self, port=None):
 
     def startTime(self, port=None):
         if port:
+            logger.debug(f'startTime port is {port}')
             return CPAPIResponse.get_attr_from_response('startTime', self.stations, port)
         else:
             return [self.pricing_helper('startTime', station) for station in self.stations]
 
     def endTime(self, port=None):
         if port:
+            logger.debug(f'endTime port is {port}')
             return CPAPIResponse.get_attr_from_response('endTime', self.stations, port)
         else:
             return [self.pricing_helper('endTime', station) for station in self.stations]