Add createdBy field on custom object creation (#6529)

In this PR, I'm:
- adding createdBy field (type ACTOR) on custom objects when created
- moving `name` and `position` default column to the set of columns
automatically creation on object creation
- fixing a bug on mutations (update / create), if the targetted object
has a 'data' custom field, it was conflicting with the payload ==> I
feel we need to refactor this part of the code but we can keep this for
a bit later as we plan to move out of pg_graphql

<img width="1198" alt="image"
src="https://github.com/user-attachments/assets/891c4a97-bab1-415c-8551-dabd5996a794">
This commit is contained in:
Charles Bochet
2024-08-04 13:12:24 +02:00
committed by GitHub
parent e2b42ee6c9
commit e787215e15
9 changed files with 66 additions and 46 deletions

View File

@ -2,15 +2,15 @@ import { Injectable, Logger } from '@nestjs/common';
import { v4 as uuidv4 } from 'uuid';
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import { CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { FieldsStringFactory } from './fields-string.factory';
import { ArgsAliasFactory } from './args-alias.factory';
import { FieldsStringFactory } from './fields-string.factory';
@Injectable()
export class CreateManyQueryFactory {
@ -30,8 +30,9 @@ export class CreateManyQueryFactory {
options.fieldMetadataCollection,
options.objectMetadataCollection,
);
const computedArgs = this.argsAliasFactory.create(
args,
const computedArgsData = this.argsAliasFactory.create(
args.data,
options.fieldMetadataCollection,
);
@ -40,7 +41,7 @@ export class CreateManyQueryFactory {
insertInto${computeObjectTargetTable(
options.objectMetadataItem,
)}Collection(objects: ${stringifyWithoutKeyQuote(
computedArgs.data.map((datum) => ({
computedArgsData.map((datum) => ({
id: uuidv4(),
...datum,
})),

View File

@ -1,10 +1,10 @@
import { Injectable, Logger } from '@nestjs/common';
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import {
RecordFilter,
RecordOrderBy,
} from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import { FindManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';

View File

@ -7,9 +7,9 @@ import {
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import { UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
import { FieldsStringFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory';
import { ArgsAliasFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/args-alias.factory';
import { FieldsStringFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/fields-string.factory';
import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
export interface UpdateManyQueryFactoryOptions
@ -37,13 +37,13 @@ export class UpdateManyQueryFactory {
options.objectMetadataCollection,
);
const computedArgs = this.argsAliasFactory.create(
args,
const computedArgsData = this.argsAliasFactory.create(
args.data,
options.fieldMetadataCollection,
);
const argsData = {
...computedArgs.data,
...computedArgsData,
updatedAt: new Date().toISOString(),
};

View File

@ -1,14 +1,14 @@
import { Injectable, Logger } from '@nestjs/common';
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
import { WorkspaceQueryBuilderOptions } from 'src/engine/api/graphql/workspace-query-builder/interfaces/workspace-query-builder-options.interface';
import { UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
import { stringifyWithoutKeyQuote } from 'src/engine/api/graphql/workspace-query-builder/utils/stringify-without-key-quote.util';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
import { FieldsStringFactory } from './fields-string.factory';
import { ArgsAliasFactory } from './args-alias.factory';
import { FieldsStringFactory } from './fields-string.factory';
@Injectable()
export class UpdateOneQueryFactory {
@ -28,13 +28,14 @@ export class UpdateOneQueryFactory {
options.fieldMetadataCollection,
options.objectMetadataCollection,
);
const computedArgs = this.argsAliasFactory.create(
args,
const computedArgsData = this.argsAliasFactory.create(
args.data,
options.fieldMetadataCollection,
);
const argsData = {
...computedArgs.data,
...computedArgsData,
id: undefined, // do not allow updating an existing object's id
updatedAt: new Date().toISOString(),
};
@ -45,7 +46,7 @@ export class UpdateOneQueryFactory {
options.objectMetadataItem,
)}Collection(set: ${stringifyWithoutKeyQuote(
argsData,
)}, filter: { id: { eq: "${computedArgs.id}" } }) {
)}, filter: { id: { eq: "${args.id}" } }) {
affectedCount
records {
${fieldsString}