„Licenseserver/health_view/cron.py“ ändern

Licenseserver/health_view/cron.py

@@ -1,29 +1,32 @@
 from health_view.models import *
-from health_view.views import check_expiration_date
-from datetime import datetime
+import health_view.views
 from health_view.crypto_functions import *
 import requests
 import json
 
 
-#needs logindata from admin account form Contentserver
-loginname_restapi = ''
-passwort_restapi = ''
+loginname_restapi = 'gabi'
+passwort_restapi = 'Lolo7138'
 
 
 def check_exp_date():
     licenses = License.objects.all()
-    date_now = datetime.now()
+    print("did it")
     for lic in licenses:
-        if check_expiration_date(lic):
+        if health_view.views.check_expiration_date(lic):
             continue
+        filter_license_and_delete(lic)
+
+
+def filter_license_and_delete(lic):
+    print(lic.justified)
     licenses_same_owner = License.objects.filter(justified=lic.justified, patient=lic.patient).exclude(id=lic.id)
     folderparts = lic.folder_parts.all().values_list()
     parts_to_delete = list()
     for part in folderparts:
         delete = True
         for license in licenses_same_owner:
-                if not check_expiration_date(license):
+            if not health_view.views.check_expiration_date(license):
                 continue
             for check_part in license.folder_parts.all().values_list():
                 if check_part == part:
@@ -32,7 +35,7 @@ def check_exp_date():
             parts_to_delete.append(part[2])
     if not parts_to_delete:
         lic.delete()
-            continue
+        return
     new_total_key = make_encrypted_key_content_server()
     post_content = {
         'patient': lic.patient.username,
@@ -45,7 +48,6 @@ def check_exp_date():
     lic.patient.folderinfo.save()
     lic.delete()
     request = requests.post('http://192.168.192.75:8000/manage/delete/', json=post_content, auth=(loginname_restapi, passwort_restapi))
-
-
+    return