Merge pull request #73 from henilp105/main

fix: critical bug fixes and downloads stats

Author: henilp105

backend/models/package.py

@@ -97,14 +97,15 @@ def from_json(json_data):
         )
 
 class Version:
-    def __init__(self, version, tarball, dependencies, created_at, is_deprecated, download_url, is_verified=False):
+    def __init__(self, version, tarball, dependencies, created_at, oid , is_deprecated, download_url, is_verified=False):
         self.version = version
         self.tarball = tarball
         self.dependencies = dependencies
         self.created_at = created_at
         self.is_deprecated = is_deprecated
         self.download_url = download_url
         self.is_verified = is_verified
+        self.oid = oid
 
     # Create a to_json method.
     def to_json(self):
@@ -116,6 +117,7 @@ def to_json(self):
             "is_deprecated": self.is_deprecated,
             "download_url": self.download_url,
             "is_verified": self.is_verified,
+            "oid": self.oid,
         }
 
     # Create a from_json method.
@@ -129,4 +131,5 @@ def from_json(json_data):
             is_deprecated=json_data.get("is_deprecated"),
             download_url=json_data.get("download_url"),
             is_verified=json_data.get("is_verified"),
+            oid=json_data.get("oid"),
         )

backend/packages.py

@@ -337,6 +337,7 @@ def upload():
             dependencies="Test dependencies",
             created_at=datetime.utcnow(),
             is_deprecated=False,
+            oid= file_object_id,
             download_url=f"/tarballs/{file_object_id}",
         )
 
@@ -383,6 +384,7 @@ def upload():
             dependencies="Test dependencies",
             created_at=datetime.utcnow(),
             is_deprecated=False,
+            oid = file_object_id,
             download_url=f"/tarballs/{file_object_id}",
         )
 
@@ -444,16 +446,12 @@ def serve_gridfs_file(oid):
     try:
         file = file_storage.get(ObjectId(oid))
 
