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

api/queryService/job_test.go

@@ -57,22 +57,17 @@ func TestCreateJob(t *testing.T) {
 	ctx := e.NewContext(req, rec)
 
 	id := uuid.New()
-	collId := uuid.New()
 
 	pool.ExpectQuery("name: CreateJob :one").WithArgs(database.MustToDBUUID(body.ClientId)).WillReturnRows(
 		pgxmock.NewRows([]string{"id"}).
 			AddRow(database.MustToDBUUID(id)),
 	)
 	pool.ExpectBeginTx(pgx.TxOptions{})
-	pool.ExpectQuery("name: CreateCollector :one").WithArgs(database.MustToDBUUID(id)).WillReturnRows(
-		pgxmock.NewRows([]string{"id"}).
-			AddRow(database.MustToDBUUID(collId)),
-	)
-	pool.ExpectQuery("name: AddLatestCollectorVersion :one").WithArgs(database.MustToDBUUID(collId)).WillReturnRows(
+	pool.ExpectQuery("name: AddLatestCollectorVersion :one").WithArgs(database.MustToDBUUID(id)).WillReturnRows(
 		pgxmock.NewRows([]string{"version"}).
 			AddRow(int32(1)),
 	)
-	pool.ExpectExec("name: SetActiveCollectorVersion :exec").WithArgs(database.MustToDBUUID(collId), int32(1)).
+	pool.ExpectExec("name: SetActiveCollectorVersion :exec").WithArgs(database.MustToDBUUID(id), int32(1)).
 		WillReturnResult(pgxmock.NewResult("", 1))
 	pool.ExpectCommit()
 
@@ -117,6 +112,10 @@ func TestGetJob(t *testing.T) {
 			pgxmock.NewRows([]string{"id", "name", "canSync"}).
 				AddRow(database.MustToDBUUID(j.ClientID), "client_name", true),
 		)
+	pool.ExpectQuery("name: IsJobSynced :one").WithArgs(database.MustToDBUUID(j.ID)).WillReturnRows(
+		pgxmock.NewRows([]string{"issynced"}).
+			AddRow(true),
+	)
 
 	err = cons.GetJob(ctx, j.ID)
 	assert.NoError(t, err)
@@ -129,6 +128,7 @@ func TestGetJob(t *testing.T) {
 		Id:       j.ID,
 		ClientId: j.ClientID,
 		CanSync:  j.CanSync,
+		Status:   queryservice.INSYNC,
 	}, res)
 }