@rvoh/psychic 0.37.0-beta.9 → 0.37.2

package/dist/cjs/src/cli/index.js

@@ -21,7 +21,8 @@ class PsychicCLI {
             .command('generate:resource')
             .alias('g:resource')
             .description('create a Dream model, migration, controller, serializer, and spec placeholders')
-            .option('--sti-base-serializer', 'Omits the serializer from the dream model, but does create the serializer so it can be extended by STI children')
+            .option('--sti-base-serializer', 'omits the serializer from the dream model, but does create the serializer so it can be extended by STI children')
+            .option('--owning-model <modelName>', 'The model class of the object that `associationQuery`/`createAssociation` will be performed on in the created controller and spec (e.g., "Host", "Guest") (simply to save time making changes to the generated code). Defaults to User')
             .argument('<path>', 'URL path from root domain')
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('[columnsWithTypes...]', 'properties of the model property1:text/string/enum/etc. property2:text/string/enum/etc. ... propertyN:text/string/enum/etc.')

package/dist/cjs/src/generate/controller.js

@@ -37,7 +37,7 @@ const psychicPath_js_1 = __importDefault(require("../helpers/path/psychicPath.js
 const generateControllerContent_js_1 = __importDefault(require("./helpers/generateControllerContent.js"));
 const generateControllerSpecContent_js_1 = __importDefault(require("./helpers/generateControllerSpecContent.js"));
 const generateResourceControllerSpecContent_js_1 = __importDefault(require("./helpers/generateResourceControllerSpecContent.js"));
-async function generateController({ fullyQualifiedControllerName, fullyQualifiedModelName, actions, columnsWithTypes = [], resourceSpecs = false, }) {
+async function generateController({ fullyQualifiedControllerName, fullyQualifiedModelName, actions, columnsWithTypes = [], resourceSpecs = false, owningModel, }) {
     fullyQualifiedModelName = fullyQualifiedModelName
         ? (0, dream_1.standardizeFullyQualifiedModelName)(fullyQualifiedModelName)
         : fullyQualifiedModelName;
@@ -89,6 +89,7 @@ async function generateController({ fullyQualifiedControllerName, fullyQualified
             fullyQualifiedControllerName,
             fullyQualifiedModelName,
             actions,
+            owningModel,
         }));
     }
     catch (error) {
@@ -106,6 +107,7 @@ async function generateController({ fullyQualifiedControllerName, fullyQualified
         fullyQualifiedModelName,
         columnsWithTypes,
         resourceSpecs,
+        owningModel,
     });
 }
 function baseAncestorNameAndImport(controllerNameParts, isAdmin, { forBaseController }) {
@@ -117,7 +119,7 @@ function baseAncestorNameAndImport(controllerNameParts, isAdmin, { forBaseContro
             : [`AuthedController`, `import AuthedController from '${dotFiles}/AuthedController.js'`]
         : [maybeAncestorNameForBase, `import ${maybeAncestorNameForBase} from '${dotFiles}/BaseController.js'`];
 }
-async function generateControllerSpec({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, resourceSpecs, }) {
+async function generateControllerSpec({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, resourceSpecs, owningModel, }) {
     const { relFilePath, absDirPath, absFilePath } = (0, psychicFileAndDirPaths_js_1.default)((0, psychicPath_js_1.default)('controllerSpecs'), fullyQualifiedControllerName + `.spec.ts`);
     try {
         if (!EnvInternal_js_1.default.isTest)
@@ -129,6 +131,7 @@ async function generateControllerSpec({ fullyQualifiedControllerName, route, ful
                 route,
                 fullyQualifiedModelName,
                 columnsWithTypes,
+                owningModel,
             })
             : (0, generateControllerSpecContent_js_1.default)(fullyQualifiedControllerName));
     }

package/dist/cjs/src/generate/helpers/generateControllerContent.js

@@ -7,10 +7,14 @@ exports.default = generateControllerContent;
 const dream_1 = require("@rvoh/dream");
 const pluralize_esm_1 = __importDefault(require("pluralize-esm"));
 const relativePsychicPath_js_1 = __importDefault(require("../../helpers/path/relativePsychicPath.js"));
-function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, }) {
+function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, owningModel, }) {
     fullyQualifiedControllerName = (0, dream_1.standardizeFullyQualifiedModelName)(fullyQualifiedControllerName);
     const additionalImports = [];
     const controllerClassName = (0, dream_1.globalClassNameFromFullyQualifiedModelName)(fullyQualifiedControllerName);
+    // Determine user model variables
+    const actualOwningModel = owningModel || 'User';
+    const owningModelClassName = (0, dream_1.globalClassNameFromFullyQualifiedModelName)(actualOwningModel);
+    const owningModelProperty = `current${owningModelClassName}`;
     let modelClassName;
     let modelAttributeName;
     let pluralizedModelAttributeName;
@@ -32,7 +36,7 @@ function generateControllerContent({ ancestorName, ancestorImportStatement, full
     description: 'Create ${aOrAnDreamModelName(modelClassName)}',
   })
   public async create() {
-    //    const ${modelAttributeName} = await this.currentUser.createAssociation('${pluralizedModelAttributeName}', this.paramsFor(${modelClassName}))
+    //    const ${modelAttributeName} = await this.${owningModelProperty}.createAssociation('${pluralizedModelAttributeName}', this.paramsFor(${modelClassName}))
     //    this.created(${modelAttributeName})
   }`;
                 else
@@ -55,7 +59,7 @@ function generateControllerContent({ ancestorName, ancestorImportStatement, full
     serializerKey: 'summary',
   })
   public async index() {
-    //    const ${pluralizedModelAttributeName} = await this.currentUser.associationQuery('${pluralizedModelAttributeName}').all()
+    //    const ${pluralizedModelAttributeName} = await this.${owningModelProperty}.associationQuery('${pluralizedModelAttributeName}').all()
     //    this.ok(${pluralizedModelAttributeName})
   }`;
                 else
@@ -163,21 +167,21 @@ function generateControllerContent({ ancestorName, ancestorImportStatement, full
 ${omitOpenApi ? '' : openApiImport + '\n'}${ancestorImportStatement}${additionalImports.length ? '\n' + additionalImports.join('\n') : ''}${omitOpenApi ? '' : '\n\n' + openApiTags}
 
 export default class ${controllerClassName} extends ${ancestorName} {
-${methodDefs.join('\n\n')}${modelClassName ? privateMethods(modelClassName, actions) : ''}
+${methodDefs.join('\n\n')}${modelClassName ? privateMethods(modelClassName, actions, owningModelProperty) : ''}
 }
 `;
 }
-function privateMethods(modelClassName, methods) {
+function privateMethods(modelClassName, methods, owningModelProperty) {
     const privateMethods = [];
     if (methods.find(methodName => ['show', 'update', 'destroy'].includes(methodName)))
-        privateMethods.push(loadModelStatement(modelClassName));
+        privateMethods.push(loadModelStatement(modelClassName, owningModelProperty));
     if (!privateMethods.length)
         return '';
     return `\n\n${privateMethods.join('\n\n')}`;
 }
-function loadModelStatement(modelClassName) {
+function loadModelStatement(modelClassName, owningModelProperty) {
     return `  private async ${(0, dream_1.camelize)(modelClassName)}() {
-    // return await this.currentUser.associationQuery('${(0, pluralize_esm_1.default)((0, dream_1.camelize)(modelClassName))}').findOrFail(
+    // return await this.${owningModelProperty}.associationQuery('${(0, pluralize_esm_1.default)((0, dream_1.camelize)(modelClassName))}').findOrFail(
     //   this.castParam('id', 'string')
     // )
   }`;

package/dist/cjs/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -7,16 +7,26 @@ exports.default = generateResourceControllerSpecContent;
 const dream_1 = require("@rvoh/dream");
 const relativePsychicPath_js_1 = __importDefault(require("../../helpers/path/relativePsychicPath.js"));
 const updirsFromPath_js_1 = __importDefault(require("../../helpers/path/updirsFromPath.js"));
-function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, }) {
+function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, owningModel, }) {
     fullyQualifiedModelName = (0, dream_1.standardizeFullyQualifiedModelName)(fullyQualifiedModelName);
     const modelClassName = (0, dream_1.globalClassNameFromFullyQualifiedModelName)(fullyQualifiedModelName);
     const modelVariableName = (0, dream_1.camelize)(modelClassName);
+    // Always use User for authentication
+    const owningModelClassName = 'User';
+    const userVariableName = 'user';
+    // Determine attached model settings if provided
+    const attachedModelClassName = owningModel ? (0, dream_1.globalClassNameFromFullyQualifiedModelName)(owningModel) : null;
+    const attachedModelVariableName = attachedModelClassName ? (0, dream_1.camelize)(attachedModelClassName) : null;
     const importStatements = [
         importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModel(fullyQualifiedControllerName, 'User'),
         importStatementForModelFactory(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModelFactory(fullyQualifiedControllerName, 'User'),
     ];
+    // Add attached model imports if specified
+    if (owningModel) {
+        importStatements.push(importStatementForModel(fullyQualifiedControllerName, owningModel), importStatementForModelFactory(fullyQualifiedControllerName, owningModel));
+    }
     const specUnitUpdirs = (0, updirsFromPath_js_1.default)(fullyQualifiedControllerName);
     const originalStringKeyValues = [];
     const updatedStringKeyValues = [];
@@ -46,23 +56,23 @@ import { specRequest as request } from '@rvoh/psychic-spec-helpers'${(0, dream_1
 import addEndUserAuthHeader from '${specUnitUpdirs}helpers/authentication.js'
 
 describe('${fullyQualifiedControllerName}', () => {
-  let user: User
+  let ${userVariableName}: ${owningModelClassName}${attachedModelVariableName ? `\n  let ${attachedModelVariableName}: ${attachedModelClassName}` : ''}
 
   beforeEach(async () => {
     await request.init(PsychicServer)
-    user = await createUser()
+    ${userVariableName} = await createUser()${attachedModelVariableName ? `\n    ${attachedModelVariableName} = await create${attachedModelClassName}({ ${userVariableName} })` : ''}
   })
 
   describe('GET index', () => {
     const subject = async (expectedStatus: number = 200) => {
       return request.get('/${route}', expectedStatus, {
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('returns the index of ${fullyQualifiedModelName}s', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
+        ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject()).body
 
@@ -73,7 +83,7 @@ describe('${fullyQualifiedControllerName}', () => {
       ])
     })
 
-    context('${modelClassName}s created by another User', () => {
+    context('${modelClassName}s created by another ${owningModelClassName}', () => {
       it('are omitted', async () => {
         await create${modelClassName}()
         const results = (await subject()).body
@@ -86,13 +96,13 @@ describe('${fullyQualifiedControllerName}', () => {
   describe('GET show', () => {
     const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) => {
       return request.get(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('returns the specified ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
+        ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject(${modelVariableName})).body
 
@@ -103,10 +113,10 @@ describe('${fullyQualifiedControllerName}', () => {
       )
     })
 
-    context('${fullyQualifiedModelName} created by another User', () => {
+    context('${fullyQualifiedModelName} created by another ${owningModelClassName}', () => {
       it('is not found', async () => {
-        const otherUser${modelClassName} = await create${modelClassName}()
-        await subject(otherUser${modelClassName}, 404)
+        const other${owningModelClassName}${modelClassName} = await create${modelClassName}()
+        await subject(other${owningModelClassName}${modelClassName}, 404)
       })
     })
   })
@@ -115,15 +125,15 @@ describe('${fullyQualifiedControllerName}', () => {
     const subject = async (data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) => {
       return request.post('/${route}', expectedStatus, {
         data,
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
-    it('creates a ${fullyQualifiedModelName} for this User', async () => {
+    it('creates a ${fullyQualifiedModelName} for this ${owningModelClassName}', async () => {
       const results = (await subject({
         ${originalStringKeyValues.length ? originalStringKeyValues.join('\n        ') : ''}
       })).body
-      const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ userId: user.id })
+      const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ ${userVariableName}Id: ${userVariableName}.id })
 
       expect(results).toEqual(
         expect.objectContaining({
@@ -137,13 +147,13 @@ describe('${fullyQualifiedControllerName}', () => {
     const subject = async (${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) => {
       return request.patch(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
         data,
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('updates the ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
+        ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       await subject(${modelVariableName}, {
         ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n        ') : ''}
@@ -153,11 +163,9 @@ describe('${fullyQualifiedControllerName}', () => {
       ${updatedStringAttributeChecks.join('\n      ')}
     })
 
-    context('a ${fullyQualifiedModelName} created by another User', () => {
+    context('a ${fullyQualifiedModelName} created by another ${owningModelClassName}', () => {
       it('is not updated', async () => {
-        const ${modelVariableName} = await create${modelClassName}({
-          ${originalStringKeyValues.length ? originalStringKeyValues.join('\n          ') : ''}
-        })
+        const ${modelVariableName} = await create${modelClassName}()
         await subject(${modelVariableName}, {
           ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n          ') : ''}
         }, 404)
@@ -171,18 +179,18 @@ describe('${fullyQualifiedControllerName}', () => {
   describe('DELETE destroy', () => {
     const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) => {
       return request.delete(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('deletes the ${fullyQualifiedModelName}', async () => {
-      const ${modelVariableName} = await create${modelClassName}({ user })
+      const ${modelVariableName} = await create${modelClassName}({ ${attachedModelVariableName || userVariableName} })
       await subject(${modelVariableName})
 
       expect(await ${modelClassName}.find(${modelVariableName}.id)).toBeNull()
     })
 
-    context('a ${fullyQualifiedModelName} created by another User', () => {
+    context('a ${fullyQualifiedModelName} created by another ${owningModelClassName}', () => {
       it('is not deleted', async () => {
         const ${modelVariableName} = await create${modelClassName}()
         await subject(${modelVariableName}, 404)

package/dist/cjs/src/generate/resource.js

@@ -21,6 +21,7 @@ async function generateResource({ route, fullyQualifiedModelName, options, colum
         actions: ['create', 'index', 'show', 'update', 'destroy'],
         columnsWithTypes,
         resourceSpecs: true,
+        owningModel: options.owningModel,
     });
     await (0, addResourceToRoutes_js_1.default)(route);
 }

package/dist/esm/src/cli/index.js

@@ -16,7 +16,8 @@ export default class PsychicCLI {
             .command('generate:resource')
             .alias('g:resource')
             .description('create a Dream model, migration, controller, serializer, and spec placeholders')
-            .option('--sti-base-serializer', 'Omits the serializer from the dream model, but does create the serializer so it can be extended by STI children')
+            .option('--sti-base-serializer', 'omits the serializer from the dream model, but does create the serializer so it can be extended by STI children')
+            .option('--owning-model <modelName>', 'The model class of the object that `associationQuery`/`createAssociation` will be performed on in the created controller and spec (e.g., "Host", "Guest") (simply to save time making changes to the generated code). Defaults to User')
             .argument('<path>', 'URL path from root domain')
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('[columnsWithTypes...]', 'properties of the model property1:text/string/enum/etc. property2:text/string/enum/etc. ... propertyN:text/string/enum/etc.')

package/dist/esm/src/generate/controller.js

@@ -8,7 +8,7 @@ import psychicPath from '../helpers/path/psychicPath.js';
 import generateControllerContent from './helpers/generateControllerContent.js';
 import generateControllerSpecContent from './helpers/generateControllerSpecContent.js';
 import generateResourceControllerSpecContent from './helpers/generateResourceControllerSpecContent.js';
-export default async function generateController({ fullyQualifiedControllerName, fullyQualifiedModelName, actions, columnsWithTypes = [], resourceSpecs = false, }) {
+export default async function generateController({ fullyQualifiedControllerName, fullyQualifiedModelName, actions, columnsWithTypes = [], resourceSpecs = false, owningModel, }) {
     fullyQualifiedModelName = fullyQualifiedModelName
         ? standardizeFullyQualifiedModelName(fullyQualifiedModelName)
         : fullyQualifiedModelName;
@@ -60,6 +60,7 @@ export default async function generateController({ fullyQualifiedControllerName,
             fullyQualifiedControllerName,
             fullyQualifiedModelName,
             actions,
+            owningModel,
         }));
     }
     catch (error) {
@@ -77,6 +78,7 @@ export default async function generateController({ fullyQualifiedControllerName,
         fullyQualifiedModelName,
         columnsWithTypes,
         resourceSpecs,
+        owningModel,
     });
 }
 function baseAncestorNameAndImport(controllerNameParts, isAdmin, { forBaseController }) {
@@ -88,7 +90,7 @@ function baseAncestorNameAndImport(controllerNameParts, isAdmin, { forBaseContro
             : [`AuthedController`, `import AuthedController from '${dotFiles}/AuthedController.js'`]
         : [maybeAncestorNameForBase, `import ${maybeAncestorNameForBase} from '${dotFiles}/BaseController.js'`];
 }
-async function generateControllerSpec({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, resourceSpecs, }) {
+async function generateControllerSpec({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, resourceSpecs, owningModel, }) {
     const { relFilePath, absDirPath, absFilePath } = psychicFileAndDirPaths(psychicPath('controllerSpecs'), fullyQualifiedControllerName + `.spec.ts`);
     try {
         if (!EnvInternal.isTest)
@@ -100,6 +102,7 @@ async function generateControllerSpec({ fullyQualifiedControllerName, route, ful
                 route,
                 fullyQualifiedModelName,
                 columnsWithTypes,
+                owningModel,
             })
             : generateControllerSpecContent(fullyQualifiedControllerName));
     }

package/dist/esm/src/generate/helpers/generateControllerContent.js

@@ -1,10 +1,14 @@
 import { camelize, globalClassNameFromFullyQualifiedModelName, hyphenize, standardizeFullyQualifiedModelName, } from '@rvoh/dream';
 import pluralize from 'pluralize-esm';
 import relativePsychicPath from '../../helpers/path/relativePsychicPath.js';
-export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, }) {
+export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions = [], omitOpenApi = false, owningModel, }) {
     fullyQualifiedControllerName = standardizeFullyQualifiedModelName(fullyQualifiedControllerName);
     const additionalImports = [];
     const controllerClassName = globalClassNameFromFullyQualifiedModelName(fullyQualifiedControllerName);
+    // Determine user model variables
+    const actualOwningModel = owningModel || 'User';
+    const owningModelClassName = globalClassNameFromFullyQualifiedModelName(actualOwningModel);
+    const owningModelProperty = `current${owningModelClassName}`;
     let modelClassName;
     let modelAttributeName;
     let pluralizedModelAttributeName;
@@ -26,7 +30,7 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     description: 'Create ${aOrAnDreamModelName(modelClassName)}',
   })
   public async create() {
-    //    const ${modelAttributeName} = await this.currentUser.createAssociation('${pluralizedModelAttributeName}', this.paramsFor(${modelClassName}))
+    //    const ${modelAttributeName} = await this.${owningModelProperty}.createAssociation('${pluralizedModelAttributeName}', this.paramsFor(${modelClassName}))
     //    this.created(${modelAttributeName})
   }`;
                 else
@@ -49,7 +53,7 @@ export default function generateControllerContent({ ancestorName, ancestorImport
     serializerKey: 'summary',
   })
   public async index() {
-    //    const ${pluralizedModelAttributeName} = await this.currentUser.associationQuery('${pluralizedModelAttributeName}').all()
+    //    const ${pluralizedModelAttributeName} = await this.${owningModelProperty}.associationQuery('${pluralizedModelAttributeName}').all()
     //    this.ok(${pluralizedModelAttributeName})
   }`;
                 else
@@ -157,21 +161,21 @@ export default function generateControllerContent({ ancestorName, ancestorImport
 ${omitOpenApi ? '' : openApiImport + '\n'}${ancestorImportStatement}${additionalImports.length ? '\n' + additionalImports.join('\n') : ''}${omitOpenApi ? '' : '\n\n' + openApiTags}
 
 export default class ${controllerClassName} extends ${ancestorName} {
-${methodDefs.join('\n\n')}${modelClassName ? privateMethods(modelClassName, actions) : ''}
+${methodDefs.join('\n\n')}${modelClassName ? privateMethods(modelClassName, actions, owningModelProperty) : ''}
 }
 `;
 }
-function privateMethods(modelClassName, methods) {
+function privateMethods(modelClassName, methods, owningModelProperty) {
     const privateMethods = [];
     if (methods.find(methodName => ['show', 'update', 'destroy'].includes(methodName)))
-        privateMethods.push(loadModelStatement(modelClassName));
+        privateMethods.push(loadModelStatement(modelClassName, owningModelProperty));
     if (!privateMethods.length)
         return '';
     return `\n\n${privateMethods.join('\n\n')}`;
 }
-function loadModelStatement(modelClassName) {
+function loadModelStatement(modelClassName, owningModelProperty) {
     return `  private async ${camelize(modelClassName)}() {
-    // return await this.currentUser.associationQuery('${pluralize(camelize(modelClassName))}').findOrFail(
+    // return await this.${owningModelProperty}.associationQuery('${pluralize(camelize(modelClassName))}').findOrFail(
     //   this.castParam('id', 'string')
     // )
   }`;

package/dist/esm/src/generate/helpers/generateResourceControllerSpecContent.js

@@ -1,16 +1,26 @@
 import { camelize, globalClassNameFromFullyQualifiedModelName, standardizeFullyQualifiedModelName, uniq, } from '@rvoh/dream';
 import relativePsychicPath from '../../helpers/path/relativePsychicPath.js';
 import updirsFromPath from '../../helpers/path/updirsFromPath.js';
-export default function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, }) {
+export default function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, owningModel, }) {
     fullyQualifiedModelName = standardizeFullyQualifiedModelName(fullyQualifiedModelName);
     const modelClassName = globalClassNameFromFullyQualifiedModelName(fullyQualifiedModelName);
     const modelVariableName = camelize(modelClassName);
+    // Always use User for authentication
+    const owningModelClassName = 'User';
+    const userVariableName = 'user';
+    // Determine attached model settings if provided
+    const attachedModelClassName = owningModel ? globalClassNameFromFullyQualifiedModelName(owningModel) : null;
+    const attachedModelVariableName = attachedModelClassName ? camelize(attachedModelClassName) : null;
     const importStatements = [
         importStatementForModel(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModel(fullyQualifiedControllerName, 'User'),
         importStatementForModelFactory(fullyQualifiedControllerName, fullyQualifiedModelName),
         importStatementForModelFactory(fullyQualifiedControllerName, 'User'),
     ];
+    // Add attached model imports if specified
+    if (owningModel) {
+        importStatements.push(importStatementForModel(fullyQualifiedControllerName, owningModel), importStatementForModelFactory(fullyQualifiedControllerName, owningModel));
+    }
     const specUnitUpdirs = updirsFromPath(fullyQualifiedControllerName);
     const originalStringKeyValues = [];
     const updatedStringKeyValues = [];
@@ -40,23 +50,23 @@ import { specRequest as request } from '@rvoh/psychic-spec-helpers'${uniq(import
 import addEndUserAuthHeader from '${specUnitUpdirs}helpers/authentication.js'
 
 describe('${fullyQualifiedControllerName}', () => {
-  let user: User
+  let ${userVariableName}: ${owningModelClassName}${attachedModelVariableName ? `\n  let ${attachedModelVariableName}: ${attachedModelClassName}` : ''}
 
   beforeEach(async () => {
     await request.init(PsychicServer)
-    user = await createUser()
+    ${userVariableName} = await createUser()${attachedModelVariableName ? `\n    ${attachedModelVariableName} = await create${attachedModelClassName}({ ${userVariableName} })` : ''}
   })
 
   describe('GET index', () => {
     const subject = async (expectedStatus: number = 200) => {
       return request.get('/${route}', expectedStatus, {
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('returns the index of ${fullyQualifiedModelName}s', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
+        ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject()).body
 
@@ -67,7 +77,7 @@ describe('${fullyQualifiedControllerName}', () => {
       ])
     })
 
-    context('${modelClassName}s created by another User', () => {
+    context('${modelClassName}s created by another ${owningModelClassName}', () => {
       it('are omitted', async () => {
         await create${modelClassName}()
         const results = (await subject()).body
@@ -80,13 +90,13 @@ describe('${fullyQualifiedControllerName}', () => {
   describe('GET show', () => {
     const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 200) => {
       return request.get(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('returns the specified ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
+        ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       const results = (await subject(${modelVariableName})).body
 
@@ -97,10 +107,10 @@ describe('${fullyQualifiedControllerName}', () => {
       )
     })
 
-    context('${fullyQualifiedModelName} created by another User', () => {
+    context('${fullyQualifiedModelName} created by another ${owningModelClassName}', () => {
       it('is not found', async () => {
-        const otherUser${modelClassName} = await create${modelClassName}()
-        await subject(otherUser${modelClassName}, 404)
+        const other${owningModelClassName}${modelClassName} = await create${modelClassName}()
+        await subject(other${owningModelClassName}${modelClassName}, 404)
       })
     })
   })
@@ -109,15 +119,15 @@ describe('${fullyQualifiedControllerName}', () => {
     const subject = async (data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 201) => {
       return request.post('/${route}', expectedStatus, {
         data,
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
-    it('creates a ${fullyQualifiedModelName} for this User', async () => {
+    it('creates a ${fullyQualifiedModelName} for this ${owningModelClassName}', async () => {
       const results = (await subject({
         ${originalStringKeyValues.length ? originalStringKeyValues.join('\n        ') : ''}
       })).body
-      const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ userId: user.id })
+      const ${modelVariableName} = await ${modelClassName}.findOrFailBy({ ${userVariableName}Id: ${userVariableName}.id })
 
       expect(results).toEqual(
         expect.objectContaining({
@@ -131,13 +141,13 @@ describe('${fullyQualifiedControllerName}', () => {
     const subject = async (${modelVariableName}: ${modelClassName}, data: UpdateableProperties<${modelClassName}>, expectedStatus: number = 204) => {
       return request.patch(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
         data,
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('updates the ${fullyQualifiedModelName}', async () => {
       const ${modelVariableName} = await create${modelClassName}({
-        user${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
+        ${attachedModelVariableName || userVariableName}${originalStringKeyValues.length ? ',\n        ' + originalStringKeyValues.join('\n        ') : ''}
       })
       await subject(${modelVariableName}, {
         ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n        ') : ''}
@@ -147,11 +157,9 @@ describe('${fullyQualifiedControllerName}', () => {
       ${updatedStringAttributeChecks.join('\n      ')}
     })
 
-    context('a ${fullyQualifiedModelName} created by another User', () => {
+    context('a ${fullyQualifiedModelName} created by another ${owningModelClassName}', () => {
       it('is not updated', async () => {
-        const ${modelVariableName} = await create${modelClassName}({
-          ${originalStringKeyValues.length ? originalStringKeyValues.join('\n          ') : ''}
-        })
+        const ${modelVariableName} = await create${modelClassName}()
         await subject(${modelVariableName}, {
           ${updatedStringKeyValues.length ? updatedStringKeyValues.join('\n          ') : ''}
         }, 404)
@@ -165,18 +173,18 @@ describe('${fullyQualifiedControllerName}', () => {
   describe('DELETE destroy', () => {
     const subject = async (${modelVariableName}: ${modelClassName}, expectedStatus: number = 204) => {
       return request.delete(\`/${route}/\${${modelVariableName}.id}\`, expectedStatus, {
-        headers: await addEndUserAuthHeader(request, user, {}),
+        headers: await addEndUserAuthHeader(request, ${userVariableName}, {}),
       })
     }
 
     it('deletes the ${fullyQualifiedModelName}', async () => {
-      const ${modelVariableName} = await create${modelClassName}({ user })
+      const ${modelVariableName} = await create${modelClassName}({ ${attachedModelVariableName || userVariableName} })
       await subject(${modelVariableName})
 
       expect(await ${modelClassName}.find(${modelVariableName}.id)).toBeNull()
     })
 
-    context('a ${fullyQualifiedModelName} created by another User', () => {
+    context('a ${fullyQualifiedModelName} created by another ${owningModelClassName}', () => {
       it('is not deleted', async () => {
         const ${modelVariableName} = await create${modelClassName}()
         await subject(${modelVariableName}, 404)

package/dist/esm/src/generate/resource.js

@@ -15,6 +15,7 @@ export default async function generateResource({ route, fullyQualifiedModelName,
         actions: ['create', 'index', 'show', 'update', 'destroy'],
         columnsWithTypes,
         resourceSpecs: true,
+        owningModel: options.owningModel,
     });
     await addResourceToRoutes(route);
 }

package/dist/types/src/bin/index.d.ts

@@ -2,6 +2,7 @@ export default class PsychicBin {
     static generateController(controllerName: string, actions: string[]): Promise<void>;
     static generateResource(route: string, fullyQualifiedModelName: string, columnsWithTypes: string[], options: {
         stiBaseSerializer: boolean;
+        owningModel?: string;
     }): Promise<void>;
     static routes(): Promise<void>;
     static sync({ bypassDreamSync }?: {

package/dist/types/src/generate/controller.d.ts

@@ -1,7 +1,8 @@
-export default function generateController({ fullyQualifiedControllerName, fullyQualifiedModelName, actions, columnsWithTypes, resourceSpecs, }: {
+export default function generateController({ fullyQualifiedControllerName, fullyQualifiedModelName, actions, columnsWithTypes, resourceSpecs, owningModel, }: {
     fullyQualifiedControllerName: string;
     fullyQualifiedModelName?: string;
     actions: string[];
     columnsWithTypes?: string[];
     resourceSpecs?: boolean;
+    owningModel?: string | undefined;
 }): Promise<void>;

package/dist/types/src/generate/helpers/generateControllerContent.d.ts

@@ -1,8 +1,9 @@
-export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions, omitOpenApi, }: {
+export default function generateControllerContent({ ancestorName, ancestorImportStatement, fullyQualifiedControllerName, fullyQualifiedModelName, actions, omitOpenApi, owningModel, }: {
     ancestorName: string;
     ancestorImportStatement: string;
     fullyQualifiedControllerName: string;
     fullyQualifiedModelName?: string | undefined;
     actions?: string[] | undefined;
     omitOpenApi?: boolean | undefined;
+    owningModel?: string | undefined;
 }): string;

package/dist/types/src/generate/helpers/generateResourceControllerSpecContent.d.ts

@@ -1,6 +1,7 @@
-export default function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, }: {
+export default function generateResourceControllerSpecContent({ fullyQualifiedControllerName, route, fullyQualifiedModelName, columnsWithTypes, owningModel, }: {
     fullyQualifiedControllerName: string;
     route: string;
     fullyQualifiedModelName: string;
     columnsWithTypes: string[];
+    owningModel?: string | undefined;
 }): string;

package/dist/types/src/generate/resource.d.ts

@@ -3,6 +3,7 @@ export default function generateResource({ route, fullyQualifiedModelName, optio
     fullyQualifiedModelName: string;
     options: {
         stiBaseSerializer: boolean;
+        owningModel?: string;
     };
     columnsWithTypes: string[];
 }): Promise<void>;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic",
   "description": "Typescript web framework",
-  "version": "0.37.0-beta.9",
+  "version": "0.37.2",
   "author": "RVOHealth",
   "repository": {
     "type": "git",
@@ -85,4 +85,4 @@
     "winston": "^3.14.2"
   },
   "packageManager": "yarn@4.7.0"
-}
+}