Merged in feature/collectorset (pull request #96)

Set Collector

* set

api/queryService/api.gen.go

@@ -108,8 +108,8 @@ type CollectorField struct {
 	QueryId openapi_types.UUID `json:"query_id"`
 }
 
-// CollectorUpdate Payload for updating a Collector.
-type CollectorUpdate struct {
+// CollectorSet Payload for updating a Collector.
+type CollectorSet struct {
 	// ActiveVersion The active version of the collector.
 	ActiveVersion *int32 `json:"active_version,omitempty"`
 
@@ -276,8 +276,8 @@ type CreateClientJSONRequestBody = ClientCreate
 // UpdateClientJSONRequestBody defines body for UpdateClient for application/json ContentType.
 type UpdateClientJSONRequestBody = ClientUpdate
 
-// UpdateCollectorByClientIdJSONRequestBody defines body for UpdateCollectorByClientId for application/json ContentType.
-type UpdateCollectorByClientIdJSONRequestBody = CollectorUpdate
+// SetCollectorByClientIdJSONRequestBody defines body for SetCollectorByClientId for application/json ContentType.
+type SetCollectorByClientIdJSONRequestBody = CollectorSet
 
 // TriggerExportJSONRequestBody defines body for TriggerExport for application/json ContentType.
 type TriggerExportJSONRequestBody = ExportTrigger
@@ -305,9 +305,9 @@ type ServerInterface interface {
 	// Get a collector by client ID
 	// (GET /client/{id}/collector)
 	GetCollectorByClientId(ctx echo.Context, id openapi_types.UUID) error
-	// Update a collector
+	// Set a collector
 	// (PATCH /client/{id}/collector)
-	UpdateCollectorByClientId(ctx echo.Context, id openapi_types.UUID) error
+	SetCollectorByClientId(ctx echo.Context, id openapi_types.UUID) error
 	// List the documents for a client
 	// (GET /client/{id}/documents)
 	ListDocumentsByClientId(ctx echo.Context, id openapi_types.UUID) error
@@ -399,8 +399,8 @@ func (w *ServerInterfaceWrapper) GetCollectorByClientId(ctx echo.Context) error
 	return err
 }
 
-// UpdateCollectorByClientId converts echo context to params.
-func (w *ServerInterfaceWrapper) UpdateCollectorByClientId(ctx echo.Context) error {
+// SetCollectorByClientId converts echo context to params.
+func (w *ServerInterfaceWrapper) SetCollectorByClientId(ctx echo.Context) error {
 	var err error
 	// ------------- Path parameter "id" -------------
 	var id openapi_types.UUID
@@ -411,7 +411,7 @@ func (w *ServerInterfaceWrapper) UpdateCollectorByClientId(ctx echo.Context) err
 	}
 
 	// Invoke the callback with all the unmarshaled arguments
-	err = w.Handler.UpdateCollectorByClientId(ctx, id)
+	err = w.Handler.SetCollectorByClientId(ctx, id)
 	return err
 }
 
@@ -577,7 +577,7 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 	router.GET(baseURL+"/client/:id", wrapper.GetClient)
 	router.PATCH(baseURL+"/client/:id", wrapper.UpdateClient)
 	router.GET(baseURL+"/client/:id/collector", wrapper.GetCollectorByClientId)
-	router.PATCH(baseURL+"/client/:id/collector", wrapper.UpdateCollectorByClientId)
+	router.PATCH(baseURL+"/client/:id/collector", wrapper.SetCollectorByClientId)
 	router.GET(baseURL+"/client/:id/documents", wrapper.ListDocumentsByClientId)
 	router.GET(baseURL+"/client/:id/export", wrapper.ExportState)
 	router.POST(baseURL+"/client/:id/export", wrapper.TriggerExport)
@@ -593,47 +593,47 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"H4sIAAAAAAAC/+RbX3PbuBH/Khi2jxrJudyT3nK2k1EntVNH6Vzn6tFA4ErCBQJoAJStevTdO/hDkBRB",
-	"ipYlJ52+mSKwf3+7WOzSzwkR60xw4Fol4+dEkRWssf3zklHg+lIC1mCeMykykJqCfcvx2v6agiKSZpoK",
-	"noyT6QoQsfuQXTBI9DaDZJwoLSlfJrvdIJHwkFMJaTL+w1G5D6vE/E8gOtkNPPOvGutcNdl8zYDQBQWF",
-	"9AqQsquQWCDsmQ+TQQI8XxsWk5vZ13/dXCaD5OZ2av+8vqo8TG4+VQQoxKwL8JtIt00LOFYzmnaagabJ",
-	"IFkIucY6GSd5bp8b3FRQ9K8SFsk4+cuo9MvIO2VUM8q+KUtxArl2w37L0qhXCeYzteWkqdJkYW1daKUQ",
-	"Zkw8Ur5EmGi6AWS2qVK3uRAMMDcsj4dKU3rBGBAtZJNeeIXWIgVmIFDXzck524BUdkdMIK+LX2MgZZUu",
-	"SA+rvqRcv/+lFJtyDUuQRsoDyJhcFYSxUoJQrCGtAPcgWBYUWKritN07RHlTcKphfRhixY6PhlBS+gBL",
-	"ibfmmWENSneb0a15rRnXlNN1vp4RAySQ3Sz94sBzIaRlmgqSrw3IPJUX8tbwpI9jbHaiDEvVk2dHOHuH",
-	"t1ukRd6Gswb7QXDfFWMOAu0wQ2V8Ba1rPu57YohcZ7n2RM2yYQz2DznIbWtQ2beIpkivsEaPlDGUiSw3",
-	"BrCCSVA56xNfsROqwrzTYmVarQv4BW+ZwKm1Um7W2LyJLtuN9XbJ6sdmk/+7GG+A50oQdya/0Wl8knrl",
-	"NNWfpe1XBl3v4zayDm6aaJ6T76Djorh3iAiuMeXGOFWwxNRqs00AWD/rfIdtnE6G9QppcUCOmJW8no52",
-	"zETXT5mQ+go0pkx1ZyCwS5GWdLkEaTJjJriCZhLqW+EiCQxb2HndHIdexYzL/TMmCNbt9YR/azLR44qS",
-	"VYUL+g/N0IIycEl/Dmghcp7aK8ATXmfM8ns/Ho2enRFnBnG70TM8aZAcs1lQczfabrfb9TpNzVtD3Pw4",
-	"JGrzb3581e4887qqvUYjDi2hFJ2zYBVDDFT1ImREY6DBsKJ8lkmxlKBMklhgyiCNXoMc46mDSjesPJ5s",
-	"EuIVCNQxZY+U2YIyDTKiykf7wl3riMgAzbGCFJmca6sDXypsMMuddr3OIXv8ONKxQ4jyJSgjwDFyhc3m",
-	"IMBrMPubagNPZ/HawNXLSiPz2hzigeCwBXNSt5KiCi2o7EmseRrFzqeq7VrM4qoZIli+5s0kInhKi9Du",
-	"6aTLsKcoUGbtJ455UxQ/DiSUm3Kw3YYOPXFq7h3KFSxyVuQzB4sa3BpE66DaC/OKDoOKRYIo992Gv6za",
-	"sCP2nfqL4JTAqZYIGCg10yts+C9te0cWj4QJBenMFCxyg1kySEQGvPrMYKFnzWWSLlex3yknLE/BJmP3",
-	"VyzLTNK/g1J4GelIxA6fb5w+5IBoClzTBQXpjjWuqd6+vMJvKeo/U6WLukN1lwVlhRwu8b3SUihrIjnJ",
-	"sP9HDtKboW6Uh/JFXSqzy8SCX9BbEsNpexDFBduYuRyFhqTH32Psjatvw0XwBV3GekLm91y64qGo2gPl",
-	"XvVfHGxxCduKnON7Ji+xQuGq2UF4FCv9rXlyVUfKQX32weqee0BsahZGC1xLotGfaJiuFXptfeqXQYPD",
-	"Ywc8/lcNbHe3Wm4KSt+BPTCb5itSXPQSUDYywwXJHJgGxniJKVf9rgCut9IaHP+MRIThkytwfjMnPV8e",
-	"02SrarcvxwF7uTtT02D2QG8qcWfbT3s6gDNQ9/HkCLZL45HRNSAxOxsJpagG/vb19mZ2/fv07sPl9PYu",
-	"GSSXtzfT69+ns4/fPn+OntaWb9sE4VDCd/vSvaT/yjxfECUvzPeHA7qgzM4S2JEK3F5HFqIpyYcvkxBm",
-	"df2sP9CtJCtQ2uuuQG4ocRWAptpegmPrPnyZmCq08FbybngxvLD38gw4zmgyTt4PL4bvTVmP9coqOSJl",
-	"v0qoSPPF5WKFsM2nvk3wSLW7tmdSbGgKKUpds2Loqkwn0CQN+31XzHkJlC6mcERw7dnjLGPUtQZGfyoH",
-	"N5cO+43S/KGxq8ecljnYH1yMW51/uXh3Mt5ltWsZ79nOWYtYyVKkckJAqUXO2HZo/PLrxUUkEfMNZrYP",
-	"Yy2F5iI1q811MV+vsSnMvFFrPjHYwEtlsoAfLTrUJPdmq3fz6JmmO8NyGeuz3YGWFDbW2colHVJ4fL5F",
-	"VCs0uWp6+BPointrdr44mZ3Lzmq7nQMG+5q2esmvG/gT6DCANrpPrjrsa8KpIJSM/+geE3qaWiDpzW2T",
-	"jllogrJooo5dJVUH8qBirEP3onsb5GTVlgaVa+xQe97W4tpgqjWc3eY3CGd/JvUK54irPSRyn/JPF3pO",
-	"rgCO/mE3ItV59wsCMMzCfQx6X7WFYrH8t60TaJKeMy7LIX4sLoPovUMzZnIfjFU7BBtU7V8seFFkBkrx",
-	"secPD8ygde/YbAHAGQJ1b1TaK1Z/7fra45zhGoDaiZj9oE2rXaMDQWvAU9SWZTtpvq3m/VjU1rpTbxO2",
-	"9YZYx5Ea1DCKvc4V9j6ta602E3KRTBoke2UkB0ZniuR9sLg5SStSLldAvjuYkFxKI6yd7Niv3apTljo8",
-	"ynkRnBMS9aFjBBJuAVphheYAHIUZ1HFZ3VqjNuEaViDglT6uxioteZ70Hb0oTTjV1Obvyjwzk8IksqZT",
-	"/RTOqXmm/Fyf9/1MF6Pr2tT6pAnfq1sGVAeo9uO3nAH3yPRqy0nxuWqvysx/f/o2Zdn+F6/tKd6rcOLL",
-	"kzdFxUivu0CF7xPOmMofirHHweKc1Ucz1cG2HS0TSTVIiuNnfTEKOvP5XrCJuP7DvgancLs93x+CboWz",
-	"baeq5usefSbXkXtxm8kNrs6TTauTiZ8pl7pO4Jl7TA/esC1ODdFzRIPJubq7v1T69Uzx4membdY9eWcp",
-	"KF27wTZDpX/NExrjP/rGWgndHrfVs0fsK/tIzv9nvJe+KLJGuhjs/TTAiCbz6ycgucvmdoIoc+7+pact",
-	"r9c/t9orlUHps8OkOjjtj5VT8/eDyEgemloz+u/eX1Uf24nuQdiZPSA3cYB9kSLNSZhNgUwGSS5ZMk5W",
-	"WmdqPBrhjA79F5tDItajzbvEoMVz26d3W/hbua9PIUVa+JJPlWitl427QU8yRZOnSmm/8dOXWNkOCrQa",
-	"zYq+tMpSyVOq+aAvFXfJqVCpX3J297v/BgAA//8NIKB+FzgAAA==",
+	"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",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

api/queryService/client_test.go

@@ -10,16 +10,12 @@ import (
 
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/client"
-	"queryorchestration/internal/collector"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
-	cleanversion "queryorchestration/internal/document/clean/version"
-	textversion "queryorchestration/internal/document/text/version"
 	"queryorchestration/internal/serviceconfig"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v5"
 	"github.com/labstack/echo/v4"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -35,12 +31,7 @@ func TestCreateClient(t *testing.T) {
 	cfg.DBQueries = repository.New(pool)
 
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
-		Client: client.New(cfg, &client.Services{
-			Collector: collector.New(cfg, &collector.Services{
-				TextVersion:  textversion.New(cfg),
-				CleanVersion: cleanversion.New(cfg),
-			}),
-		}),
+		Client: client.New(cfg),
 	})
 
 	body := queryservice.ClientCreate{
@@ -61,14 +52,6 @@ func TestCreateClient(t *testing.T) {
 		pgxmock.NewRows([]string{"id"}).
 			AddRow(database.MustToDBUUID(id)),
 	)
-	pool.ExpectBeginTx(pgx.TxOptions{})
-	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(id), int32(1)).
-		WillReturnResult(pgxmock.NewResult("", 1))
-	pool.ExpectCommit()
 
 	err = cons.CreateClient(ctx)
 	assert.NoError(t, err)
@@ -85,12 +68,7 @@ func TestGetClient(t *testing.T) {
 	cfg.DBQueries = repository.New(pool)
 
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
-		Client: client.New(cfg, &client.Services{
-			Collector: collector.New(cfg, &collector.Services{
-				TextVersion:  textversion.New(cfg),
-				CleanVersion: cleanversion.New(cfg),
-			}),
-		}),
+		Client: client.New(cfg),
 	})
 
 	e := echo.New()
@@ -130,12 +108,7 @@ func TestUpdateClient(t *testing.T) {
 	cfg.DBQueries = repository.New(pool)
 
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
-		Client: client.New(cfg, &client.Services{
-			Collector: collector.New(cfg, &collector.Services{
-				TextVersion:  textversion.New(cfg),
-				CleanVersion: cleanversion.New(cfg),
-			}),
-		}),
+		Client: client.New(cfg),
 	})
 
 	cs := false

api/queryService/collector.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	collectorupdate "queryorchestration/internal/collector/update"
+	collectorset "queryorchestration/internal/collector/set"
 
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
@@ -37,8 +37,8 @@ func (s *Controllers) GetCollectorByClientId(ctx echo.Context, clientId types.UU
 	})
 }
 
