wdevs/ResolveSpec
3
0
Fork 0
mirror of https://github.com/bitechdev/ResolveSpec.git synced 2026-02-15 12:56:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More fixes for _request

Browse Source
This commit is contained in:
Hein
2025-11-11 11:16:07 +02:00
parent 682716dd31
commit 7b8216b71c
7 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/integration_test.go
View File

@@ -26,7 +26,7 @@ func TestDepartmentEmployees(t *testing.T) {
},
}
resp := makeRequest(t, "/test/departments", deptPayload)
resp := makeRequest(t, "/departments", deptPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Create employees in department
@@ -52,7 +52,7 @@ func TestDepartmentEmployees(t *testing.T) {
},
}
resp = makeRequest(t, "/test/employees", empPayload)
resp = makeRequest(t, "/employees", empPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Read department with employees
@@ -68,7 +68,7 @@ func TestDepartmentEmployees(t *testing.T) {
},
}
resp = makeRequest(t, "/test/departments/dept1", readPayload)
resp = makeRequest(t, "/departments/dept1", readPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
var result map[string]interface{}
@@ -92,7 +92,7 @@ func TestEmployeeHierarchy(t *testing.T) {
},
}
resp := makeRequest(t, "/test/employees", mgrPayload)
resp := makeRequest(t, "/employees", mgrPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Update employees to set manager
@@ -103,9 +103,9 @@ func TestEmployeeHierarchy(t *testing.T) {
},
}
resp = makeRequest(t, "/test/employees/emp1", updatePayload)
resp = makeRequest(t, "/employees/emp1", updatePayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
resp = makeRequest(t, "/test/employees/emp2", updatePayload)
resp = makeRequest(t, "/employees/emp2", updatePayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Read manager with reports
@@ -121,7 +121,7 @@ func TestEmployeeHierarchy(t *testing.T) {
},
}
resp = makeRequest(t, "/test/employees/mgr1", readPayload)
resp = makeRequest(t, "/employees/mgr1", readPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
var result map[string]interface{}
@@ -147,7 +147,7 @@ func TestProjectStructure(t *testing.T) {
},
}
resp := makeRequest(t, "/test/projects", projectPayload)
resp := makeRequest(t, "/projects", projectPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Create project tasks
@@ -177,7 +177,7 @@ func TestProjectStructure(t *testing.T) {
},
}
resp = makeRequest(t, "/test/project_tasks", taskPayload)
resp = makeRequest(t, "/project_tasks", taskPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Create task comments
@@ -191,7 +191,7 @@ func TestProjectStructure(t *testing.T) {
},
}
resp = makeRequest(t, "/test/comments", commentPayload)
resp = makeRequest(t, "/comments", commentPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
// Read project with all relations
@@ -223,7 +223,7 @@ func TestProjectStructure(t *testing.T) {
},
}
resp = makeRequest(t, "/test/projects/proj1", readPayload)
resp = makeRequest(t, "/projects/proj1", readPayload)
assert.Equal(t, http.StatusOK, resp.StatusCode)
var result map[string]interface{}

45
tests/test_helpers.go
View File

@@ -10,6 +10,8 @@ import (
"os"
"testing"
"github.com/bitechdev/ResolveSpec/pkg/common/adapters/database"
"github.com/bitechdev/ResolveSpec/pkg/common/adapters/router"
"github.com/bitechdev/ResolveSpec/pkg/logger"
"github.com/bitechdev/ResolveSpec/pkg/modelregistry"
"github.com/bitechdev/ResolveSpec/pkg/resolvespec"
@@ -117,23 +119,44 @@ func setupTestDB() (*gorm.DB, error) {
func setupTestRouter(db *gorm.DB) http.Handler {
r := mux.NewRouter()
// Create a new registry instance
// Create database adapter
dbAdapter := database.NewGormAdapter(db)
// Create registry
registry := modelregistry.NewModelRegistry()
// Register test models with the registry
// Register test models without schema prefix for SQLite compatibility
// SQLite doesn't support schema prefixes like "test.employees"
testmodels.RegisterTestModels(registry)
// Create handler with GORM adapter and the registry
handler := resolvespec.NewHandlerWithGORM(db)
// Create handler with pre-populated registry
handler := resolvespec.NewHandler(dbAdapter, registry)
// Register test models with the handler for the "test" schema
models := testmodels.GetTestModels()
modelNames := []string{"departments", "employees", "projects", "project_tasks", "documents", "comments"}
for i, model := range models {
handler.RegisterModel("test", modelNames[i], model)
}
// Setup routes without schema prefix for SQLite
// Routes: GET/POST /{entity}, GET/POST/PUT/PATCH/DELETE /{entity}/{id}
r.HandleFunc("/{entity}", func(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
vars["schema"] = "" // Empty schema for SQLite
reqAdapter := router.NewHTTPRequest(req)
respAdapter := router.NewHTTPResponseWriter(w)
handler.Handle(respAdapter, reqAdapter, vars)
}).Methods("POST")
resolvespec.SetupMuxRoutes(r, handler)
r.HandleFunc("/{entity}/{id}", func(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
vars["schema"] = "" // Empty schema for SQLite
reqAdapter := router.NewHTTPRequest(req)
respAdapter := router.NewHTTPResponseWriter(w)
handler.Handle(respAdapter, reqAdapter, vars)
}).Methods("POST")
r.HandleFunc("/{entity}", func(w http.ResponseWriter, req *http.Request) {
vars := mux.Vars(req)
vars["schema"] = "" // Empty schema for SQLite
reqAdapter := router.NewHTTPRequest(req)
respAdapter := router.NewHTTPResponseWriter(w)
handler.HandleGet(respAdapter, reqAdapter, vars)
}).Methods("GET")
return r
}