Merged in feature/textextraction (pull request #110)

Text Extraction

* bases

* go

* splitting

* structure

* movetoasync

* movetoasync

* settinguptrigger

* reorder

* storevent

* standardisepollingvalidation

* unittests

* fixlint

* fixlint

* awscfg

* generatesample

* followthrough

* tests

* clena

* store

* externalidcleanup

* clientid

* local

* baseunittests

* putobjecttests

* tests

api/queryAPI/api.gen.go

@@ -89,9 +89,6 @@ type ClientStatusBody struct {
 	Status ClientStatus `json:"status"`
 }
 
-// ClientUID The client internal unique id
-type ClientUID = openapi_types.UUID
-
 // ClientUpdate The properties that may be updated.
 type ClientUpdate struct {
 	// CanSync If the client is allowing active syncs
@@ -165,9 +162,6 @@ type DocClient struct {
 
 	// Name The client name
 	Name ClientName `json:"name"`
-
-	// Uid The client internal unique id
-	Uid ClientUID `json:"uid"`
 }
 
 // Document The document properties.
@@ -729,68 +723,66 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"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",
-	"edz8fwAAAP//YgULir1ZAAA=",
+	"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",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

api/queryAPI/client.go

@@ -16,8 +16,8 @@ func (s *Controllers) CreateClient(ctx echo.Context) error {
 	}
 
 	_, err := s.svc.Client.Create(ctx.Request().Context(), client.CreateParams{
-		Name:       req.Name,
-		ExternalId: req.Id,
+		Name: req.Name,
+		ID:   req.Id,
 	})
 	if err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to create client: %s", err))
@@ -29,14 +29,13 @@ func (s *Controllers) CreateClient(ctx echo.Context) error {
 }
 
 func (s *Controllers) GetClient(ctx echo.Context, id ClientID) error {
-	client, err := s.svc.Client.GetByExternalId(ctx.Request().Context(), id)
+	client, err := s.svc.Client.Get(ctx.Request().Context(), id)
 	if err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to get client: %s", err))
 	}
 
 	return ctx.JSON(http.StatusOK, DocClient{
-		Id:      client.ExternalID,
-		Uid:     client.ID,
+		Id:      client.ID,
 		Name:    client.Name,
 		CanSync: client.CanSync,
 	})
@@ -48,7 +47,7 @@ func (s *Controllers) UpdateClient(ctx echo.Context, id ClientID) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 
-	err := s.svc.Client.UpdateByExternalId(ctx.Request().Context(), id, &client.Update{
+	err := s.svc.Client.Update(ctx.Request().Context(), id, &client.Update{
 		Name:    req.Name,
 		CanSync: req.CanSync,
 	})

api/queryAPI/client_test.go

@@ -13,7 +13,6 @@ import (
 	"queryorchestration/internal/database/repository"
 	"queryorchestration/internal/serviceconfig"
 
-	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -45,10 +44,8 @@ func TestCreateClient(t *testing.T) {
 	rec := httptest.NewRecorder()
 	ctx := e.NewContext(req, rec)
 
-	pool.ExpectQuery("name: CreateClient :one").WithArgs(body.Id, body.Name).WillReturnRows(
-		pgxmock.NewRows([]string{"id"}).
-			AddRow(uuid.New()),
-	)
+	pool.ExpectExec("name: CreateClient :exec").WithArgs(body.Id, body.Name).
+		WillReturnResult(pgxmock.NewResult("", 1))
 
 	err = cons.CreateClient(ctx)
 	require.NoError(t, err)
@@ -74,13 +71,12 @@ func TestGetClient(t *testing.T) {
 	ctx := e.NewContext(req, rec)
 
 	id := "client_id"
-	clientUid := uuid.New()
 
 	ctx.Set("id", id)
 
-	pool.ExpectQuery("name: GetClientByExternalId :one").WithArgs(id).WillReturnRows(
-		pgxmock.NewRows([]string{"id", "externalId", "name", "canSync"}).
-			AddRow(clientUid, "client_id", "client_name", true),
+	pool.ExpectQuery("name: GetClient :one").WithArgs(id).WillReturnRows(
+		pgxmock.NewRows([]string{"id", "name", "canSync"}).
+			AddRow("client_id", "client_name", true),
 	)
 
 	err = cons.GetClient(ctx, id)
@@ -92,7 +88,6 @@ func TestGetClient(t *testing.T) {
 	require.NoError(t, err)
 	assert.EqualExportedValues(t, queryapi.DocClient{
 		Id:      id,
-		Uid:     clientUid,
 		Name:    "client_name",
 		CanSync: true,
 	}, res)
@@ -127,18 +122,12 @@ func TestUpdateClient(t *testing.T) {
 
 	ctx.Set("id", id)
 
-	intid := uuid.New()
-
-	pool.ExpectQuery("name: GetClientByExternalId :one").WithArgs(id).WillReturnRows(
-		pgxmock.NewRows([]string{"id", "externalId", "name", "canSync"}).
-			AddRow(intid, "clientid", "client_name", true),
-	)
-	pool.ExpectQuery("name: GetClient :one").WithArgs(intid).WillReturnRows(
-		pgxmock.NewRows([]string{"id", "externalId", "name", "canSync"}).
-			AddRow(intid, "clientid", "client_name", true),
+	pool.ExpectQuery("name: GetClient :one").WithArgs(id).WillReturnRows(
+		pgxmock.NewRows([]string{"id", "name", "canSync"}).
+			AddRow("clientid", "client_name", true),
 	)
 	pool.ExpectBegin()
-	pool.ExpectExec("name: AddClientCanSync :exec").WithArgs(*body.CanSync, intid).
+	pool.ExpectExec("name: AddClientCanSync :exec").WithArgs(*body.CanSync, id).
 		WillReturnResult(pgxmock.NewResult("", 1))
 	pool.ExpectCommit()
 

api/queryAPI/collector.go

@@ -11,7 +11,7 @@ import (
 )
 
 func (s *Controllers) GetCollectorByClientId(ctx echo.Context, clientId ClientID) error {
-	coll, err := s.svc.Collector.GetByClientExternalID(ctx.Request().Context(), clientId)
+	coll, err := s.svc.Collector.GetByClientID(ctx.Request().Context(), clientId)
 	if err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to get collector: %s", err))
 	}
@@ -51,7 +51,7 @@ func (s *Controllers) SetCollectorByClientId(ctx echo.Context, clientId ClientID
 		fields = &fs
 	}
 
-	err := s.svc.CollectorSet.SetByClientExternalId(ctx.Request().Context(), clientId, &collectorset.SetParams{
+	err := s.svc.CollectorSet.SetByClientId(ctx.Request().Context(), clientId, &collectorset.SetParams{
 		ActiveVersion:   req.ActiveVersion,
 		MinCleanVersion: req.MinimumCleanerVersion,
 		MinTextVersion:  req.MinimumTextVersion,

api/queryAPI/collector_test.go

@@ -38,8 +38,9 @@ func TestSetCollector(t *testing.T) {
 	mockSQS := queuemock.NewMockSQSClient(t)
 	cfg.QueueClient = mockSQS
 
+	id := "clientid"
 	current := collector.Collector{
-		ClientID:      uuid.New(),
+		ClientID:      id,
 		ActiveVersion: 1,
 		LatestVersion: 4,
 	}
@@ -71,14 +72,8 @@ func TestSetCollector(t *testing.T) {
 		}),
 	})
 
-	id := "clientid"
-
 	ctx.Set("id", id)
 
-	pool.ExpectQuery("name: GetClientByExternalId :one").WithArgs(id).WillReturnRows(
-		pgxmock.NewRows([]string{"id", "externalId", "name", "can_sync"}).
-			AddRow(current.ClientID, id, "name", true),
-	)
 	pool.ExpectQuery("name: GetCollectorByClientID :one").WithArgs(current.ClientID).
 		WillReturnRows(
 			pgxmock.NewRows([]string{"clientId", "minCleanVersion", "minTextVersion", "activeVersion", "latestVersion", "fields"}).
@@ -106,7 +101,7 @@ func TestSetCollector(t *testing.T) {
 		SendMessage(
 			mock.Anything,
 			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.ClientSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", current.ClientID.String())
+				return *in.QueueUrl == cfg.ClientSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", current.ClientID)
 			}),
 			mock.Anything,
 		).
@@ -136,14 +131,14 @@ func TestGetCollectorByclientId(t *testing.T) {
 	})
 
 	coll := collector.Collector{
-		ClientID:        uuid.New(),
+		ClientID:        "hello",
 		MinCleanVersion: 1,
 		MinTextVersion:  2,
 	}
 
 	id := "clientid"
 
-	pool.ExpectQuery("name: GetCollectorByClientExternalID :one").WithArgs(id).
+	pool.ExpectQuery("name: GetCollectorByClientID :one").WithArgs(id).
 		WillReturnRows(
 			pgxmock.NewRows([]string{"clientId", "minCleanVersion", "minTextVersion", "activeVersion", "latestVersion", "fields"}).
 				AddRow(coll.ClientID, coll.MinCleanVersion, coll.MinTextVersion, int32(1), int32(2), []byte("")),

api/queryAPI/documents.go

@@ -8,7 +8,7 @@ import (
 )
 
 func (s *Controllers) ListDocumentsByClientId(ctx echo.Context, clientId ClientID) error {
-	documents, err := s.svc.Document.ListByClientExternalId(ctx.Request().Context(), clientId)
+	documents, err := s.svc.Document.ListByClient(ctx.Request().Context(), clientId)
 	if err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to list documents: %s", err))
 	}

api/queryAPI/documents_test.go

@@ -53,7 +53,7 @@ func TestListDocumentsByClientId(t *testing.T) {
 		},
 	}
 
-	pool.ExpectQuery("name: ListDocumentsByClientExternalId :many").WithArgs(clientId).
+	pool.ExpectQuery("name: ListDocumentsByClient :many").WithArgs(clientId).
 		WillReturnRows(
 			pgxmock.NewRows([]string{"id", "hash"}).
 				AddRow(doc[0].Id, "hash"),
@@ -103,7 +103,7 @@ func TestGetDocument(t *testing.T) {
 		},
 	}
 
-	pool.ExpectQuery("name: GetDocumentExternal :one").WithArgs(&docId).
+	pool.ExpectQuery("name: GetDocumentExternal :one").WithArgs(docId).
 		WillReturnRows(
 			pgxmock.NewRows([]string{"id", "clientId", "hash", "fields"}).
 				AddRow(doc.Id, "externalID", "example", []byte(`{"json": "hello"}`)),

api/queryAPI/status.go

@@ -8,7 +8,7 @@ import (
 )
 
 func (s *Controllers) GetStatusByClientId(ctx echo.Context, id ClientID) error {
-	status, err := s.svc.Client.GetStatusByExternalId(ctx.Request().Context(), id)
+	status, err := s.svc.Client.GetStatus(ctx.Request().Context(), id)
 	if err != nil {
 		return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to find client: %s", err))
 	}

api/queryAPI/status_test.go

@@ -12,7 +12,6 @@ import (
 	"queryorchestration/internal/database/repository"
 	"queryorchestration/internal/serviceconfig"
 
-	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
@@ -35,19 +34,18 @@ func TestGetClientStatus(t *testing.T) {
 	rec := httptest.NewRecorder()
 	ctx := e.NewContext(req, rec)
 
-	clientId := uuid.New()
-	id := "clientid"
+	clientId := "clientid"
 
-	pool.ExpectQuery("name: GetClientByExternalId :one").WithArgs(id).WillReturnRows(
-		pgxmock.NewRows([]string{"id", "externalId", "name", "can_sync"}).
-			AddRow(clientId, id, "name", true),
+	pool.ExpectQuery("name: GetClient :one").WithArgs(clientId).WillReturnRows(
+		pgxmock.NewRows([]string{"id", "name", "can_sync"}).
+			AddRow(clientId, "name", true),
 	)
 	pool.ExpectQuery("name: IsClientSynced :one").WithArgs(&clientId).WillReturnRows(
 		pgxmock.NewRows([]string{"issynced"}).
 			AddRow(true),
 	)
 
-	err = cons.GetStatusByClientId(ctx, id)
+	err = cons.GetStatusByClientId(ctx, clientId)
 	require.NoError(t, err)
 	assert.Equal(t, http.StatusOK, rec.Code)