@apso/cli 0.11.1 → 0.13.0

package/dist/commands/generate.js

@@ -75,6 +75,13 @@ class Generate extends base_command_1.default {
             // eslint-disable-next-line no-await-in-loop
             await (0, file_system_1.createFile)(fullPath, file.content);
         }
+        // Generate shared query utilities
+        const queryUtilFiles = await generator.generateQueryUtils(entities, lowerCaseApiType);
+        for (const file of queryUtilFiles) {
+            const fullPath = path.join(autogenPath, file.path);
+            // eslint-disable-next-line no-await-in-loop
+            await (0, file_system_1.createFile)(fullPath, file.content);
+        }
         // Generate per-entity files
         for (const entity of entities) {
             console.log(`[apso] Building... ${entity.name}`);

package/dist/commands/migrate.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
 const core_1 = require("@oclif/core");
 const base_command_1 = tslib_1.__importDefault(require("../lib/base-command"));
 const apsorc_parser_1 = require("../lib/apsorc-parser");
-const snapshot_1 = require("../lib/migrate/snapshot");
 const sandbox_1 = require("../lib/migrate/sandbox");
+const lib_1 = require("../lib");
+const file_system_1 = require("../lib/utils/file-system");
 class Migrate extends base_command_1.default {
     async run() {
         const { flags } = await this.parse(Migrate);
@@ -24,37 +26,6 @@ class Migrate extends base_command_1.default {
             const msg = error instanceof Error ? error.message : String(error);
             this.error(`Failed to parse .apsorc: ${msg}`);
         }
-        // Quick check against snapshot
-        const snapshot = (0, snapshot_1.readSnapshot)();
-        const currentComparable = {
-            entities: parsed.entities.map((e) => {
-                var _a;
-                return ({
-                    name: e.name,
-                    fields: (_a = e.fields) === null || _a === void 0 ? void 0 : _a.map((f) => {
-                        var _a;
-                        return ({
-                            name: f.name,
-                            type: f.type,
-                            nullable: f.nullable,
-                            unique: f.unique,
-                            default: (_a = f.default) !== null && _a !== void 0 ? _a : undefined,
-                            index: f.index,
-                        });
-                    }),
-                    primaryKeyType: e.primaryKeyType,
-                    created_at: e.created_at,
-                    updated_at: e.updated_at,
-                    scopeBy: e.scopeBy,
-                });
-            }),
-        };
-        if (!(0, snapshot_1.hasChanges)(currentComparable, snapshot)) {
-            if (!flags.sql) {
-                this.log("Schema unchanged. No migration needed.");
-            }
-            return;
-        }
         if (!flags.sql) {
             this.log("Schema changes detected. Running migration sandbox...");
         }
@@ -85,6 +56,29 @@ class Migrate extends base_command_1.default {
             this.log("");
             this.log(`${result.upSql.length} statement(s) generated and tested.`);
             this.log("Migration validated against local PGlite.");
+            // Generate language-native migration files for Python and Go
+            const language = parsed.language || "typescript";
+            if (language !== "typescript") {
+                const generatorConfig = {
+                    language,
+                    rootFolder: parsed.rootFolder || "src",
+                    apiType: parsed.apiType || "rest",
+                    entities: parsed.entities,
+                    relationshipMap: parsed.relationshipMap,
+                };
+                const generator = (0, lib_1.createGenerator)(generatorConfig);
+                const migrationFiles = await generator.generateMigration({
+                    entities: parsed.entities,
+                    relationshipMap: parsed.relationshipMap,
+                    upSql: result.upSql,
+                    downSql: result.downSql,
+                });
+                for (const file of migrationFiles) {
+                    const fullPath = path.join(process.cwd(), file.path);
+                    await (0, file_system_1.createFile)(fullPath, file.content);
+                    this.log(`Generated migration file: ${file.path}`);
+                }
+            }
             if (flags.apply) {
                 (0, sandbox_1.applyMigration)({
                     entities: parsed.entities,

package/dist/lib/generators/base.d.ts

@@ -57,6 +57,11 @@ export declare abstract class BaseGenerator implements LanguageGenerator {
      * Generate guard files (auth, scope, etc.)
      */
     abstract generateGuards(entities: Entity[], auth?: AuthConfig): Promise<GeneratedFile[]>;
+    /**
+     * Generate shared query utility files (filter, sort, pagination).
+     * Default no-op. Override in language generators that need query utils.
+     */
+    generateQueryUtils(_entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
     /**
      * Render a template file with the given data
      */

package/dist/lib/generators/base.js

@@ -20,6 +20,13 @@ class BaseGenerator {
             cache: false,
         });
     }
+    /**
+     * Generate shared query utility files (filter, sort, pagination).
+     * Default no-op. Override in language generators that need query utils.
+     */
+    async generateQueryUtils(_entities, _apiType) {
+        return [];
+    }
     /**
      * Render a template file with the given data
      */

package/dist/lib/generators/go.d.ts

@@ -30,8 +30,9 @@ export declare class GoGenerator extends BaseGenerator {
     generateService(options: ServiceGenerationOptions): Promise<GeneratedFile[]>;
     generateDto(options: DtoGenerationOptions): Promise<GeneratedFile[]>;
     generateModule(_options: EntityGenerationOptions): Promise<GeneratedFile[]>;
-    generateMigration(_options: MigrationGenerationOptions): Promise<GeneratedFile[]>;
+    generateMigration(options: MigrationGenerationOptions): Promise<GeneratedFile[]>;
     generateEnums(entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
     generateIndexModule(entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
     generateGuards(_entities: Entity[], auth?: AuthConfig): Promise<GeneratedFile[]>;
+    generateQueryUtils(_entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
 }

package/dist/lib/generators/go.js

@@ -20,6 +20,7 @@ class GoGenerator extends base_1.BaseGenerator {
         Eta.configure({
             views: this.templateBasePath,
             cache: false,
+            autoTrim: false,
         });
     }
     getLanguage() {
@@ -142,6 +143,9 @@ class GoGenerator extends base_1.BaseGenerator {
             primaryKeyGoType: this.getPrimaryKeyGoType(primaryKeyType),
             camelReferenceName: (0, casing_1.camelCase)(rel.referenceName || rel.name),
             snakeReferenceName: (0, casing_1.snakeCase)(rel.referenceName || rel.name),
+            pluralName: (0, casing_1.pascalCase)((0, pluralize_1.default)(rel.name)),
+            camelPluralName: (0, casing_1.camelCase)((0, pluralize_1.default)(rel.name)),
+            inverseName: (0, casing_1.pascalCase)(rel.inversePropertyName || name),
         }));
         const entitiesToImport = (0, relationships_1.getRelationshipsForImport)(name, relationshipsForTemplate);
         const data = {
@@ -241,6 +245,8 @@ class GoGenerator extends base_1.BaseGenerator {
                 ...rel,
                 primaryKeyGoType: this.getPrimaryKeyGoType(referencedPrimaryKeyType),
                 camelReferenceName: (0, casing_1.camelCase)(rel.referenceName || rel.name),
+                pluralName: (0, casing_1.pascalCase)((0, pluralize_1.default)(rel.name)),
+                camelPluralName: (0, casing_1.camelCase)((0, pluralize_1.default)(rel.name)),
             };
         });
         const primaryKeyColumns = columns.filter((column) => column.primary === true);
@@ -272,10 +278,31 @@ class GoGenerator extends base_1.BaseGenerator {
         // Route registration is handled in the index module
         return [];
     }
-    async generateMigration(_options) {
-        // Goose handles migrations differently
-        // This is a placeholder for future migration template generation
-        return [];
+    async generateMigration(options) {
+        const { upSql, downSql, migrationName } = options;
+        if (!upSql || upSql.length === 0) {
+            return [];
+        }
+        const timestamp = new Date()
+            .toISOString()
+            .replace(/[-:T]/g, "")
+            .slice(0, 14);
+        const name = migrationName || "auto";
+        const filename = `${timestamp}_${name}.sql`;
+        const upStatements = upSql.map((sql) => `${sql};`).join("\n");
+        const downStatements = (downSql || []).map((sql) => `${sql};`).join("\n");
+        const content = `-- +goose Up
+${upStatements}
+
+-- +goose Down
+${downStatements}
+`;
+        return [
+            {
+                path: `migrations/${filename}`,
+                content,
+            },
+        ];
     }
     async generateEnums(entities, _apiType) {
         if (entities.length === 0) {
@@ -318,11 +345,32 @@ class GoGenerator extends base_1.BaseGenerator {
         const content = await this.renderTemplate("./index-module", {
             entities: entitiesData,
         });
+        // Generate model registry for AutoMigrate support
+        const modelImports = entities
+            .map((e) => `\t// ${e.name} model`)
+            .join("\n");
+        const modelRefs = entities
+            .map((e) => `\t\t&${(0, casing_1.pascalCase)(e.name)}{},`)
+            .join("\n");
+        const registryContent = `package models
+
+// All returns all registered GORM models for AutoMigrate.
+// This file is auto-generated by the Apso CLI.
+func All() []interface{} {
+\treturn []interface{}{
+${modelRefs}
+\t}
+}
+`;
         return [
             {
                 path: "routes/routes.go",
                 content,
             },
+            {
+                path: "models/registry.go",
+                content: registryContent,
+            },
         ];
     }
     async generateGuards(_entities, auth) {
@@ -336,5 +384,13 @@ class GoGenerator extends base_1.BaseGenerator {
             },
         ];
     }
+    async generateQueryUtils(_entities, _apiType) {
+        const typesContent = await this.renderTemplate("./utils/types", {});
+        const queryContent = await this.renderTemplate("./utils/query", {});
+        return [
+            { path: "utils/types.go", content: typesContent },
+            { path: "utils/query.go", content: queryContent },
+        ];
+    }
 }
 exports.GoGenerator = GoGenerator;

package/dist/lib/generators/python.d.ts

@@ -14,8 +14,9 @@ export declare class PythonGenerator extends BaseGenerator {
     generateService(options: ServiceGenerationOptions): Promise<GeneratedFile[]>;
     generateDto(options: DtoGenerationOptions): Promise<GeneratedFile[]>;
     generateModule(_options: EntityGenerationOptions): Promise<GeneratedFile[]>;
-    generateMigration(_options: MigrationGenerationOptions): Promise<GeneratedFile[]>;
+    generateMigration(options: MigrationGenerationOptions): Promise<GeneratedFile[]>;
     generateEnums(entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
     generateIndexModule(entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
     generateGuards(_entities: Entity[], _auth?: AuthConfig): Promise<GeneratedFile[]>;
+    generateQueryUtils(_entities: Entity[], _apiType: string): Promise<GeneratedFile[]>;
 }

package/dist/lib/generators/python.js

@@ -206,10 +206,46 @@ class PythonGenerator extends base_1.BaseGenerator {
         // The router registration is handled in the index module
         return [];
     }
-    async generateMigration(_options) {
-        // Alembic handles migrations differently
-        // This is a placeholder for future migration template generation
-        return [];
+    async generateMigration(options) {
+        const { upSql, downSql, migrationName } = options;
+        if (!upSql || upSql.length === 0) {
+            return [];
+        }
+        const timestamp = new Date()
+            .toISOString()
+            .replace(/[-:T]/g, "")
+            .slice(0, 14);
+        const revision = timestamp;
+        const name = migrationName || "auto";
+        const filename = `${timestamp}_${name}.py`;
+        const upStatements = upSql
+            .map((sql) => `    op.execute("""${sql}""")`)
+            .join("\n");
+        const downStatements = (downSql || [])
+            .map((sql) => `    op.execute("""${sql}""")`)
+            .join("\n");
+        const content = `"""${name}"""
+from alembic import op
+
+revision = '${revision}'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+${upStatements}
+
+
+def downgrade() -> None:
+${downStatements || "    pass"}
+`;
+        return [
+            {
+                path: `alembic/versions/${filename}`,
+                content,
+            },
+        ];
     }
     async generateEnums(entities, _apiType) {
         if (entities.length === 0) {
@@ -250,5 +286,13 @@ class PythonGenerator extends base_1.BaseGenerator {
         // This is a placeholder for future implementation
         return [];
     }
+    async generateQueryUtils(_entities, _apiType) {
+        const queryContent = await this.renderTemplate("./utils/query", {});
+        const initContent = await this.renderTemplate("./utils/init", {});
+        return [
+            { path: "utils/query.py", content: queryContent },
+            { path: "utils/__init__.py", content: initContent },
+        ];
+    }
 }
 exports.PythonGenerator = PythonGenerator;

package/dist/lib/templates/entities/entity-col-uuid.eta

@@ -1,11 +1,12 @@
 <% const {field} = it; %>
 
+<% if (field.primary ) {%>
+@PrimaryGeneratedColumn('uuid')
+<% } else { %>
 @Column({ "type": "uuid"<% if (field.default !== null) {%>, default:  <%= field.default %><% } %> })
 <% if (field.index ) {%>
 @Index()
 <% } %>
-<% if (field.primary ) {%>
-@PrimaryColumn()
 <% } %>
 
-<%= field.name %>: string; 
+<%= field.name %>: string;

package/dist/lib/templates/entities/entity.eta

@@ -58,8 +58,7 @@ export class <%= it.name %> {
 <% if (it.createPrimaryKey) { %>
     // Fields
     <% if (it.primaryKeyType === 'uuid') { %>
-    @Column({ type: 'uuid' })
-    @PrimaryColumn()
+    @PrimaryGeneratedColumn('uuid')
     id: string;
     <% } else if (it.primaryKeyType === 'text') { %>
     @Column({ type: 'text' })

package/dist/lib/templates/go/dto/dto.eta

@@ -5,74 +5,74 @@ package dto
 import (
 	"time"
 <% if (it.importEnums) { %>
-	"app/models/enums"
+	"app/autogen/models/enums"
 <% } %>
 )
 
 // <%= it.entityName %>Response represents the response DTO for <%= it.entityName %>
 type <%= it.entityName %>Response struct {
-<% if (it.addDefaultPKProperty) { %>
-<% if (it.primaryKeyType === 'uuid') { %>
+<% if (it.addDefaultPKProperty) { -%>
+<% if (it.primaryKeyType === 'uuid') { -%>
 	ID        string    `json:"id"`
-<% } else { %>
+<% } else { -%>
 	ID        uint      `json:"id"`
-<% } %>
-<% } %>
-<% it.columns.forEach((column) => { %>
+<% } -%>
+<% } -%>
+<% it.columns.forEach((column) => { -%>
 <%~ includeFile('./dto-col-' + column.type + '.eta', { column, mode: 'response' }) %>
-<% }) %>
-<% if (it.createdAt) { %>
+<% }); -%>
+<% if (it.createdAt) { -%>
 	CreatedAt time.Time `json:"createdAt"`
-<% } %>
-<% if (it.updatedAt) { %>
+<% } -%>
+<% if (it.updatedAt) { -%>
 	UpdatedAt time.Time `json:"updatedAt"`
-<% } %>
-<% it.associations.forEach((assoc) => { %>
-<% if (assoc.type === 'OneToMany') { %>
+<% } -%>
+<% it.associations.forEach((assoc) => { -%>
+<% if (assoc.type === 'OneToMany') { -%>
 	<%= assoc.pluralName %> []<%= assoc.name %>Response `json:"<%= assoc.camelPluralName %>,omitempty"`
-<% } else if (assoc.type === 'ManyToOne') { %>
+<% } else if (assoc.type === 'ManyToOne') { -%>
 	<%= assoc.referenceName || assoc.name %>ID <%= assoc.primaryKeyGoType || 'uint' %> `json:"<%= assoc.camelReferenceName || assoc.camelName %>Id"`
 	<%= assoc.referenceName || assoc.name %> *<%= assoc.name %>Response `json:"<%= assoc.camelReferenceName || assoc.camelName %>,omitempty"`
-<% } else if (assoc.type === 'OneToOne') { %>
-<% if (assoc.isOwner) { %>
+<% } else if (assoc.type === 'OneToOne') { -%>
+<% if (assoc.isOwner) { -%>
 	<%= assoc.referenceName || assoc.name %>ID <%= assoc.primaryKeyGoType || 'uint' %> `json:"<%= assoc.camelReferenceName || assoc.camelName %>Id"`
-<% } %>
+<% } -%>
 	<%= assoc.referenceName || assoc.name %> *<%= assoc.name %>Response `json:"<%= assoc.camelReferenceName || assoc.camelName %>,omitempty"`
-<% } else if (assoc.type === 'ManyToMany') { %>
+<% } else if (assoc.type === 'ManyToMany') { -%>
 	<%= assoc.pluralName %> []<%= assoc.name %>Response `json:"<%= assoc.camelPluralName %>,omitempty"`
-<% } %>
-<% }) %>
+<% } -%>
+<% }) -%>
 }
 
 // <%= it.entityName %>Create represents the create DTO for <%= it.entityName %>
 type <%= it.entityName %>Create struct {
-<% it.columns.forEach((column) => { %>
+<% it.columns.forEach((column) => { -%>
 <%~ includeFile('./dto-col-' + column.type + '.eta', { column, mode: 'create' }) %>
-<% }) %>
-<% it.associations.forEach((assoc) => { %>
-<% if (assoc.type === 'ManyToOne' || (assoc.type === 'OneToOne' && assoc.isOwner)) { %>
+<% }); -%>
+<% it.associations.forEach((assoc) => { -%>
+<% if (assoc.type === 'ManyToOne' || (assoc.type === 'OneToOne' && assoc.isOwner)) { -%>
 	<%= assoc.referenceName || assoc.name %>ID <%= assoc.primaryKeyGoType || 'uint' %> `json:"<%= assoc.camelReferenceName || assoc.camelName %>Id" validate:"required"`
-<% } %>
-<% }) %>
+<% } -%>
+<% }) -%>
 }
 
 // <%= it.entityName %>Update represents the update DTO for <%= it.entityName %>
 type <%= it.entityName %>Update struct {
-<% it.columns.forEach((column) => { %>
+<% it.columns.forEach((column) => { -%>
 <%~ includeFile('./dto-col-' + column.type + '.eta', { column, mode: 'update' }) %>
-<% }) %>
-<% it.associations.forEach((assoc) => { %>
-<% if (assoc.type === 'ManyToOne' || (assoc.type === 'OneToOne' && assoc.isOwner)) { %>
+<% }); -%>
+<% it.associations.forEach((assoc) => { -%>
+<% if (assoc.type === 'ManyToOne' || (assoc.type === 'OneToOne' && assoc.isOwner)) { -%>
 	<%= assoc.referenceName || assoc.name %>ID *<%= assoc.primaryKeyGoType || 'uint' %> `json:"<%= assoc.camelReferenceName || assoc.camelName %>Id,omitempty"`
-<% } %>
-<% }) %>
+<% } -%>
+<% }) -%>
 }
 
-// PaginatedResponse wraps paginated results for <%= it.entityName %>
+// <%= it.entityName %>PaginatedResponse wraps paginated results for <%= it.entityName %>
 type <%= it.entityName %>PaginatedResponse struct {
-	Data       []<%= it.entityName %>Response `json:"data"`
-	Total      int64                 `json:"total"`
-	Page       int                   `json:"page"`
-	PageSize   int                   `json:"pageSize"`
-	TotalPages int                   `json:"totalPages"`
+	Data      []<%= it.entityName %>Response `json:"data"`
+	Count     int                   `json:"count"`
+	Total     int64                 `json:"total"`
+	Page      int                   `json:"page"`
+	PageCount int                   `json:"pageCount"`
 }

package/dist/lib/templates/go/handlers/handler.eta

@@ -6,8 +6,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"app/dto"
-	"app/services"
+	"app/autogen/dto"
+	"app/autogen/services"
+	"app/autogen/utils"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 )
@@ -39,27 +40,24 @@ func (h *<%= it.entityName %>Handler) RegisterRoutes(r *gin.RouterGroup) {
 
 // FindAll godoc
 // @Summary      List all <%= it.pluralName %>
-// @Description  Get a paginated list of <%= it.pluralName %>
+// @Description  Get a paginated list of <%= it.pluralName %> with filtering, sorting, and joins
 // @Tags         <%= it.pluralName %>
 // @Accept       json
 // @Produce      json
-// @Param        page     query    int  false  "Page number"  default(1)
-// @Param        pageSize query    int  false  "Page size"    default(10)
+// @Param        filter   query    string  false  "Filter: field||$operator||value (repeatable)"
+// @Param        or       query    string  false  "OR filter: field||$operator||value (repeatable)"
+// @Param        sort     query    string  false  "Sort: field,ASC or field,DESC (repeatable)"
+// @Param        fields   query    string  false  "Field selection: field1,field2"
+// @Param        join     query    string  false  "Join: relation or relation||field1,field2 (repeatable)"
+// @Param        limit    query    int     false  "Page size (max 200)"  default(25)
+// @Param        page     query    int     false  "Page number"          default(1)
 // @Success      200  {object}  dto.<%= it.entityName %>PaginatedResponse
 // @Failure      500  {object}  map[string]string
 // @Router       /<%= it.kebabPluralName %> [get]
 func (h *<%= it.entityName %>Handler) FindAll(c *gin.Context) {
-	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
-	pageSize, _ := strconv.Atoi(c.DefaultQuery("pageSize", "10"))
+	opts := utils.ParseQueryParams(c.Request.URL.Query())
 
-	if page < 1 {
-		page = 1
-	}
-	if pageSize < 1 || pageSize > 100 {
-		pageSize = 10
-	}
-
-	result, err := h.service.FindAll(c.Request.Context(), page, pageSize)
+	result, err := h.service.FindAll(c.Request.Context(), opts)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return

package/dist/lib/templates/go/index-module.eta

@@ -3,8 +3,8 @@
 package routes
 
 import (
-	"app/handlers"
-	"app/services"
+	"app/autogen/handlers"
+	"app/autogen/services"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )

package/dist/lib/templates/go/models/model.eta

@@ -5,9 +5,8 @@ package models
 import (
 	"time"
 <% if (it.importEnums) { %>
-	"app/models/enums"
+	"app/autogen/models/enums"
 <% } %>
-	"gorm.io/gorm"
 )
 
 // <%= it.name %> represents the <%= it.snakeCasedName %> table

package/dist/lib/templates/go/services/service.eta

@@ -6,11 +6,30 @@ import (
 	"context"
 	"errors"
 
-	"app/dto"
-	"app/models"
+	"app/autogen/dto"
+	"app/autogen/models"
+	"app/autogen/utils"
 	"gorm.io/gorm"
 )
 
+// AllowedFields<%= it.entityName %> defines the column names that can be used in
+// filter and sort query parameters. This prevents arbitrary column access.
+var AllowedFields<%= it.entityName %> = map[string]bool{
+	"id": true,
+<% it.columns.forEach((column) => { %>
+	"<%= column.snakeName %>": true,
+<% }) %>
+<% if (it.createdAt) { %>
+	"created_at": true,
+<% } %>
+<% if (it.updatedAt) { %>
+	"updated_at": true,
+<% } %>
+<% it.associations.filter(a => a.type === 'ManyToOne' || (a.type === 'OneToOne' && a.isOwner)).forEach((assoc) => { %>
+	"<%= assoc.snakeReferenceName || assoc.snakeName %>_id": true,
+<% }) %>
+}
+
 type <%= it.entityName %>Service struct {
 	db *gorm.DB
 }
@@ -19,28 +38,19 @@ func New<%= it.entityName %>Service(db *gorm.DB) *<%= it.entityName %>Service {
 	return &<%= it.entityName %>Service{db: db}
 }
 
-// FindAll retrieves a paginated list of <%= it.pluralName %>
-func (s *<%= it.entityName %>Service) FindAll(ctx context.Context, page, pageSize int) (*dto.<%= it.entityName %>PaginatedResponse, error) {
-	var total int64
+// FindAll retrieves a paginated list of <%= it.pluralName %> with filtering, sorting, and joins.
+func (s *<%= it.entityName %>Service) FindAll(ctx context.Context, opts utils.QueryOptions) (*dto.<%= it.entityName %>PaginatedResponse, error) {
 	var items []models.<%= it.entityName %>
 
-	offset := (page - 1) * pageSize
-
-	if err := s.db.WithContext(ctx).Model(&models.<%= it.entityName %>{}).Count(&total).Error; err != nil {
-		return nil, err
-	}
-
-	query := s.db.WithContext(ctx)
+	query := s.db.WithContext(ctx).Model(&models.<%= it.entityName %>{})
 <% it.associations.filter(a => a.eager).forEach((assoc) => { %>
 	query = query.Preload("<%= assoc.referenceName || assoc.name %>")
 <% }) %>
-	if err := query.Offset(offset).Limit(pageSize).Find(&items).Error; err != nil {
-		return nil, err
-	}
 
-	totalPages := int(total) / pageSize
-	if int(total)%pageSize > 0 {
-		totalPages++
+	query, total, pageCount := utils.ApplyQuery(query, opts, AllowedFields<%= it.entityName %>)
+
+	if err := query.Find(&items).Error; err != nil {
+		return nil, err
 	}
 
 	response := make([]dto.<%= it.entityName %>Response, len(items))
@@ -49,11 +59,11 @@ func (s *<%= it.entityName %>Service) FindAll(ctx context.Context, page, pageSiz
 	}
 
 	return &dto.<%= it.entityName %>PaginatedResponse{
-		Data:       response,
-		Total:      total,
-		Page:       page,
-		PageSize:   pageSize,
-		TotalPages: totalPages,
+		Data:      response,
+		Count:     len(response),
+		Total:     total,
+		Page:      opts.Page,
+		PageCount: pageCount,
 	}, nil
 }