@jskit-ai/google-rewarded-core 0.1.73 → 0.1.74

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/google-rewarded-core",
-  version: "0.1.73",
+  version: "0.1.74",
   kind: "runtime",
   description: "Google rewarded workflow runtime plus internal CRUD providers for rules, provider configs, watch sessions, and unlock receipts.",
   dependsOn: [
@@ -128,14 +128,14 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.134",
-        "@jskit-ai/crud-core": "0.1.145",
-        "@jskit-ai/database-runtime": "0.1.135",
-        "@jskit-ai/http-runtime": "0.1.134",
-        "@jskit-ai/json-rest-api-core": "0.1.80",
-        "@jskit-ai/kernel": "0.1.136",
-        "@jskit-ai/resource-crud-core": "0.1.79",
-        "@jskit-ai/workspaces-core": "0.1.115"
+        "@jskit-ai/auth-core": "0.1.135",
+        "@jskit-ai/crud-core": "0.1.147",
+        "@jskit-ai/database-runtime": "0.1.136",
+        "@jskit-ai/http-runtime": "0.1.135",
+        "@jskit-ai/json-rest-api-core": "0.1.81",
+        "@jskit-ai/kernel": "0.1.137",
+        "@jskit-ai/resource-crud-core": "0.1.80",
+        "@jskit-ai/workspaces-core": "0.1.116"
       },
       dev: {}
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/google-rewarded-core",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "type": "module",
   "exports": {
     "./shared": "./src/shared/index.js",

package/src/server/providerConfigs/actions.js

@@ -3,18 +3,12 @@ import {
   recordIdParamsValidator
 } from "@jskit-ai/kernel/shared/validators";
 import {
-  createCrudCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  lookupIncludeQueryValidator,
-  createCrudParentFilterQueryValidator
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators
 } from "@jskit-ai/crud-core/server/listQueryValidators";
 import { resource } from "../../shared/googleRewardedProviderConfigResource.js";
 import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";
 
-const listCursorPaginationQueryValidator = createCrudCursorPaginationQueryValidator({
-  orderBy: resource.defaultSort
-});
-const listParentFilterQueryValidator = createCrudParentFilterQueryValidator(resource);
 const actionPermissions = Object.freeze({
   list: "crud.google_rewarded_provider_configs.list",
   view: "crud.google_rewarded_provider_configs.view",
@@ -33,12 +27,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.list] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  listCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  listParentFilterQueryValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        ...createStandardCrudListQueryValidators({ resource })
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -60,10 +51,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.view] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        ...createStandardCrudViewQueryValidators()
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -71,9 +62,9 @@ function createActions({ surface } = {}) {
       },
       observability: {},
       async execute(input, context, deps) {
-        return deps.googleRewardedProviderConfigsService.getDocumentById(input.recordId, {
-          context,
-          include: input.include
+        const { workspaceSlug, recordId, ...query } = input || {};
+        return deps.googleRewardedProviderConfigsService.getDocumentById(recordId, query, {
+          context
         });
       }
     },
@@ -85,11 +76,11 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.create] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  resource.operations.create.body,
-], {
-  mode: "create"
-}),
+        workspaceSlugParamsValidator,
+        resource.operations.create.body
+      ], {
+        mode: "create"
+      }),
       output: null,
       idempotency: "optional",
       audit: {
@@ -111,10 +102,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.update] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  resource.operations.patch.body,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        resource.operations.patch.body
+      ]),
       output: null,
       idempotency: "optional",
       audit: {
@@ -136,9 +127,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.delete] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator
+      ]),
       output: null,
       idempotency: "optional",
       audit: {

package/src/server/providerConfigs/repository.js

@@ -3,6 +3,7 @@ import {
   buildJsonRestQueryParams,
   createJsonApiInputRecord,
   createJsonRestContext,
+  returnBadRequestWhenJsonRestFieldsetInvalid,
   returnNullWhenJsonRestResourceMissing
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { resource } from "../../shared/googleRewardedProviderConfigResource.js";
@@ -12,24 +13,10 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryDocuments(query = {}, options = {}) {
-    return api.resources.googleRewardedProviderConfigs.query(
-      {
-        queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
-    );
-  }
-
-  async function getDocumentById(recordId, options = {}) {
-    return returnNullWhenJsonRestResourceMissing(() =>
-      api.resources.googleRewardedProviderConfigs.get(
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      api.resources.googleRewardedProviderConfigs.query(
         {
-          id: recordId,
-          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, {}, {
-            include: options?.include
-          }),
+          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
           transaction: options?.trx || null,
           simplified: false
         },
@@ -38,6 +25,22 @@ function createRepository({ api, knex } = {}) {
     );
   }
 
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      returnNullWhenJsonRestResourceMissing(() =>
+        api.resources.googleRewardedProviderConfigs.get(
+          {
+            id: recordId,
+            queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
+            transaction: options?.trx || null,
+            simplified: false
+          },
+          createJsonRestContext(options?.context || null)
+        )
+      )
+    );
+  }
+
   async function createDocument(payload = {}, options = {}) {
     return api.resources.googleRewardedProviderConfigs.post(
       {
@@ -54,7 +57,7 @@ function createRepository({ api, knex } = {}) {
   async function patchDocumentById(recordId, patch = {}, options = {}) {
     const sourcePatch = patch && typeof patch === "object" && !Array.isArray(patch) ? patch : {};
     if (Object.keys(sourcePatch).length < 1) {
-      return getDocumentById(recordId, options);
+      return getDocumentById(recordId, {}, options);
     }
 
     return returnNullWhenJsonRestResourceMissing(() =>

package/src/server/providerConfigs/service.js

@@ -20,11 +20,10 @@ function createService({ googleRewardedProviderConfigsRepository } = {}) {
     }));
   }
 
-  async function getDocumentById(recordId, options = {}) {
-    return returnJsonApiDocument(return404IfNotFound(await googleRewardedProviderConfigsRepository.getDocumentById(recordId, {
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnJsonApiDocument(return404IfNotFound(await googleRewardedProviderConfigsRepository.getDocumentById(recordId, query, {
       trx: options?.trx || null,
-      context: options?.context || null,
-      include: options?.include
+      context: options?.context || null
     })));
   }
 

package/src/server/rules/actions.js

@@ -3,18 +3,12 @@ import {
   recordIdParamsValidator
 } from "@jskit-ai/kernel/shared/validators";
 import {
-  createCrudCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  lookupIncludeQueryValidator,
-  createCrudParentFilterQueryValidator
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators
 } from "@jskit-ai/crud-core/server/listQueryValidators";
 import { resource } from "../../shared/googleRewardedRuleResource.js";
 import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";
 
-const listCursorPaginationQueryValidator = createCrudCursorPaginationQueryValidator({
-  orderBy: resource.defaultSort
-});
-const listParentFilterQueryValidator = createCrudParentFilterQueryValidator(resource);
 const actionPermissions = Object.freeze({
   list: "crud.google_rewarded_rules.list",
   view: "crud.google_rewarded_rules.view",
@@ -33,12 +27,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.list] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  listCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  listParentFilterQueryValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        ...createStandardCrudListQueryValidators({ resource })
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -60,10 +51,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.view] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        ...createStandardCrudViewQueryValidators()
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -71,9 +62,9 @@ function createActions({ surface } = {}) {
       },
       observability: {},
       async execute(input, context, deps) {
-        return deps.googleRewardedRulesService.getDocumentById(input.recordId, {
-          context,
-          include: input.include
+        const { workspaceSlug, recordId, ...query } = input || {};
+        return deps.googleRewardedRulesService.getDocumentById(recordId, query, {
+          context
         });
       }
     },
@@ -85,11 +76,11 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.create] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  resource.operations.create.body,
-], {
-  mode: "create"
-}),
+        workspaceSlugParamsValidator,
+        resource.operations.create.body
+      ], {
+        mode: "create"
+      }),
       output: null,
       idempotency: "optional",
       audit: {
@@ -111,10 +102,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.update] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  resource.operations.patch.body,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        resource.operations.patch.body
+      ]),
       output: null,
       idempotency: "optional",
       audit: {
@@ -136,9 +127,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.delete] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator
+      ]),
       output: null,
       idempotency: "optional",
       audit: {

package/src/server/rules/repository.js

@@ -3,6 +3,7 @@ import {
   buildJsonRestQueryParams,
   createJsonApiInputRecord,
   createJsonRestContext,
+  returnBadRequestWhenJsonRestFieldsetInvalid,
   returnNullWhenJsonRestResourceMissing
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { resource } from "../../shared/googleRewardedRuleResource.js";
@@ -12,24 +13,10 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryDocuments(query = {}, options = {}) {
-    return api.resources.googleRewardedRules.query(
-      {
-        queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
-    );
-  }
-
-  async function getDocumentById(recordId, options = {}) {
-    return returnNullWhenJsonRestResourceMissing(() =>
-      api.resources.googleRewardedRules.get(
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      api.resources.googleRewardedRules.query(
         {
-          id: recordId,
-          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, {}, {
-            include: options?.include
-          }),
+          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
           transaction: options?.trx || null,
           simplified: false
         },
@@ -38,6 +25,22 @@ function createRepository({ api, knex } = {}) {
     );
   }
 
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      returnNullWhenJsonRestResourceMissing(() =>
+        api.resources.googleRewardedRules.get(
+          {
+            id: recordId,
+            queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
+            transaction: options?.trx || null,
+            simplified: false
+          },
+          createJsonRestContext(options?.context || null)
+        )
+      )
+    );
+  }
+
   async function createDocument(payload = {}, options = {}) {
     return api.resources.googleRewardedRules.post(
       {
@@ -54,7 +57,7 @@ function createRepository({ api, knex } = {}) {
   async function patchDocumentById(recordId, patch = {}, options = {}) {
     const sourcePatch = patch && typeof patch === "object" && !Array.isArray(patch) ? patch : {};
     if (Object.keys(sourcePatch).length < 1) {
-      return getDocumentById(recordId, options);
+      return getDocumentById(recordId, {}, options);
     }
 
     return returnNullWhenJsonRestResourceMissing(() =>

package/src/server/rules/service.js

@@ -20,11 +20,10 @@ function createService({ googleRewardedRulesRepository } = {}) {
     }));
   }
 
-  async function getDocumentById(recordId, options = {}) {
-    return returnJsonApiDocument(return404IfNotFound(await googleRewardedRulesRepository.getDocumentById(recordId, {
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnJsonApiDocument(return404IfNotFound(await googleRewardedRulesRepository.getDocumentById(recordId, query, {
       trx: options?.trx || null,
-      context: options?.context || null,
-      include: options?.include
+      context: options?.context || null
     })));
   }
 

package/src/server/service.js

@@ -416,7 +416,7 @@ function createService({
     }
 
     return googleRewardedWatchSessionsRepository.withTransaction(async (trx) => {
-      const sessionRecord = normalizeRecord(await googleRewardedWatchSessionsRepository.getDocumentById(sessionId, {
+      const sessionRecord = normalizeRecord(await googleRewardedWatchSessionsRepository.getDocumentById(sessionId, {}, {
         context: options?.context || null,
         trx
       }));
@@ -503,7 +503,7 @@ function createService({
       throw new AppError(400, "sessionId is required.");
     }
 
-    const sessionRecord = normalizeRecord(await googleRewardedWatchSessionsRepository.getDocumentById(sessionId, {
+    const sessionRecord = normalizeRecord(await googleRewardedWatchSessionsRepository.getDocumentById(sessionId, {}, {
       context: options?.context || null,
       trx: options?.trx || null
     }));

package/src/server/unlockReceipts/actions.js

@@ -3,18 +3,12 @@ import {
   recordIdParamsValidator
 } from "@jskit-ai/kernel/shared/validators";
 import {
-  createCrudCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  lookupIncludeQueryValidator,
-  createCrudParentFilterQueryValidator
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators
 } from "@jskit-ai/crud-core/server/listQueryValidators";
 import { resource } from "../../shared/googleRewardedUnlockReceiptResource.js";
 import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";
 
-const listCursorPaginationQueryValidator = createCrudCursorPaginationQueryValidator({
-  orderBy: resource.defaultSort
-});
-const listParentFilterQueryValidator = createCrudParentFilterQueryValidator(resource);
 const actionPermissions = Object.freeze({
   list: "crud.google_rewarded_unlock_receipts.list",
   view: "crud.google_rewarded_unlock_receipts.view",
@@ -33,12 +27,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.list] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  listCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  listParentFilterQueryValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        ...createStandardCrudListQueryValidators({ resource })
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -60,10 +51,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.view] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        ...createStandardCrudViewQueryValidators()
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -71,9 +62,9 @@ function createActions({ surface } = {}) {
       },
       observability: {},
       async execute(input, context, deps) {
-        return deps.googleRewardedUnlockReceiptsService.getDocumentById(input.recordId, {
-          context,
-          include: input.include
+        const { workspaceSlug, recordId, ...query } = input || {};
+        return deps.googleRewardedUnlockReceiptsService.getDocumentById(recordId, query, {
+          context
         });
       }
     },
@@ -85,11 +76,11 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.create] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  resource.operations.create.body,
-], {
-  mode: "create"
-}),
+        workspaceSlugParamsValidator,
+        resource.operations.create.body
+      ], {
+        mode: "create"
+      }),
       output: null,
       idempotency: "optional",
       audit: {
@@ -111,10 +102,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.update] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  resource.operations.patch.body,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        resource.operations.patch.body
+      ]),
       output: null,
       idempotency: "optional",
       audit: {
@@ -136,9 +127,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.delete] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator
+      ]),
       output: null,
       idempotency: "optional",
       audit: {

package/src/server/unlockReceipts/repository.js

@@ -3,6 +3,7 @@ import {
   buildJsonRestQueryParams,
   createJsonApiInputRecord,
   createJsonRestContext,
+  returnBadRequestWhenJsonRestFieldsetInvalid,
   returnNullWhenJsonRestResourceMissing
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { resource } from "../../shared/googleRewardedUnlockReceiptResource.js";
@@ -12,24 +13,10 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryDocuments(query = {}, options = {}) {
-    return api.resources.googleRewardedUnlockReceipts.query(
-      {
-        queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
-    );
-  }
-
-  async function getDocumentById(recordId, options = {}) {
-    return returnNullWhenJsonRestResourceMissing(() =>
-      api.resources.googleRewardedUnlockReceipts.get(
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      api.resources.googleRewardedUnlockReceipts.query(
         {
-          id: recordId,
-          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, {}, {
-            include: options?.include
-          }),
+          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
           transaction: options?.trx || null,
           simplified: false
         },
@@ -38,6 +25,22 @@ function createRepository({ api, knex } = {}) {
     );
   }
 
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      returnNullWhenJsonRestResourceMissing(() =>
+        api.resources.googleRewardedUnlockReceipts.get(
+          {
+            id: recordId,
+            queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
+            transaction: options?.trx || null,
+            simplified: false
+          },
+          createJsonRestContext(options?.context || null)
+        )
+      )
+    );
+  }
+
   async function createDocument(payload = {}, options = {}) {
     return api.resources.googleRewardedUnlockReceipts.post(
       {
@@ -54,7 +57,7 @@ function createRepository({ api, knex } = {}) {
   async function patchDocumentById(recordId, patch = {}, options = {}) {
     const sourcePatch = patch && typeof patch === "object" && !Array.isArray(patch) ? patch : {};
     if (Object.keys(sourcePatch).length < 1) {
-      return getDocumentById(recordId, options);
+      return getDocumentById(recordId, {}, options);
     }
 
     return returnNullWhenJsonRestResourceMissing(() =>

package/src/server/unlockReceipts/service.js

@@ -20,11 +20,10 @@ function createService({ googleRewardedUnlockReceiptsRepository } = {}) {
     }));
   }
 
-  async function getDocumentById(recordId, options = {}) {
-    return returnJsonApiDocument(return404IfNotFound(await googleRewardedUnlockReceiptsRepository.getDocumentById(recordId, {
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnJsonApiDocument(return404IfNotFound(await googleRewardedUnlockReceiptsRepository.getDocumentById(recordId, query, {
       trx: options?.trx || null,
-      context: options?.context || null,
-      include: options?.include
+      context: options?.context || null
     })));
   }
 

package/src/server/watchSessions/actions.js

@@ -3,18 +3,12 @@ import {
   recordIdParamsValidator
 } from "@jskit-ai/kernel/shared/validators";
 import {
-  createCrudCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  lookupIncludeQueryValidator,
-  createCrudParentFilterQueryValidator
+  createStandardCrudListQueryValidators,
+  createStandardCrudViewQueryValidators
 } from "@jskit-ai/crud-core/server/listQueryValidators";
 import { resource } from "../../shared/googleRewardedWatchSessionResource.js";
 import { workspaceSlugParamsValidator } from "@jskit-ai/workspaces-core/server/validators/routeParamsValidator";
 
-const listCursorPaginationQueryValidator = createCrudCursorPaginationQueryValidator({
-  orderBy: resource.defaultSort
-});
-const listParentFilterQueryValidator = createCrudParentFilterQueryValidator(resource);
 const actionPermissions = Object.freeze({
   list: "crud.google_rewarded_watch_sessions.list",
   view: "crud.google_rewarded_watch_sessions.view",
@@ -33,12 +27,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.list] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  listCursorPaginationQueryValidator,
-  listSearchQueryValidator,
-  listParentFilterQueryValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        ...createStandardCrudListQueryValidators({ resource })
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -60,10 +51,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.view] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  lookupIncludeQueryValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        ...createStandardCrudViewQueryValidators()
+      ]),
       output: null,
       idempotency: "none",
       audit: {
@@ -71,9 +62,9 @@ function createActions({ surface } = {}) {
       },
       observability: {},
       async execute(input, context, deps) {
-        return deps.googleRewardedWatchSessionsService.getDocumentById(input.recordId, {
-          context,
-          include: input.include
+        const { workspaceSlug, recordId, ...query } = input || {};
+        return deps.googleRewardedWatchSessionsService.getDocumentById(recordId, query, {
+          context
         });
       }
     },
@@ -85,11 +76,11 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.create] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  resource.operations.create.body,
-], {
-  mode: "create"
-}),
+        workspaceSlugParamsValidator,
+        resource.operations.create.body
+      ], {
+        mode: "create"
+      }),
       output: null,
       idempotency: "optional",
       audit: {
@@ -111,10 +102,10 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.update] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-  resource.operations.patch.body,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator,
+        resource.operations.patch.body
+      ]),
       output: null,
       idempotency: "optional",
       audit: {
@@ -136,9 +127,9 @@ function createActions({ surface } = {}) {
       surfaces: [surface],
       permission: { require: "all", permissions: [actionPermissions.delete] },
       input: composeSchemaDefinitions([
-  workspaceSlugParamsValidator,
-  recordIdParamsValidator,
-]),
+        workspaceSlugParamsValidator,
+        recordIdParamsValidator
+      ]),
       output: null,
       idempotency: "optional",
       audit: {

package/src/server/watchSessions/repository.js

@@ -3,6 +3,7 @@ import {
   buildJsonRestQueryParams,
   createJsonApiInputRecord,
   createJsonRestContext,
+  returnBadRequestWhenJsonRestFieldsetInvalid,
   returnNullWhenJsonRestResourceMissing
 } from "@jskit-ai/json-rest-api-core/server/jsonRestApiHost";
 import { resource } from "../../shared/googleRewardedWatchSessionResource.js";
@@ -12,24 +13,10 @@ function createRepository({ api, knex } = {}) {
   const withTransaction = createWithTransaction(knex);
 
   async function queryDocuments(query = {}, options = {}) {
-    return api.resources.googleRewardedWatchSessions.query(
-      {
-        queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
-        transaction: options?.trx || null,
-        simplified: false
-      },
-      createJsonRestContext(options?.context || null)
-    );
-  }
-
-  async function getDocumentById(recordId, options = {}) {
-    return returnNullWhenJsonRestResourceMissing(() =>
-      api.resources.googleRewardedWatchSessions.get(
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      api.resources.googleRewardedWatchSessions.query(
         {
-          id: recordId,
-          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, {}, {
-            include: options?.include
-          }),
+          queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
           transaction: options?.trx || null,
           simplified: false
         },
@@ -38,6 +25,22 @@ function createRepository({ api, knex } = {}) {
     );
   }
 
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnBadRequestWhenJsonRestFieldsetInvalid(() =>
+      returnNullWhenJsonRestResourceMissing(() =>
+        api.resources.googleRewardedWatchSessions.get(
+          {
+            id: recordId,
+            queryParams: buildJsonRestQueryParams(JSON_REST_SCOPE_NAME, query),
+            transaction: options?.trx || null,
+            simplified: false
+          },
+          createJsonRestContext(options?.context || null)
+        )
+      )
+    );
+  }
+
   async function createDocument(payload = {}, options = {}) {
     return api.resources.googleRewardedWatchSessions.post(
       {
@@ -54,7 +57,7 @@ function createRepository({ api, knex } = {}) {
   async function patchDocumentById(recordId, patch = {}, options = {}) {
     const sourcePatch = patch && typeof patch === "object" && !Array.isArray(patch) ? patch : {};
     if (Object.keys(sourcePatch).length < 1) {
-      return getDocumentById(recordId, options);
+      return getDocumentById(recordId, {}, options);
     }
 
     return returnNullWhenJsonRestResourceMissing(() =>

package/src/server/watchSessions/service.js

@@ -20,11 +20,10 @@ function createService({ googleRewardedWatchSessionsRepository } = {}) {
     }));
   }
 
-  async function getDocumentById(recordId, options = {}) {
-    return returnJsonApiDocument(return404IfNotFound(await googleRewardedWatchSessionsRepository.getDocumentById(recordId, {
+  async function getDocumentById(recordId, query = {}, options = {}) {
+    return returnJsonApiDocument(return404IfNotFound(await googleRewardedWatchSessionsRepository.getDocumentById(recordId, query, {
       trx: options?.trx || null,
-      context: options?.context || null,
-      include: options?.include
+      context: options?.context || null
     })));
   }