PKDevTools 0.13.20250213.233__tar.gz → 0.13.20250214.235__tar.gz

{pkdevtools-0.13.20250213.233 → pkdevtools-0.13.20250214.235}/PKDevTools/classes/DBManager.py

@@ -555,3 +555,83 @@ class DBManager:
                 self.conn.close()
                 self.conn = None
         return success1 and success2
+
+    def removeScannerJob(self,userID, scanId):
+        """
+        Removes scanId from scannerJobs column in alertsubscriptions
+        
+        Removes userID from the users column in scannerJobs
+
+        Deletes the row in scannerJobs if no more userIds are left
+        """
+        try:
+            success = False
+            # Step 1: Remove job from user's alertsubscriptions table
+            query_alertsubscriptions = """
+                UPDATE alertsubscriptions
+                SET scannerJobs = 
+                    CASE 
+                        WHEN scannerJobs = ? THEN ''  -- If the only job, set to empty string
+                        ELSE 
+                            TRIM(
+                                REPLACE(
+                                    REPLACE(
+                                        ';' || scannerJobs || ';',  -- Add extra delimiters to prevent partial replacements
+                                        ';' || ? || ';', 
+                                        ';'
+                                    ), 
+                                    ';;', ';'  -- Fix extra semicolons
+                                ),
+                                ';'
+                            )  -- Trim leading/trailing semicolon
+                    END
+                WHERE userId = ?;
+                """
+            result = self.connection().execute(query_alertsubscriptions, (scanId,scanId,userID))
+            if result.rows_affected > 0:
+                default_logger().debug(f"User: {userID} removed {scanId} from alertsubscriptions!")
+                success = True
+            if success:
+                # Step 2: Remove userId from scannerJobs table
+                query_scanner_jobs = """
+                    UPDATE scannerJobs
+                    SET users = 
+                        CASE 
+                            WHEN users = ? THEN ''  -- If the only user, set to empty string
+                            ELSE 
+                                TRIM(
+                                    REPLACE(
+                                        REPLACE(
+                                            ';' || users || ';',
+                                            ';' || ? || ';', 
+                                            ';'
+                                        ), 
+                                        ';;', ';'
+                                    ),
+                                    ';'
+                                )  -- Trim leading/trailing semicolon
+                        END
+                    WHERE scannerId = ?;
+                    """
+                result = self.connection().execute(query_scanner_jobs, (str(userID),str(userID),scanId))
+                if result.rows_affected > 0:
+                    default_logger().debug(f"User: {userID} removed {scanId} from scannerJobs!")
+                    success = True
+            if success:
+                # Step 3: Delete row from scannerJobs if users column is empty
+                query_delete_empty = """
+                DELETE FROM scannerJobs WHERE scannerId = ? AND (users IS NULL OR users = '');
+                """
+                result = self.connection().execute(query_delete_empty, (scanId,))
+                if result.rows_affected > 0:
+                    default_logger().debug(f"{scanId} deleted from scannerJobs by User: {userID} !")
+                    success = True
+        except Exception as e: # pragma: no cover
+            print(f"Could not removeScannerJob: {scanId} for UserID: {userID}\n{e}")
+            default_logger().debug(e, exc_info=True)
+            pass
+        finally:
+            if self.conn is not None:
+                self.conn.close()
+                self.conn = None
+        return success

{pkdevtools-0.13.20250213.233 → pkdevtools-0.13.20250214.235}/PKDevTools/classes/NSEMarketStatus.py

@@ -86,7 +86,7 @@ class NSEMarketStatus(SingletonMixin, metaclass=SingletonType):
         return shouldFetch, next_bell, filePath, modifiedDateTime
 
     def getNextBell(self):
-        if not 'pytest' in sys.modules:
+        if 'unittest' in sys.modules or any("pytest" in arg for arg in sys.argv):
             return '2025-02-14T09:15:00+05:30'
 
         next_bell = self.marketStatus.get("next_bell")

pkdevtools-0.13.20250214.235/PKDevTools/classes/__init__.py

@@ -0,0 +1 @@
+VERSION='0.13.20250214.235'

{pkdevtools-0.13.20250213.233 → pkdevtools-0.13.20250214.235}/PKDevTools.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250213.233
+Version: 0.13.20250214.235
 Summary: A general day-to-day toolset for PKScreener repos
 Home-page: https://github.com/pkjmesra/PKDevTools
-Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250213.233.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250214.235.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

{pkdevtools-0.13.20250213.233 → pkdevtools-0.13.20250214.235}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250213.233
+Version: 0.13.20250214.235
 Summary: A general day-to-day toolset for PKScreener repos
 Home-page: https://github.com/pkjmesra/PKDevTools
-Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250213.233.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250214.235.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

pkdevtools-0.13.20250213.233/PKDevTools/classes/__init__.py

@@ -1 +0,0 @@
-VERSION='0.13.20250213.233'