Fixes how package names are stored.

Closes #315

(cherry picked from commit 5ff0ca6)

Author: decko

CHANGES/315.bugfix

@@ -0,0 +1 @@
+Fixes the name of the package when downloaded using pull-through cache.

pulp_npm/app/models.py

@@ -112,12 +112,16 @@ def content_handler(self, path):
             repository_version = self.repository.latest_version()
 
         content = repository_version.content
-        packages = Package.objects.filter(name=path, pk__in=content)
+        name, version = extract_package_info(path)
+        if name and version:
+            return None
+
+        packages = Package.objects.filter(name=name, pk__in=content)
 
         if not packages:
             return None
 
-        data["name"] = path
+        data["name"] = name
         data["versions"] = {}
         versions = []
 
@@ -140,7 +144,7 @@ def content_handler(self, path):
             )
 
         for package in packages:
-            tarball_url = f"{prefix_url}{package.relative_path.split('/')[-1]}"
+            tarball_url = f"{prefix_url}{package.name}/-/{package.relative_path.split('/')[-1]}"
 
             version = {
                 package.version: {

pulp_npm/app/tasks/synchronizing.py

@@ -104,7 +104,7 @@ async def run(self):
             da = DeclarativeArtifact(
                 artifact=artifact,
                 url=url,
-                relative_path=url.split("/")[-1],
+                relative_path=f"{pkg['name']}/-/{url.split('/')[-1]}",
                 remote=self.remote,
                 deferred_download=self.deferred_download,
             )

pulp_npm/app/utils.py

@@ -28,7 +28,7 @@ def extract_package_info(relative_path):
     Args:
         The relative_path string. "package/-/package-version.tgz"
     """
-    pattern = r"^(?P<name>@?[^/]+(?:/[^/]+)?)/-/(?P<base_name>[^/]+)-(?P<version>[\d.]+)\.tgz$"
+    pattern = r"^(?P<name>@?[^/]+(?:/[^/]+)?)(?:/-/(?P<base_name>[^/]+)-(?P<version>[\d.]+)\.tgz)?$"
     match = re.match(pattern, relative_path)
 
     if match:

pulp_npm/tests/functional/api/test_download_content.py

@@ -57,9 +57,7 @@ def test_download_content(
 
     fixture_hash = hashlib.sha256(http_get(urljoin(NPM_FIXTURE_URL, unit_path))).hexdigest()
 
-    pulp_hash = hashlib.sha256(
-        http_get(urljoin(distribution.base_url, unit_path.split("/")[-1]))
-    ).hexdigest()
+    pulp_hash = hashlib.sha256(http_get(urljoin(distribution.base_url, unit_path))).hexdigest()
 
     assert fixture_hash == pulp_hash