-        package_version_doc = db.packages.update_one(
-            {
-                "versions.oid": oid,
-            },
+        package_version_doc = db.tarballs.files.update_one(
+            {"_id": ObjectId(oid)},
             {
                 "$inc": {
-                    f"downloads_stats.versions.{oid}": 1,
                     "downloads_stats.total_downloads": 1,
-                    f"downloads_stats.dates.{str(datetime.now())[:10]}.{oid}": 1,
-                    f"downloads_stats.dates.{str(datetime.now())[:10]}.total_downloads": 1,
+                    f"downloads_stats.dates.{str(datetime.now())[:10]}": 1,
                 }
             },
         )
@@ -513,13 +511,46 @@ def get_package(namespace_name, package_name):
         ratings = 0
         rating_count = {}
 
+    # package_obj.downloads_stats Data Model
+    # downloads_stats:
+    #     total_downloads:1
+    #     versions:
+    #         oid1:1 
+    #         oid2:1
+    #     dates:
+    #         date1:
+    #             oid1:1
+    #             oid2:1
+    #             total_downloads:1
+    
+    downloads_stats = dict()
+    downloads_stats['versions'] = dict()
+    downloads_stats['dates'] = dict()
+    downloads_stats['total_downloads'] = 0
+    try:
+        for i in package_obj.versions:
+            version_oid =  db.tarballs.files.find_one({"_id": ObjectId(i.oid)})
+            downloads_stats['versions'][str(i.oid)] = version_oid['downloads_stats']['total_downloads']
+            downloads_stats['total_downloads'] += version_oid['downloads_stats']['total_downloads']
+            for DATE_VALUE in version_oid['downloads_stats']['dates']:
+                downloads_stats['dates'][DATE_VALUE] = dict()
+                downloads_stats['dates'][DATE_VALUE][str(i.oid)] = version_oid['downloads_stats']['dates'][DATE_VALUE]
+            for i in downloads_stats['dates']:
+                downloads_stats['dates'][i]['total_downloads'] = sum(downloads_stats['dates'][i].values())
+    except:
+        downloads_stats = dict()
+
     version_history = [{k: v for k, v in i.items() if k != 'tarball'} for i in package_obj.to_json()["versions"]]
+    latest_version_data = package_obj.versions[-1].to_json()
+    latest_version_data['oid'] = str(latest_version_data['oid'])
+    for i in version_history:
+        i['oid'] = str(i['oid'])
 
     # Only latest version of the package will be sent as a response.
     package_response_data = {
         "name": package_obj.name,
         "namespace": namespace_obj.namespace,
-        "latest_version_data": package_obj.versions[-1].to_json(),
+        "latest_version_data": latest_version_data,
         "author": package_author_obj.username,
         "keywords": package_obj.keywords if package_obj.keywords else [],
         "categories": package_obj.categories if package_obj.categories else [],
@@ -529,10 +560,9 @@ def get_package(namespace_name, package_name):
         "updated_at": package_obj.updated_at,
         "description": package_obj.description,
         "ratings": ratings,
-        "downloads": package_obj.downloads_stats,
+        "downloads": downloads_stats,
         "ratings_count": rating_count
     }
-
     return jsonify({"data": package_response_data, "code": 200})
 
 
@@ -617,7 +647,8 @@ def get_package_from_version(namespace_name, package_name, version):
         version_data = next(
             filter(lambda obj: obj.version == version, version_history), None
         )
-
+        version_history = version_data.to_json()
+        version_history['oid'] = str(version_history['oid'])
         # Only queried version should be sent as response.
         package_response_data = {
             "name": package_obj.name,
@@ -627,7 +658,7 @@ def get_package_from_version(namespace_name, package_name, version):
             "categories": package_obj.categories,
             "license": package_obj.license,
             "created_at": package_obj.created_at,
-            "version_data": version_data.to_json(),
+            "version_data": version_history,
             "updatedAt": package_obj.updated_at,
             "description": package_obj.description,
         }

backend/requirements.txt

@@ -10,3 +10,4 @@ semantic-version
 docker
 toml
 flask-jwt-extended
+numpy

backend/tests/test_packages.py

@@ -321,7 +321,7 @@ def test_get_existing_package_version(self):
             f"/packages/{self.test_namespace_data['namespace']}/{self.test_package_data['package_name']}/0.0.1"
         )
 
-        self.assertEqual(200, response.json["code"]) # TODO: Check after fixing : get_package_from_version 608
+        self.assertEqual(200, response.json["code"])
         print("test_get_existing_package_version passed")
 
     def test_package_invalid_license(self):

backend/validate.py

@@ -151,6 +151,7 @@ def validate() -> None:
                         update_data[k] = f"{k} not provided."
 
                 db.packages.update_one({"name": package['name'],"namespace":package['namespace']}, {"$set": update_data})
+                print(f"Package {packagename} verified successfully.")
 
 
 validate()

frontend/src/pages/package.js

@@ -82,6 +82,8 @@ const PackagePage = () => {
         v{data.latest_version_data.version} Published{" "}
         {updatedDays(data.updated_at)} days ago
       </p>
+      <p>
+      </p>
       <MDBTabs className="mb-3">
         <MDBTabsItem>
           <MDBTabsLink
@@ -252,10 +254,9 @@ const ViewPackageMaintainersButton = ({
 const sideBar = (data, setShowReportForm) => {
   return (
     <MDBCol size="3">
-      <p style={{ fontSize: 16, textAlign: "left" }}>Install</p>
-      <code>
-        fpm install {data.namespace}/{data.name}
-      </code>
+      <p style={{ fontSize: 16, textAlign: "left" }}>Install (add to fpm.toml)</p>
+      <p style={{ fontSize: 14, textAlign: "left" }}><code>{data.name} = {"{"}{"'namespace'"}: {"'"}{data.namespace}{"'}"}</code> </p>
+      <hr></hr>
       <p style={{ fontSize: 16, textAlign: "left" }}>Repository</p>
       <Container> {data.repository}</Container>
       <hr></hr>