Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix field creation #7547

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Fix field creation #7547

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64f6b95
Call validateMetadata on built fieldMetadata for create and update
ijreilly Oct 10, 2024
f559859
Only consider check when isNullable is false
ijreilly Oct 10, 2024
a3bdbee
Rename validateFieldMetadata
ijreilly Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 29 additions & 33 deletions packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
);
}

this.validateFieldMetadataInput<CreateFieldInput>(
fieldMetadataInput.type,
fieldMetadataInput,
objectMetadata,
);

console.time('createOne save');
const createdFieldMetadata = await fieldMetadataRepository.save({
const fieldMetadataForCreate = {
id: v4(),
createdAt: new Date(),
updatedAt: new Date(),
Expand All @@ -187,7 +180,18 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
: undefined,
isActive: true,
isCustom: true,
});
};

this.validateFieldMetadata<CreateFieldInput>(
fieldMetadataForCreate.type,
fieldMetadataForCreate,
objectMetadata,
);

console.time('createOne save');
const createdFieldMetadata = await fieldMetadataRepository.save(
fieldMetadataForCreate,
);

console.timeEnd('createOne save');

Expand Down Expand Up @@ -394,12 +398,6 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
}
}

this.validateFieldMetadataInput<UpdateFieldInput>(
existingFieldMetadata.type,
fieldMetadataInput,
objectMetadata,
);

const updatableFieldInput =
existingFieldMetadata.isCustom === false
? this.buildUpdatableStandardFieldInput(
Expand All @@ -408,21 +406,21 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
)
: fieldMetadataInput;

// We're running field update under a transaction, so we can rollback if migration fails
await fieldMetadataRepository.update(id, {
const fieldMetadataForUpdate = {
...updatableFieldInput,
defaultValue:
// Todo: we handle default value for all field types.
![
FieldMetadataType.SELECT,
FieldMetadataType.MULTI_SELECT,
FieldMetadataType.BOOLEAN,
].includes(existingFieldMetadata.type)
? existingFieldMetadata.defaultValue
: updatableFieldInput.defaultValue !== null
? updatableFieldInput.defaultValue
: null,
});
defaultValue: isDefined(updatableFieldInput.defaultValue)
? updatableFieldInput.defaultValue
: existingFieldMetadata.defaultValue,
};

this.validateFieldMetadata<UpdateFieldInput>(
existingFieldMetadata.type,
fieldMetadataForUpdate,
objectMetadata,
);

// We're running field update under a transaction, so we can rollback if migration fails
await fieldMetadataRepository.update(id, fieldMetadataForUpdate);

const updatedFieldMetadata = await fieldMetadataRepository.findOne({
where: { id },
Expand Down Expand Up @@ -710,9 +708,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
}
}

private validateFieldMetadataInput<
T extends UpdateFieldInput | CreateFieldInput,
>(
private validateFieldMetadata<T extends UpdateFieldInput | CreateFieldInput>(
fieldMetadataType: FieldMetadataType,
fieldMetadataInput: T,
objectMetadata: ObjectMetadataEntity,
Expand Down Expand Up @@ -746,7 +742,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
}
}

if (!fieldMetadataInput.isNullable) {
if (fieldMetadataInput.isNullable === false) {
if (!isDefined(fieldMetadataInput.defaultValue)) {
throw new FieldMetadataException(
'Default value is required for non nullable fields',
Expand Down
Loading