Merge pull request #74 from henilp105/main

fix: validation bugs

Author: henilp105

backend/check_digests.py

@@ -48,8 +48,11 @@ def check_digests(file_path: str) -> Tuple[int, bool]:
 
     # Initialize error count
     error_count: int = 0
-    with open(f'{file_path}model.json', 'r') as file:
-        model = json.load(file)
+    try:
+        with open(f'{file_path}fpm_model.json', 'r') as file:
+            model = json.load(file)
+    except:
+        return (-1, "Error reading model file.")
 
     src_data: dict = model['packages'][model['package-name']] 
     s = set()
@@ -62,7 +65,7 @@ def check_digests(file_path: str) -> Tuple[int, bool]:
 
         try:
             # Read the content of the file
-            with open(file_name, 'r',newline='') as file:
+            with open(f"{file_path}{file_name}", 'r',newline='') as file:
                 file_content: str = file.read()
         except:
             return (-1, "Error reading file content.")

backend/validate.py

@@ -77,7 +77,8 @@ def process_package(packagename: str) -> Tuple[bool, Union[dict, None], str]:
 
     # Clean up
     cleanup_command = f'rm -rf static/temp/{packagename} static/temp/{packagename}.tar.gz'
-    run_command(cleanup_command)
+    # run_command(cleanup_command)
+    print(result)
 
     if result[0]==-1:
         # Package verification failed 
@@ -99,11 +100,11 @@ def validate() -> None:
         None
     """
     # packages = db.packages.find({"versions": {"$elemMatch": {"isVerified": False}}}) # find packages with unverified versions
-    packages = db.packages.find({"isVerified": False})
+    packages = db.packages.find({"is_verified": False})
     packages = list(packages)
     for  package in packages:
         for i in package['versions']:
-            if 'isVerified' in i.keys() and i['isVerified'] == False:
+            if 'is_verified' in i.keys() and i['is_verified'] == False:
                 try:
                     tarball = file_storage.get(ObjectId(i['oid']))
                 except NoFile:
@@ -118,6 +119,7 @@ def validate() -> None:
                     update_data['isVerified'] = False
                     update_data['unabletoVerify'] = True
                     print("Package tests failed for " + packagename)
+                    print(result)
                 else:
                     print("Package tests success for " + packagename)
                     update_data['isVerified'] = True