Merge pull request #2868 from uselagoon/feature/facts-limit

uselagoon · Oct 20, 2021 · 4799ad0 · 4799ad0
2 parents 93bae42 + 1a1530a
commit 4799ad0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/services/api/src/resources/fact/resolvers.ts b/services/api/src/resources/fact/resolvers.ts
@@ -8,7 +8,7 @@ import { logger } from '../../loggers/logger';
 
 export const getFactsByEnvironmentId: ResolverFn = async (
   { id: environmentId, environmentAuthz },
-  { keyFacts },
+  { keyFacts, limit },
   { sqlClientPool, hasPermission }
 ) => {
   const environment = await environmentHelpers(
@@ -25,7 +25,8 @@ export const getFactsByEnvironmentId: ResolverFn = async (
     sqlClientPool,
     Sql.selectFactsByEnvironmentId({
       environmentId,
-      keyFacts
+      keyFacts,
+      limit
     })
   );
 

diff --git a/services/api/src/resources/fact/sql.ts b/services/api/src/resources/fact/sql.ts
@@ -21,7 +21,7 @@ export const Sql = {
       .where('f.id', fid)
       .orderBy('f.id', 'asc')
       .toString(),
-  selectFactsByEnvironmentId: ({ environmentId, keyFacts }) => {
+  selectFactsByEnvironmentId: ({ environmentId, keyFacts, limit }) => {
     let q = knex('environment_fact as f')
       .distinct(standardFactReturn)
       .leftJoin('environment_fact_reference as r', 'r.fid', '=', 'f.id')
@@ -31,6 +31,10 @@ export const Sql = {
       q.where('f.keyFact', keyFacts);
     }
 
+    if (limit) {
+      q.limit(limit);
+    }
+
     return q.orderBy('f.id', 'asc').toString()
   },
   insertFact: ({ environment, name, value, source, description, type, category, keyFact }) =>

diff --git a/services/api/src/typeDefs.js b/services/api/src/typeDefs.js
@@ -797,7 +797,7 @@ const typeDefs = gql`
     advancedTasks: [AdvancedTaskDefinition]
     services: [EnvironmentService]
     problems(severity: [ProblemSeverityRating], source: [String]): [Problem]
-    facts(keyFacts: Boolean): [Fact]
+    facts(keyFacts: Boolean, limit: Int): [Fact]
     openshift: Openshift
     openshiftProjectPattern: String
     kubernetes: Kubernetes