#2459 back-sync b8 changes into core

src/primaite/simulator/system/services/database/database_service.py

@@ -141,8 +141,7 @@ class DatabaseService(Service):
         """Returns the database file."""
         return self.file_system.get_file(folder_name="database", file_name="database.db")
 
-    @property
-    def folder(self) -> Folder:
+    def _return_database_folder(self) -> Folder:
         """Returns the database folder."""
         return self.file_system.get_folder_by_id(self.db_file.folder_id)
 
@@ -187,7 +186,10 @@ class DatabaseService(Service):
         }
 
     def _process_sql(
-        self, query: Literal["SELECT", "DELETE", "INSERT"], query_id: str, connection_id: Optional[str] = None
+        self,
+        query: Literal["SELECT", "DELETE", "INSERT", "ENCRYPT"],
+        query_id: str,
+        connection_id: Optional[str] = None,
     ) -> Dict[str, Union[int, List[Any]]]:
         """
         Executes the given SQL query and returns the result.
@@ -196,6 +198,7 @@ class DatabaseService(Service):
         - SELECT : returns the data
         - DELETE : deletes the data
         - INSERT : inserts the data
+        - ENCRYPT : corrupts the data
 
         :param query: The SQL query to be executed.
         :return: Dictionary containing status code and data fetched.
@@ -207,7 +210,15 @@ class DatabaseService(Service):
             return {"status_code": 404, "type": "sql", "data": False}
 
         if query == "SELECT":
-            if self.db_file.health_status == FileSystemItemHealthStatus.GOOD:
+            if self.db_file.health_status == FileSystemItemHealthStatus.CORRUPT:
+                return {
+                    "status_code": 200,
+                    "type": "sql",
+                    "data": False,
+                    "uuid": query_id,
+                    "connection_id": connection_id,
+                }
+            elif self.db_file.health_status == FileSystemItemHealthStatus.GOOD:
                 return {
                     "status_code": 200,
                     "type": "sql",
@@ -226,6 +237,20 @@ class DatabaseService(Service):
                 "uuid": query_id,
                 "connection_id": connection_id,
             }
+        elif query == "ENCRYPT":
+            self.file_system.num_file_creations += 1
+            self.db_file.health_status = FileSystemItemHealthStatus.CORRUPT
+            self.db_file.num_access += 1
+            database_folder = self._return_database_folder()
+            database_folder.health_status = FileSystemItemHealthStatus.CORRUPT
+            self.file_system.num_file_deletions += 1
+            return {
+                "status_code": 200,
+                "type": "sql",
+                "data": False,
+                "uuid": query_id,
+                "connection_id": connection_id,
+            }
         elif query == "INSERT":
             if self.health_state_actual == SoftwareHealthState.GOOD:
                 return {

src/primaite/simulator/system/services/ntp/ntp_client.py

@@ -87,13 +87,9 @@ class NTPClient(Service):
         :return: True if successful, False otherwise.
         """
         if not isinstance(payload, NTPPacket):
-            _LOGGER.debug(f"{payload} is not a NTPPacket")
+            _LOGGER.debug(f"{self.name}: Failed to parse NTP update")
             return False
         if payload.ntp_reply.ntp_datetime:
-            self.sys_log.info(
-                f"{self.name}: \
-                              Received time update from NTP server{payload.ntp_reply.ntp_datetime}"
-            )
             self.time = payload.ntp_reply.ntp_datetime
             return True
 
@@ -124,5 +120,3 @@ class NTPClient(Service):
         if self.operating_state == ServiceOperatingState.RUNNING:
             # request time from server
             self.request_time()
-        else:
-            self.sys_log.debug(f"{self.name} ntp client not running")