mirror of
https://github.com/bitechdev/ResolveSpec.git
synced 2026-01-17 08:24:26 +00:00
feat(restheadspec): ✨ Add support for join aliases in filters and sorts
- Extract join aliases from custom SQL JOIN clauses. - Validate join aliases for filtering and sorting operations. - Update documentation to reflect new functionality. - Enhance tests for alias extraction and usage.
This commit is contained in:
@@ -357,6 +357,107 @@ func TestParseOptionsFromQueryParams(t *testing.T) {
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "Extract aliases from custom SQL JOIN",
|
||||
queryParams: map[string]string{
|
||||
"x-custom-sql-join": `LEFT JOIN departments d ON d.id = employees.department_id`,
|
||||
},
|
||||
validate: func(t *testing.T, options ExtendedRequestOptions) {
|
||||
if len(options.JoinAliases) == 0 {
|
||||
t.Error("Expected JoinAliases to be extracted")
|
||||
return
|
||||
}
|
||||
if len(options.JoinAliases) != 1 {
|
||||
t.Errorf("Expected 1 join alias, got %d", len(options.JoinAliases))
|
||||
return
|
||||
}
|
||||
if options.JoinAliases[0] != "d" {
|
||||
t.Errorf("Expected join alias 'd', got %q", options.JoinAliases[0])
|
||||
}
|
||||
// Also check that it's in the embedded RequestOptions
|
||||
if len(options.RequestOptions.JoinAliases) != 1 || options.RequestOptions.JoinAliases[0] != "d" {
|
||||
t.Error("Expected join alias to also be in RequestOptions.JoinAliases")
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "Extract multiple aliases from multiple custom SQL JOINs",
|
||||
queryParams: map[string]string{
|
||||
"x-custom-sql-join": `LEFT JOIN departments d ON d.id = e.dept_id | INNER JOIN roles AS r ON r.id = e.role_id`,
|
||||
},
|
||||
validate: func(t *testing.T, options ExtendedRequestOptions) {
|
||||
if len(options.JoinAliases) != 2 {
|
||||
t.Errorf("Expected 2 join aliases, got %d", len(options.JoinAliases))
|
||||
return
|
||||
}
|
||||
expectedAliases := []string{"d", "r"}
|
||||
for i, expected := range expectedAliases {
|
||||
if options.JoinAliases[i] != expected {
|
||||
t.Errorf("Expected join alias[%d]=%q, got %q", i, expected, options.JoinAliases[i])
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "Custom JOIN with sort on joined table",
|
||||
queryParams: map[string]string{
|
||||
"x-custom-sql-join": `LEFT JOIN departments d ON d.id = employees.department_id`,
|
||||
"x-sort": "d.name,employees.id",
|
||||
},
|
||||
validate: func(t *testing.T, options ExtendedRequestOptions) {
|
||||
// Verify join was added
|
||||
if len(options.CustomSQLJoin) != 1 {
|
||||
t.Errorf("Expected 1 custom SQL join, got %d", len(options.CustomSQLJoin))
|
||||
return
|
||||
}
|
||||
// Verify alias was extracted
|
||||
if len(options.JoinAliases) != 1 || options.JoinAliases[0] != "d" {
|
||||
t.Error("Expected join alias 'd' to be extracted")
|
||||
return
|
||||
}
|
||||
// Verify sort was parsed
|
||||
if len(options.Sort) != 2 {
|
||||
t.Errorf("Expected 2 sort options, got %d", len(options.Sort))
|
||||
return
|
||||
}
|
||||
if options.Sort[0].Column != "d.name" {
|
||||
t.Errorf("Expected first sort column 'd.name', got %q", options.Sort[0].Column)
|
||||
}
|
||||
if options.Sort[1].Column != "employees.id" {
|
||||
t.Errorf("Expected second sort column 'employees.id', got %q", options.Sort[1].Column)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "Custom JOIN with filter on joined table",
|
||||
queryParams: map[string]string{
|
||||
"x-custom-sql-join": `LEFT JOIN departments d ON d.id = employees.department_id`,
|
||||
"x-searchop-eq-d.name": "Engineering",
|
||||
},
|
||||
validate: func(t *testing.T, options ExtendedRequestOptions) {
|
||||
// Verify join was added
|
||||
if len(options.CustomSQLJoin) != 1 {
|
||||
t.Error("Expected 1 custom SQL join")
|
||||
return
|
||||
}
|
||||
// Verify alias was extracted
|
||||
if len(options.JoinAliases) != 1 || options.JoinAliases[0] != "d" {
|
||||
t.Error("Expected join alias 'd' to be extracted")
|
||||
return
|
||||
}
|
||||
// Verify filter was parsed
|
||||
if len(options.Filters) != 1 {
|
||||
t.Errorf("Expected 1 filter, got %d", len(options.Filters))
|
||||
return
|
||||
}
|
||||
if options.Filters[0].Column != "d.name" {
|
||||
t.Errorf("Expected filter column 'd.name', got %q", options.Filters[0].Column)
|
||||
}
|
||||
if options.Filters[0].Operator != "eq" {
|
||||
t.Errorf("Expected filter operator 'eq', got %q", options.Filters[0].Operator)
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
@@ -451,6 +552,55 @@ func TestHeadersAndQueryParamsCombined(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestCustomJoinAliasExtraction tests the extractJoinAlias helper function
|
||||
func TestCustomJoinAliasExtraction(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
join string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "LEFT JOIN with alias",
|
||||
join: "LEFT JOIN departments d ON d.id = employees.department_id",
|
||||
expected: "d",
|
||||
},
|
||||
{
|
||||
name: "INNER JOIN with AS keyword",
|
||||
join: "INNER JOIN users AS u ON u.id = posts.user_id",
|
||||
expected: "u",
|
||||
},
|
||||
{
|
||||
name: "Simple JOIN with alias",
|
||||
join: "JOIN roles r ON r.id = user_roles.role_id",
|
||||
expected: "r",
|
||||
},
|
||||
{
|
||||
name: "JOIN without alias (just table name)",
|
||||
join: "JOIN departments ON departments.id = employees.dept_id",
|
||||
expected: "",
|
||||
},
|
||||
{
|
||||
name: "RIGHT JOIN with alias",
|
||||
join: "RIGHT JOIN orders o ON o.customer_id = customers.id",
|
||||
expected: "o",
|
||||
},
|
||||
{
|
||||
name: "FULL OUTER JOIN with AS",
|
||||
join: "FULL OUTER JOIN products AS p ON p.id = order_items.product_id",
|
||||
expected: "p",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := extractJoinAlias(tt.join)
|
||||
if result != tt.expected {
|
||||
t.Errorf("extractJoinAlias(%q) = %q, want %q", tt.join, result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Helper function to check if a string contains a substring
|
||||
func contains(s, substr string) bool {
|
||||
return len(s) >= len(substr) && (s == substr || len(s) > len(substr) && containsHelper(s, substr))
|
||||
|
||||
Reference in New Issue
Block a user