diff options
author | rubenwardy <rw@rubenwardy.com> | 2020-06-05 04:29:52 +0100 |
---|---|---|
committer | rubenwardy <rw@rubenwardy.com> | 2020-06-05 04:29:52 +0100 |
commit | c3cef1eed6f3f97f97ba63731b7a506cf25d9cc7 (patch) | |
tree | 2a02eb2f65e82bdd649cacbed831947af0543924 | |
parent | ba8c4d3d245483e49514751851ec49a6aa63109e (diff) | |
download | cheatdb-c3cef1eed6f3f97f97ba63731b7a506cf25d9cc7.tar.xz |
Return package IDs only in dependency API
-rw-r--r-- | app/blueprints/api/endpoints.py | 4 | ||||
-rw-r--r-- | app/models.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/blueprints/api/endpoints.py b/app/blueprints/api/endpoints.py index fc3ba8f..eb92b52 100644 --- 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 11f1b9a..f3e65a2 100644 --- 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 |