Merged in feature/collectorset (pull request #96)

Set Collector

* set

api/queryService/collector_test.go

@@ -10,7 +10,7 @@ import (
 
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/collector"
-	collectorupdate "queryorchestration/internal/collector/update"
+	collectorset "queryorchestration/internal/collector/set"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
 	cleanversion "queryorchestration/internal/document/clean/version"
@@ -31,7 +31,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestUpdateCollector(t *testing.T) {
+func TestSetCollector(t *testing.T) {
 	pool, err := pgxmock.NewPool()
 	require.NoError(t, err)
 	cfg := &struct {
@@ -51,7 +51,7 @@ func TestUpdateCollector(t *testing.T) {
 
 	av := int32(2)
 	cv := int32(1)
-	body := queryservice.CollectorUpdate{
+	body := queryservice.CollectorSet{
 		ActiveVersion:         &av,
 		MinimumCleanerVersion: &cv,
 		Fields: &[]queryservice.CollectorField{
@@ -71,11 +71,10 @@ func TestUpdateCollector(t *testing.T) {
 	ctx := e.NewContext(req, rec)
 
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
-		CollectorUpdate: collectorupdate.New(cfg, &collectorupdate.Services{
-			Collector: collector.New(cfg, &collector.Services{
-				CleanVersion: cleanversion.New(cfg),
-				TextVersion:  textversion.New(cfg),
-			}),
+		CollectorSet: collectorset.New(cfg, &collectorset.Services{
+			CleanVersion: cleanversion.New(cfg),
+			TextVersion:  textversion.New(cfg),
+			Collector:    collector.New(cfg),
 		}),
 	})
 
@@ -114,7 +113,7 @@ func TestUpdateCollector(t *testing.T) {
 		).
 		Return(&sqs.SendMessageOutput{}, nil)
 
-	err = cons.UpdateCollectorByClientId(ctx, current.ClientID)
+	err = cons.SetCollectorByClientId(ctx, current.ClientID)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, rec.Code)
 	assert.Empty(t, rec.Body.String())
@@ -132,10 +131,7 @@ func TestGetCollectorByclientId(t *testing.T) {
 	rec := httptest.NewRecorder()
 	ctx := e.NewContext(req, rec)
 
-	svc := collector.New(cfg, &collector.Services{
-		CleanVersion: cleanversion.New(cfg),
-		TextVersion:  textversion.New(cfg),
-	})
+	svc := collector.New(cfg)
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
 		Collector: svc,
 	})