-func (s *Controllers) UpdateCollectorByClientId(ctx echo.Context, clientId types.UUID) error {
-	req := CollectorUpdate{}
+func (s *Controllers) SetCollectorByClientId(ctx echo.Context, clientId types.UUID) error {
+	req := CollectorSet{}
 	if err := ctx.Bind(&req); err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
@@ -52,7 +52,7 @@ func (s *Controllers) UpdateCollectorByClientId(ctx echo.Context, clientId types
 		fields = &fs
 	}
 
-	err := s.svc.CollectorUpdate.UpdateByClientId(ctx.Request().Context(), &collectorupdate.UpdateParams{
+	err := s.svc.CollectorSet.SetByClientId(ctx.Request().Context(), &collectorset.SetParams{
 		ClientID:        clientId,
 		ActiveVersion:   req.ActiveVersion,
 		MinCleanVersion: req.MinimumCleanerVersion,

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,
 	})

api/queryService/controllers.go

@@ -3,7 +3,7 @@ package queryservice
 import (
 	"queryorchestration/internal/client"
 	"queryorchestration/internal/collector"
-	collectorupdate "queryorchestration/internal/collector/update"
+	collectorset "queryorchestration/internal/collector/set"
 	"queryorchestration/internal/document"
 	"queryorchestration/internal/export"
 	"queryorchestration/internal/query"
@@ -16,14 +16,14 @@ import (
 const Name = "queryService"
 
 type Services struct {
-	Export          *export.Service
-	Collector       *collector.Service
-	CollectorUpdate *collectorupdate.Service
-	Query           *query.Service
-	QueryUpdate     *queryupdate.Service
-	QueryTest       *querytest.Service
-	Client          *client.Service
-	Document        *document.Service
+	Export       *export.Service
+	Collector    *collector.Service
+	CollectorSet *collectorset.Service
+	Query        *query.Service
+	QueryUpdate  *queryupdate.Service
+	QueryTest    *querytest.Service
+	Client       *client.Service
+	Document     *document.Service
 }
 
 type Controllers struct {

api/queryService/query_test.go

@@ -13,8 +13,6 @@ import (
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
 	"queryorchestration/internal/document"
-	cleanversion "queryorchestration/internal/document/clean/version"
-	textversion "queryorchestration/internal/document/text/version"
 	"queryorchestration/internal/query"
 	"queryorchestration/internal/query/result"
 	querytest "queryorchestration/internal/query/test"
@@ -230,10 +228,7 @@ func TestTestQuery(t *testing.T) {
 	cfg.DBQueries = repository.New(pool)
 
 	docsvc := document.New(cfg)
-	col := collector.New(cfg, &collector.Services{
-		CleanVersion: cleanversion.New(cfg),
-		TextVersion:  textversion.New(cfg),
-	})
+	col := collector.New(cfg)
 	que := query.New(cfg)
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
 		Collector: col,

api/queryService/status_test.go

@@ -9,11 +9,8 @@ import (
 
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/client"
-	"queryorchestration/internal/collector"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
-	cleanversion "queryorchestration/internal/document/clean/version"
-	textversion "queryorchestration/internal/document/text/version"
 	"queryorchestration/internal/serviceconfig"
 
 	"github.com/go-playground/validator/v10"
@@ -32,12 +29,7 @@ func TestGetClientStatus(t *testing.T) {
 	cfg.DBQueries = repository.New(pool)
 
 	cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
-		Client: client.New(cfg, &client.Services{
-			Collector: collector.New(cfg, &collector.Services{
-				TextVersion:  textversion.New(cfg),
-				CleanVersion: cleanversion.New(cfg),
-			}),
-		}),
+		Client: client.New(cfg),
 	})
 
 	e := echo.New()