Merged in feature/checkbox (pull request #145)
Checkbox Primary Edge Cases * hascheckboxlogic * gen * preppinggen * exploringcheckbox * removeunselected * tests * failingtest * failintests * nomockqueryapi * db * name * nocontainer * deleterow * cnc * extradocsandupdatetextracts * moretables * appndedtables * baseversion
This commit is contained in:
Michael McGuinness
+76
-67
@@ -2,7 +2,6 @@ package queryapi_test
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
@@ -14,25 +13,23 @@ import (
|
||||
"queryorchestration/internal/database/repository"
|
||||
"queryorchestration/internal/serviceconfig"
|
||||
"queryorchestration/internal/serviceconfig/queue/clientsync"
|
||||
"queryorchestration/internal/test"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/pashagolub/pgxmock/v3"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
type ClientConfig struct {
|
||||
serviceconfig.BaseConfig
|
||||
clientsync.ConfigProvider
|
||||
clientsync.ClientSyncConfig
|
||||
}
|
||||
|
||||
func TestCreateClient(t *testing.T) {
|
||||
pool, err := pgxmock.NewPool()
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Parallel()
|
||||
cfg := &serviceconfig.BaseConfig{}
|
||||
cfg.DBPool = pool
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
net := test.GetNetwork(t)
|
||||
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
|
||||
|
||||
cons := queryapi.NewControllers(&queryapi.Services{
|
||||
Client: client.New(cfg),
|
||||
@@ -42,71 +39,62 @@ func TestCreateClient(t *testing.T) {
|
||||
Name: "example_name",
|
||||
Id: "external_id",
|
||||
}
|
||||
bodyBytes, err := json.Marshal(body)
|
||||
require.NoError(t, err)
|
||||
|
||||
e := echo.New()
|
||||
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
|
||||
req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
|
||||
rec := httptest.NewRecorder()
|
||||
ctx := e.NewContext(req, rec)
|
||||
ctx, rec := createContextWithBody(t, body)
|
||||
|
||||
pool.ExpectExec("name: CreateClient :exec").WithArgs(body.Id, body.Name).
|
||||
WillReturnResult(pgxmock.NewResult("", 1))
|
||||
|
||||
err = cons.CreateClient(ctx)
|
||||
err := cons.CreateClient(ctx)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, http.StatusCreated, rec.Code)
|
||||
assert.Equal(t, fmt.Sprintf("{\"id\":\"%s\"}\n", body.Id), rec.Body.String())
|
||||
assertBody(t, rec, queryapi.ClientIDBody{
|
||||
Id: body.Id,
|
||||
})
|
||||
|
||||
client, err := cfg.GetDBQueries().GetClient(t.Context(), "external_id")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "example_name", client.Name)
|
||||
assert.Equal(t, "external_id", client.Clientid)
|
||||
}
|
||||
|
||||
func TestGetClient(t *testing.T) {
|
||||
pool, err := pgxmock.NewPool()
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Parallel()
|
||||
cfg := &serviceconfig.BaseConfig{}
|
||||
cfg.DBPool = pool
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
net := test.GetNetwork(t)
|
||||
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
|
||||
|
||||
cons := queryapi.NewControllers(&queryapi.Services{
|
||||
Client: client.New(cfg),
|
||||
})
|
||||
|
||||
e := echo.New()
|
||||
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(""))
|
||||
rec := httptest.NewRecorder()
|
||||
ctx := e.NewContext(req, rec)
|
||||
|
||||
id := "client_id"
|
||||
|
||||
ctx.Set("id", id)
|
||||
err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
|
||||
Clientid: id,
|
||||
Name: "client_name",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
err = cfg.GetDBQueries().AddClientCanSync(t.Context(), &repository.AddClientCanSyncParams{
|
||||
Clientid: id,
|
||||
Cansync: true,
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
pool.ExpectQuery("name: GetClient :one").WithArgs(id).WillReturnRows(
|
||||
pgxmock.NewRows([]string{"id", "name", "canSync"}).
|
||||
AddRow("client_id", "client_name", true),
|
||||
)
|
||||
ctx, rec := createContext(t)
|
||||
|
||||
err = cons.GetClient(ctx, id)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, http.StatusOK, rec.Code)
|
||||
|
||||
var res queryapi.DocClient
|
||||
err = json.Unmarshal(rec.Body.Bytes(), &res)
|
||||
require.NoError(t, err)
|
||||
assert.EqualExportedValues(t, queryapi.DocClient{
|
||||
assertBody(t, rec, queryapi.DocClient{
|
||||
Id: id,
|
||||
Name: "client_name",
|
||||
CanSync: true,
|
||||
}, res)
|
||||
})
|
||||
}
|
||||
|
||||
func TestUpdateClient(t *testing.T) {
|
||||
pool, err := pgxmock.NewPool()
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Parallel()
|
||||
cfg := &ClientConfig{}
|
||||
cfg.DBPool = pool
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
net := test.GetNetwork(t)
|
||||
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
|
||||
|
||||
cons := queryapi.NewControllers(&queryapi.Services{
|
||||
ClientUpdate: clientupdate.New(cfg, &clientupdate.Services{
|
||||
@@ -114,10 +102,36 @@ func TestUpdateClient(t *testing.T) {
|
||||
}),
|
||||
})
|
||||
|
||||
cs := false
|
||||
id := "client_id"
|
||||
|
||||
err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
|
||||
Clientid: id,
|
||||
Name: "client_name",
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
newClientName := "new_name"
|
||||
body := queryapi.ClientUpdate{
|
||||
CanSync: &cs,
|
||||
Name: &newClientName,
|
||||
}
|
||||
|
||||
ctx, rec := createContextWithBody(t, body)
|
||||
|
||||
err = cons.UpdateClient(ctx, id)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, http.StatusOK, rec.Code)
|
||||
assert.Empty(t, rec.Body.String())
|
||||
|
||||
client, err := cfg.GetDBQueries().GetClient(t.Context(), "client_id")
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "new_name", client.Name)
|
||||
}
|
||||
|
||||
func createContext(t testing.TB) (echo.Context, *httptest.ResponseRecorder) {
|
||||
return createContextWithBody(t, struct{}{})
|
||||
}
|
||||
|
||||
func createContextWithBody(t testing.TB, body interface{}) (echo.Context, *httptest.ResponseRecorder) {
|
||||
bodyBytes, err := json.Marshal(body)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -125,23 +139,18 @@ func TestUpdateClient(t *testing.T) {
|
||||
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
|
||||
req.Header.Set(echo.HeaderContentType, echo.MIMEApplicationJSON)
|
||||
rec := httptest.NewRecorder()
|
||||
ctx := e.NewContext(req, rec)
|
||||
|
||||
id := "clientid"
|
||||
|
||||
ctx.Set("id", id)
|
||||
|
||||
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, id).
|
||||
WillReturnResult(pgxmock.NewResult("", 1))
|
||||
pool.ExpectCommit()
|
||||
|
||||
err = cons.UpdateClient(ctx, id)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, http.StatusOK, rec.Code)
|
||||
assert.Empty(t, rec.Body.String())
|
||||
return e.NewContext(req, rec), rec
|
||||
}
|
||||
|
||||
func assertBody[T any](t testing.TB, rec *httptest.ResponseRecorder, expected T) {
|
||||
res := getBody[T](t, rec)
|
||||
assert.EqualExportedValues(t, expected, res)
|
||||
}
|
||||
|
||||
func getBody[T any](t testing.TB, rec *httptest.ResponseRecorder) T {
|
||||
var res T
|
||||
err := json.Unmarshal(rec.Body.Bytes(), &res)
|
||||
require.NoError(t, err)
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user