Merge branch 'develop'

MyEMS · Jun 27, 2024 · f5a4ea3 · f5a4ea3
2 parents e10c840 + fbea81c
commit f5a4ea3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/myems-api/core/microgrid.py b/myems-api/core/microgrid.py
@@ -341,8 +341,8 @@ def on_get(req, resp, id_):
 
         query = (" SELECT id, name, uuid, "
                  "        address, postal_code, latitude, longitude, rated_capacity, rated_power, "
-                 "        contact_id, cost_center_id, serial_number, svg_id, is_cost_data_displayed, phase_of_lifecycle, "
-                 "        description "
+                 "        contact_id, cost_center_id, serial_number, svg_id, is_cost_data_displayed, "
+                 "        phase_of_lifecycle, description "
                  " FROM tbl_microgrids "
                  " WHERE id = %s ")
         cursor.execute(query, (id_,))
@@ -548,7 +548,7 @@ def on_put(req, resp, id_):
                 not isinstance(new_values['data']['phase_of_lifecycle'], str) or \
                 len(str.strip(new_values['data']['phase_of_lifecycle'])) == 0:
             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.BAD_REQUEST',
-                                   description='API.INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE')
+                                   description='API.INVALID_MICROGRID_PHASE_OF_LIFECYCLE')
         phase_of_lifecycle = str.strip(new_values['data']['phase_of_lifecycle'])
 
         if 'description' in new_values['data'].keys() and \