Create queries to return the complete report and the an analysis by id …

…pi2-inspecao-cabo-de-aco#35

migrations/20190510013743_create_association_table_analysis.js

@@ -18,4 +18,4 @@ function down (knex) {
 export {
   up,
   down
-}
+}

migrations/20190525232550_add_cable_to_report.js

@@ -13,4 +13,4 @@ function down (knex) {
 export {
   up,
   down
-}
+}

src/index.js

@@ -56,7 +56,7 @@ async function main () {
       console.log('FTP server is running on ftp://localhost:30003')
       break
     } catch (err) {
-      console.err('Error on creating server.', err)
+      console.log('Error on creating server.', err)
       console.log('Retrying connection...')
       sleep(1000)
     }

src/queries/analysis.js

@@ -10,5 +10,14 @@ export default {
     } catch (err) {
       throw new Error(err.message)
     }
+  },
+  analysis: async (root, { id }, context, info) => {
+    try {
+      let analysis = await knexInstance('analysis')
+        .where({ id })
+      return analysis[0]
+    } catch (err) {
+      throw new Error(err.message)
+    }
   }
 }

src/queries/reports.js

@@ -5,7 +5,6 @@ export default {
     try {
       let report = await knexInstance('reports')
         .where({ id })
-
       return report[0]
     } catch (err) {
       throw new Error(err.message)
@@ -21,5 +20,20 @@ export default {
     } catch (err) {
       throw new Error(err.message)
     }
+  },
+  reportComplete: async (root, { id }, context, info) => {
+    try {
+      let reportComplete = await knexInstance('reports')
+        .select('reports.*')
+        .select(knexInstance.raw('json_agg(analysis.*) as analysis'))
+        .leftJoin('analysis', 'analysis.report_id', 'reports.id')
+        .where('reports.id', id)
+        .groupBy('reports.id')
+        .first()
+
+      return reportComplete
+    } catch (err) {
+      throw new Error(err.message)
+    }
   }
 }

src/type-defs.js

@@ -26,6 +26,7 @@ type Report {
   created_at: DateTime
   updated_at: DateTime
   cable_id: ID
+  analysis: [Analysis]
 }
 
 type Analysis {
@@ -46,11 +47,13 @@ scalar Upload
 
 # Queries
 type Query {
+  analysis (id: ID!): Analysis
   cable (id: ID!): Cable
   cables: [Cable]
   report (id: ID!): Report
   reports (cableId: ID!): [Report]
   reportAnalysis(reportId: ID!): [Analysis]
+  reportComplete (id: ID!): Report
 }
 
 # Mutations