Return package IDs only in dependency API

diff --git a/app/blueprints/api/endpoints.py b/app/blueprints/api/endpoints.py
index fc3ba8f2f5b5e3d6ca9498c20e645a427d7988f1..eb92b52dd792a6e95ee0f4ec02a4a744a1956256 100644 (file)
--- a/app/blueprints/api/endpoints.py
+++ b/app/blueprints/api/endpoints.py
@@ -64,11 +64,11 @@ def package_dependencies(package):
 
                if dep.package:
                        name = dep.package.name
-                       fulfilled_by = [ dep.package.getAsDictionaryKey() ]
+                       fulfilled_by = [ dep.package.getId() ]
 
                elif dep.meta_package:
                        name = dep.meta_package.name
-                       fulfilled_by = [ pkg.getAsDictionaryKey() for pkg in dep.meta_package.packages]
+                       fulfilled_by = [ pkg.getId() for pkg in dep.meta_package.packages]
 
                else:
                        raise "Malformed dependency"

diff --git a/app/models.py b/app/models.py
index 11f1b9a6fe01bf7e6768435d63eda94c0a82ea0c..f3e65a266b9fa08321d51d6ac6ebec3092189c92 100644 (file)
--- a/app/models.py
+++ b/app/models.py
@@ -465,6 +465,9 @@ class Package(db.Model):
                for e in PackagePropertyKey:
                        setattr(self, e.name, getattr(package, e.name))
 
+       def getId(self):
+               return "{}/{}".format(self.author.username, self.name)
+
        def getIsFOSS(self):
                return self.license.is_foss and self.media_license.is_foss