Normalize creator props to User relationships

Author: CarsonF

src/components/post/dto/post.dto.ts

@@ -3,10 +3,9 @@ import { DateTime } from 'luxon';
 import { keys as keysOf } from 'ts-transformer-keys';
 import { BaseNode } from '~/core/database/results';
 import { e } from '~/core/edgedb';
-import { RegisterResource } from '~/core/resources';
+import { LinkTo, RegisterResource } from '~/core/resources';
 import {
   DateTimeField,
-  ID,
   Resource,
   Secured,
   SecuredProps,
@@ -26,7 +25,7 @@ export class Post extends Resource {
 
   readonly parent: BaseNode;
 
-  readonly creator: Secured<ID>;
+  readonly creator: Secured<LinkTo<'User'>>;
 
   @Field(() => PostType)
   readonly type: PostType;

src/components/post/post.repository.ts

@@ -24,7 +24,6 @@ export class PostRepository extends DtoRepository<typeof Post, [Session] | []>(
 ) {
   async create(input: CreatePost, session: Session) {
     const initialProps = {
-      creator: session.userId,
       type: input.type,
       shareability: input.shareability,
       body: input.body,
@@ -35,8 +34,13 @@ export class PostRepository extends DtoRepository<typeof Post, [Session] | []>(
       .apply(matchRequestingUser(session))
       .apply(await createNode(Post, { initialProps }))
       .apply(
-        createRelationships(Post, 'in', {
-          post: ['BaseNode', input.parentId],
+        createRelationships(Post, {
+          in: {
+            post: ['BaseNode', input.parentId],
+          },
+          out: {
+            creator: ['User', session.userId],
+          },
         }),
       )
       .apply(this.hydrate())
@@ -115,10 +119,16 @@ export class PostRepository extends DtoRepository<typeof Post, [Session] | []>(
           relation('in', '', 'post', ACTIVE),
           node('parent', 'BaseNode'),
         ])
+        .match([
+          node('node'),
+          relation('out', '', 'creator', ACTIVE),
+          node('creator', 'User'),
+        ])
         .apply(matchProps())
         .return<{ dto: DbTypeOf<Post> }>(
           merge('props', {
             parent: 'parent',
+            creator: 'creator { .id }',
           }).as('dto'),
         );
   }

src/components/post/post.resolver.ts

@@ -55,7 +55,7 @@ export class PostResolver {
     @Parent() post: Post,
     @Loader(UserLoader) users: LoaderOf<UserLoader>,
   ): Promise<SecuredUser> {
-    return await mapSecuredValue(post.creator, (id) => users.load(id));
+    return await mapSecuredValue(post.creator, ({ id }) => users.load(id));
   }
 
   @Mutation(() => UpdatePostOutput, {

src/components/progress-report/media/dto/media.dto.ts

@@ -9,11 +9,10 @@ import {
   Variant,
   VariantOf,
 } from '~/common';
-import { SetDbType } from '~/core';
+import { LinkTo, SetDbType } from '~/core';
 import { e } from '~/core/edgedb';
 import { RegisterResource } from '~/core/resources';
 import { FileId, Media } from '../../../file';
-import { User } from '../../../user';
 import { ProgressReport } from '../../dto';
 import { ProgressReportHighlight } from '../../dto/highlights.dto';
 import { MediaCategory } from '../media-category.enum';
@@ -53,7 +52,7 @@ export class ProgressReportMedia extends Resource {
   @IdField()
   readonly variantGroup: VariantGroup;
 
-  readonly creator: IdOf<User>;
+  readonly creator: LinkTo<'User'>;
 }
 
 export type MediaVariant = VariantOf<typeof ProgressReportMedia>;

src/components/progress-report/media/progress-report-media.repository.ts

@@ -12,7 +12,6 @@ import {
 import { DbTypeOf, DtoRepository } from '~/core';
 import {
   ACTIVE,
-  apoc,
   createNode,
   createRelationships,
   filter,
@@ -169,10 +168,14 @@ export class ProgressReportMediaRepository extends DtoRepository<
           baseNodeProps: {
             variant: input.variant.key,
             category: input.category,
-            creator: session.userId,
           },
         }),
       )
+      .apply(
+        createRelationships(this.resource, 'out', {
+          creator: ['User', session.userId],
+        }),
+      )
       .apply(
         createRelationships(this.resource, 'in', {
           child: variable('variantGroup'),
@@ -184,7 +187,10 @@ export class ProgressReportMediaRepository extends DtoRepository<
         }),
       )
       .return<{ dto: Omit<DbTypeOf<ReportMedia>, 'media' | 'file'> }>(
-        apoc.convert.toMap('node').as('dto'),
+        merge('node', {
+          report: 'report.id',
+          creator: 'creator { .id }',
+        }).as('dto'),
       );
     const results = await query.first();
     if (results) {
@@ -262,6 +268,11 @@ export class ProgressReportMediaRepository extends DtoRepository<
             relation('out', '', 'fileNode', ACTIVE),
             node('file', 'File'),
           ],
+          [
+            node('node'),
+            relation('out', '', 'creator', ACTIVE),
+            node('creator', 'User'),
+          ],
         ])
         .subQuery('file', (sub) =>
           sub
@@ -282,6 +293,7 @@ export class ProgressReportMediaRepository extends DtoRepository<
             variantGroup: 'variantGroup.id',
             file: 'file.id',
             media: 'media.id',
+            creator: 'creator { .id }',
             sensitivity: 'sensitivity',
             scope: 'scope',
           }).as('dto'),

src/components/prompts/dto/prompt-response.dto.ts

@@ -18,9 +18,8 @@ import {
   UnsecuredDto,
   Variant,
 } from '~/common';
-import { LinkToUnknown } from '~/core';
+import { LinkTo, LinkToUnknown } from '~/core';
 import { BaseNode } from '~/core/database/results';
-import { User } from '../../user';
 import { Prompt, SecuredPrompt } from './prompt.dto';
 
 @ObjectType()
@@ -46,7 +45,7 @@ export abstract class VariantResponse<Key extends string = string> {
   @Field()
   readonly response: SecuredRichTextNullable;
 
-  readonly creator: Secured<IdOf<User>>;
+  readonly creator: Secured<LinkTo<'User'>>;
 
   @Field(() => DateTime, { nullable: true })
   readonly modifiedAt?: DateTime;
@@ -65,7 +64,7 @@ export class PromptVariantResponse<
     responses: [VariantResponse],
   } satisfies ResourceRelationsShape;
 
-  readonly creator: Secured<IdOf<User>>;
+  readonly creator: Secured<LinkTo<'User'>>;
 
   readonly parent: BaseNode;
 

src/components/prompts/prompt-variant-response.repository.ts

@@ -101,6 +101,11 @@ export const PromptVariantResponseRepository = <
             relation('out', undefined, 'child'),
             node('node'),
           ])
+          .match([
+            node('parent'),
+            relation('out', undefined, 'creator'),
+            node('creator', 'User'),
+          ])
           .match([
             node('node'),
             relation('out', undefined, 'prompt'),
@@ -124,6 +129,7 @@ export const PromptVariantResponseRepository = <
           .return<{ dto: DbTypeOf<InstanceType<TResourceStatic>> }>(
             merge('node', {
               parent: 'parent',
+              creator: 'creator { .id }',
               prompt: 'prompt.value',
               responses: 'responses',
             }).as('dto'),
@@ -145,7 +151,6 @@ export const PromptVariantResponseRepository = <
         .apply(
           await createNode(resource, {
             baseNodeProps: {
-              creator: session.userId,
               createdAt,
               modifiedAt: createdAt,
             },
@@ -155,8 +160,13 @@ export const PromptVariantResponseRepository = <
           }),
         )
         .apply(
-          createRelationships(resource, 'in', {
-            child: ['BaseNode', input.resource],
+          createRelationships(resource, {
+            in: {
+              child: ['BaseNode', input.resource],
+            },
+            out: {
+              creator: ['User', session.userId],
+            },
           }),
         )
         .apply(this.hydrate(session))
@@ -176,7 +186,6 @@ export const PromptVariantResponseRepository = <
         baseNodeProps: {
           variant: input.variant,
           response: variable(responseVar.toString()),
-          creator: session.userId,
         },
       });
       await query
@@ -210,8 +219,13 @@ export const PromptVariantResponseRepository = <
                 .comment('create new response for variant')
                 .apply(newResponse)
                 .apply(
-                  createRelationships(resource, 'in', {
-                    child: variable('parent'),
+                  createRelationships(resource, {
+                    in: {
+                      child: variable('parent'),
+                    },
+                    out: {
+                      creator: ['User', session.userId],
+                    },
                   }),
                 )
                 .return('count(node) as updatedResponseCount'),

src/components/prompts/prompt-variant-response.resolver.ts

@@ -28,7 +28,7 @@ export class PromptVariantResponseResolver {
     @Parent() response: PromptVariantResponse,
     @Loader(UserLoader) users: LoaderOf<UserLoader>,
   ) {
-    return await mapSecuredValue(response.creator, users.load.bind(users));
+    return await mapSecuredValue(response.creator, ({ id }) => users.load(id));
   }
 }
 
@@ -39,6 +39,6 @@ export class VariantResponseResolver {
     @Parent() response: VariantResponse,
     @Loader(UserLoader) users: LoaderOf<UserLoader>,
   ) {
-    return await mapSecuredValue(response.creator, users.load.bind(users));
+    return await mapSecuredValue(response.creator, ({ id }) => users.load(id));
   }
 }