Merge pull request #224 from pulsar-edit/compact-query

Modularize Query Parameters
pulsar-edit · Jan 13, 2024 · 94648cf · 94648cf
2 parents a0079c6 + 3180ec9
commit 94648cf
Show file tree

Hide file tree

Showing 41 changed files with 689 additions and 530 deletions.
diff --git a/scripts/parameters/auth.js b/scripts/parameters/auth.js
diff --git a/scripts/parameters/direction.js b/scripts/parameters/direction.js
diff --git a/scripts/parameters/engine.js b/scripts/parameters/engine.js
diff --git a/scripts/parameters/fileExtension.js b/scripts/parameters/fileExtension.js
diff --git a/scripts/parameters/login.js b/scripts/parameters/login.js
diff --git a/scripts/parameters/packageName.js b/scripts/parameters/packageName.js
diff --git a/scripts/parameters/page.js b/scripts/parameters/page.js
diff --git a/scripts/parameters/query.js b/scripts/parameters/query.js
diff --git a/scripts/parameters/service.js b/scripts/parameters/service.js
diff --git a/scripts/parameters/serviceType.js b/scripts/parameters/serviceType.js
diff --git a/scripts/parameters/serviceVersion.js b/scripts/parameters/serviceVersion.js
diff --git a/scripts/parameters/sort.js b/scripts/parameters/sort.js
diff --git a/scripts/parameters/versionName.js b/scripts/parameters/versionName.js
diff --git a/src/context.js b/src/context.js
@@ -6,7 +6,7 @@ module.exports = {
   database: require("./database.js"),
   webhook: require("./webhook.js"),
   server_version: require("../package.json").version,
-  query: require("./query.js"),
+  query: require("./query_parameters/index.js").logic,
   vcs: require("./vcs.js"),
   config: require("./config.js").getConfig(),
   utils: require("./utils.js"),

diff --git a/src/controllers/getOwnersOwnerName.js b/src/controllers/getOwnersOwnerName.js
@@ -23,7 +23,7 @@ module.exports = {
   params: {
     page: (context, req) => { return context.query.page(req); },
     sort: (context, req) => { return context.query.sort(req); },
-    direction: (context, req) => { return context.query.dir(req); },
+    direction: (context, req) => { return context.query.direction(req); },
     owner: (context, req) => { return context.query.owner(req); }
   },
 

diff --git a/src/controllers/getPackages.js b/src/controllers/getPackages.js
@@ -27,7 +27,7 @@ module.exports = {
   params: {
     page: (context, req) => { return context.query.page(req); },
     sort: (context, req) => { return context.query.sort(req); },
-    direction: (context, req) => { return context.query.dir(req); },
+    direction: (context, req) => { return context.query.direction(req); },
     serviceType: (context, req) => { return context.query.serviceType(req); },
     service: (context, req) => { return context.query.service(req); },
     serviceVersion: (context, req) => { return context.query.serviceVersion(req); },

diff --git a/src/controllers/getPackagesSearch.js b/src/controllers/getPackagesSearch.js
@@ -19,7 +19,7 @@ module.exports = {
   params: {
     sort: (context, req) => { return context.query.sort(req); },
     page: (context, req) => { return context.query.page(req); },
-    direction: (context, req) => { return context.query.dir(req); },
+    direction: (context, req) => { return context.query.direction(req); },
     query: (context, req) => { return context.query.query(req); }
   },
 

diff --git a/src/controllers/getThemes.js b/src/controllers/getThemes.js
@@ -27,7 +27,7 @@ module.exports = {
   params: {
     page: (context, req) => { return context.query.page(req); },
     sort: (context, req) => { return context.query.sort(req); },
-    direction: (context, req) => { return context.query.dir(req); }
+    direction: (context, req) => { return context.query.direction(req); }
   },
 
   /**

diff --git a/src/controllers/getThemesSearch.js b/src/controllers/getThemesSearch.js
@@ -27,7 +27,7 @@ module.exports = {
   params: {
     sort: (context, req) => { return context.query.sort(req); },
     page: (context, req) => { return context.query.page(req); },
-    direction: (context, req) => { return context.query.dir(req); },
+    direction: (context, req) => { return context.query.direction(req); },
     query: (context, req) => { return context.query.query(req); }
   },