expire shared drive function

Author: mikeseibel

endorsement/dao/shared_drive.py

@@ -84,12 +84,15 @@ def sync_quota_from_subscription(drive_id):
         raise SharedDriveRecordNotFound(drive_id)
 
 
-def expire_shared_drives(gracetime, lifetime):
-    """
-    Expire shared drives that have exceeded their lifetime.
-    """
-    for drive in shared_drives_to_expire(gracetime, lifetime):
-        shared_drive_lifecycle_expired(drive)
+def expire_shared_drive(shared_drive_record):
+    try:
+        shared_drive_lifecycle_expired(shared_drive_record.shared_drive)
+        shared_drive_record.datetime_deleted = timezone.now()
+        shared_drive_record.save()
+    except DataFailureException as ex:
+        logger.error(
+            "Cannot expire drive "
+            f"{shared_drive_record.shared_drive.drive_id} : {ex}")
 
 
 def shared_drive_lifecycle_expired(shared_drive):

endorsement/management/commands/expire_shared_drives.py

@@ -2,10 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from django.core.management.base import BaseCommand
-from django.utils import timezone
 from restclients_core.exceptions import DataFailureException
 from endorsement.policy.shared_drive import SharedDrivePolicy
-from endorsement.dao.shared_drive import shared_drive_lifecycle_expired
+from endorsement.dao.shared_drive import (
+    shared_drive_lifecycle_expired, expire_shared_drive)
 import csv
 import logging
 
@@ -52,16 +52,7 @@ def handle(self, *args, **options):
                         f'"{record.shared_drive.drive_name}"')
 
             if actually_mark_for_deletion:
-                self.expire_drive(record)
-
-    def expire_drive(self, record):
-        try:
-            shared_drive_lifecycle_expired(record.shared_drive)
-            record.datetime_deleted = timezone.now()
-            record.save()
-        except DataFailureException as ex:
-            logger.error(
-                "Cannot expire drive {record.shared_drive.drive_id} : {ex}")
+                expire_shared_drive(record)
 
     def _record_csv(self, record):
         self.drive_writer.writerow([