Merged in feature/jobsynced (pull request #72)

Job Status Get and DB tidy up

* initalquery

* tests

* shorttests

* testing queries

* job

* solvedthequery

* updatingdb

* fixingtests

* repotests

* shorttests

* docker

* testspassed

database/queries/result.sql

@@ -1,9 +1,9 @@
 -- name: ListQueryRequirementValues :many
 WITH reqQueries as (
-    SELECT q.id as queryId, av.id as activeVersion, q.type
+    SELECT av.queryId, av.activeVersion, q.type
     FROM requiredQueries as rq
-    JOIN queries as q on q.id = rq.requiredQueryId
-    LEFT JOIN queryCurrentActiveVersions as av on q.id = av.queryId
+    JOIN queryCurrentActiveVersions as av on av.queryId = rq.requiredQueryId
+    JOIN queries as q on q.id = av.queryId
     WHERE rq.queryId = @queryId
         and isInVersion(@version, rq.addedVersion, rq.removedVersion)
 ),
@@ -13,70 +13,72 @@ docs as (
     WHERE id = @documentId
 ),
 codeVersions as (
-    SELECT 
+    SELECT
         d.id as documentId,
-        coalesce(ccv.versionId, 1) as minCleanVersion,
-        coalesce(ctv.versionId, 1) as minTextVersion
+        mcv.minCleanVersion,
+        mtv.minTextVersion
     FROM docs as d
-    LEFT JOIN collectors as c on c.jobId = d.jobId
-    LEFT JOIN collectorCurrentActiveVersions as av on c.id = av.collectorId
-    LEFT JOIN collectorMinCleanVersions AS ccv ON c.id = ccv.collectorId
-        and isInVersion(av.id, ccv.addedVersion, ccv.removedVersion)
-    LEFT JOIN collectorMinTextVersions AS ctv ON c.id = ctv.collectorId
-        and isInVersion(av.id, ctv.addedVersion, ctv.removedVersion)
-    LIMIT 1
+    JOIN currentCollectorMinTextVersions as mtv on mtv.jobId = d.jobId
+    JOIN currentCollectorMinCleanVersions as mcv on mcv.jobId = d.jobId
 ),
 latestVersions AS (
-    SELECT 
+    SELECT
+        r.id,
         rq.queryId,
         rq.type,
         r.queryVersion,
-        r.cleanVersion,
-        r.textVersion,
+        r.textEntryId,
+        r.value,
         ROW_NUMBER() OVER (
-            PARTITION BY rq.queryId
-            ORDER BY r.cleanVersion DESC, r.textVersion DESC
+            PARTITION BY r.queryId
+            ORDER BY r.id DESC
         ) as rowNumber
     FROM reqQueries as rq
+    JOIN currentTextEntries as cte on cte.documentId = @documentId
     LEFT JOIN results as r ON rq.queryId = r.queryId
-        and r.documentId = @documentId
         and r.queryVersion = rq.activeVersion
-    JOIN codeVersions as ccv on ccv.documentId = r.documentId
-        and r.cleanVersion >= ccv.minCleanVersion
-        and r.textVersion >= ccv.minTextVersion
+        and cte.id = r.textEntryId
 )
-SELECT DISTINCT lv.queryId, lv.type, r.value
-FROM latestVersions as lv
-JOIN results as r ON r.queryId = lv.queryId
-    and r.documentId = @documentId
-    and r.queryVersion = lv.queryVersion
-    and r.cleanVersion = lv.cleanVersion
-    and r.textVersion = lv.textVersion
-    and lv.rowNumber = 1;
+SELECT DISTINCT id, queryId, type, value
+FROM latestVersions
+WHERE rowNumber = 1;
 
--- name: SetResult :exec
-INSERT INTO results (queryId, documentId, value, cleanVersion, textVersion, queryVersion) VALUES ($1, $2, $3, $4, $5, $6);
+-- name: AddResult :one
+INSERT INTO results (queryId, value, textEntryId, queryVersion) VALUES ($1, $2, $3, $4) returning id;
+
+-- name: AddResultDependency :exec
+INSERT INTO resultDependencies (resultId, requiredResultId) VALUES ($1, $2);
 
 -- name: GetResultValueWithVersion :one
-SELECT id, value FROM results WHERE queryId = $1 and queryVersion = $2 and documentId = $3 and cleanVersion >= $4 and textVersion >= $5;
+WITH doc as (
+    SELECT id, jobId
+    FROM documents
+    WHERE id = @documentId
+)
+SELECT r.id, r.value
+    FROM doc as d
+    JOIN currentTextEntries as cte on cte.documentId = d.id
+    LEFT JOIN results as r
+        on r.queryId = @queryId
+        and r.queryVersion = @queryVersion
+        and r.textEntryId = cte.id;
 
 -- name: ListUnsyncedNoDepsQueriesByDocId :many
 WITH docs as (
     SELECT id, jobId from documents where id = $1
 ),
 unsyncedQueries AS (
-    SELECT DISTINCT dt.queryId, dt.requiredIds, r.value, d.jobID, d.id
+    SELECT DISTINCT dt.queryId, dt.requiredIds
         from docs as d
         JOIN collectorQueryDependencyTree as dt on d.jobId = dt.jobId
-        JOIN fullActiveCollectors as c on c.id = dt.collectorId
-        LEFT JOIN results as r on r.queryId = dt.queryId
-            and r.documentId = d.id
+        JOIN currentTextEntries as cte on cte.documentId = d.id
+        LEFT JOIN results as r
+            on r.queryId = dt.queryId
             and r.queryVersion = dt.queryVersion
-            and r.cleanVersion >= c.minCleanVersion and r.textVersion >= c.minTextVersion
+            and cte.id = r.textEntryId
         where r.value is null
 )
 SELECT DISTINCT queryId FROM unsyncedQueries as baseuq
     WHERE NOT EXISTS (
         SELECT 1 FROM unsyncedQueries as uq WHERE uq.queryId = any(baseuq.requiredIds)
     );
-