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

Entity fields default values #25633

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Entity fields default values #25633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions generators/angular/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,42 @@ export default class AngularGenerator extends BaseApplicationGenerator {
return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
}

get preparingEachEntityField() {
return this.asPreparingEachEntityFieldTaskGroup({
prepareField({ field }) {
mutateData(field, {
fieldTsDefaultValue: ({ fieldTsDefaultValue, defaultValue, fieldTypeCharSequence, fieldTypeTimed }) => {
let returnValue: string | undefined;
if (fieldTsDefaultValue !== undefined || defaultValue !== undefined) {
let fieldDefaultValue;
if (fieldTsDefaultValue !== undefined) {
fieldDefaultValue = fieldTsDefaultValue;
} else {
fieldDefaultValue = defaultValue;
}

fieldDefaultValue = String(fieldDefaultValue).replace(/'/g, "\\'");

if (fieldTypeCharSequence) {
returnValue = `'${fieldDefaultValue}'`;
} else if (fieldTypeTimed) {
returnValue = `dayjs('${fieldDefaultValue}')`;
} else {
returnValue = fieldDefaultValue;
}
}

return returnValue;
},
});
},
});
}

get [BaseApplicationGenerator.PREPARING_EACH_ENTITY_FIELD]() {
return this.delegateTasksToBlueprint(() => this.preparingEachEntityField);
}

get default() {
return this.asDefaultTaskGroup({
loadEntities() {
Expand Down
16 changes: 10 additions & 6 deletions ...lates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,16 @@ _%>
<%_ for (field of fields) {
const { fieldName, fieldTypeBoolean, fieldTypeTimed, fieldTypeLocalDate } = field;
_%>
<%_ if (field.id) { _%>
<%= fieldName %>: null,
<%_ } else if (fieldTypeBoolean) { _%>
<%= fieldName %>: false,
<%_ } else if (fieldTypeTimed) { _%>
<%= fieldName %>: currentTime,
<%_ if (field.fieldTsDefaultValue) { _%>
<%= fieldName %>: <%- field.fieldTsDefaultValue %>,
<%_ } else { _%>
<%_ if (field.id) { _%>
<%= fieldName %>: null,
<%_ } else if (fieldTypeBoolean) { _%>
<%= fieldName %>: false,
<%_ } else if (fieldTypeTimed) { _%>
<%= fieldName %>: currentTime,
<%_ } _%>
<%_ } _%>
<%_ } _%>
<%_ for (const relationship of relationships.filter(({ persistableRelationship }) => persistableRelationship)) {
Expand Down
2 changes: 1 addition & 1 deletion generators/base-application/support/prepare-field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ function _derivedProperties(field) {
fieldType === INTEGER || fieldType === LONG || fieldType === FLOAT || fieldType === DOUBLE || fieldType === BIG_DECIMAL,
fieldTypeBinary: fieldType === BYTES || fieldType === BYTE_BUFFER,
fieldTypeTimed: fieldType === ZONED_DATE_TIME || fieldType === INSTANT,
fieldTypeCharSequence: fieldType === STRING || fieldType === UUID,
fieldTypeCharSequence: fieldType === STRING || fieldType === UUID || fieldType === TEXT_BLOB,
fieldTypeTemporal: fieldType === ZONED_DATE_TIME || fieldType === INSTANT || fieldType === LOCAL_DATE,
fieldValidationRequired: validationRules.includes(REQUIRED),
fieldValidationMin: validationRules.includes(MIN),
Expand Down
39 changes: 39 additions & 0 deletions generators/base-entity-changes/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const baseChangelog: () => Omit<BaseChangelog, 'changelogDate' | 'entityName' |
addedRelationships: [],
removedRelationships: [],
relationshipsToRecreateForeignKeysOnly: [],
removedDefaultValueFields: [],
addedDefaultValueFields: [],
changelogData: {},
});

Expand Down Expand Up @@ -164,6 +166,33 @@ export default abstract class GeneratorBaseEntityChanges extends GeneratorBaseAp
),
);

const oldFieldsWithDefaultValues = oldFields.filter(field => this.hasAnyDefaultValue(field));
const newFieldsWithDefaultValues = newFields.filter(field => this.hasAnyDefaultValue(field));

// find the old fields that have not been deleted anyway or otherwise where the default value is different on the same new field
const removedDefaultValueFields = oldFieldsWithDefaultValues
.filter(oldField => !removedFieldNames.includes(oldField.fieldName))
.filter(
// field was not removed, so check its default value
oldField =>
this.doDefaultValuesDiffer(
oldField,
newFields.find(newField => newField.fieldName === oldField.fieldName),
),
);

// find the new fields that have not been added newly anyway or otherwise where the old field had a different default value
const addedDefaultValueFields = newFieldsWithDefaultValues
.filter(newField => !addedFieldNames.includes(newField.fieldName))
.filter(
// field was not added newly, so check its default value
newField =>
this.doDefaultValuesDiffer(
oldFields.find(oldField => oldField.fieldName === newField.fieldName),
newField,
),
);

return {
...baseChangelog(),
previousEntity: oldConfig,
Expand All @@ -176,7 +205,17 @@ export default abstract class GeneratorBaseEntityChanges extends GeneratorBaseAp
addedRelationships,
removedRelationships,
relationshipsToRecreateForeignKeysOnly,
removedDefaultValueFields,
addedDefaultValueFields,
};
});
}

private hasAnyDefaultValue(field) {
return field.defaultValue !== undefined || field.defaultValueComputed;
}

private doDefaultValuesDiffer(field1, field2) {
return field1.defaultValue !== field2.defaultValue || field1.defaultValueComputed !== field2.defaultValueComputed;
}
}
2 changes: 2 additions & 0 deletions generators/base-entity-changes/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ export type BaseChangelog = {
addedRelationships: any[];
removedRelationships: any[];
relationshipsToRecreateForeignKeysOnly: any[];
removedDefaultValueFields: any[];
addedDefaultValueFields: any[];
changelogData: any;
};
20 changes: 20 additions & 0 deletions generators/bootstrap-application/generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ describe(`generator - ${generator}`, () => {
"jpaGeneratedValue": true,
"jpaGeneratedValueIdentity": false,
"jpaGeneratedValueSequence": false,
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "\${uuidType}",
"nullable": true,
"path": [
Expand Down Expand Up @@ -418,6 +420,8 @@ describe(`generator - ${generator}`, () => {
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""login1"",
"javaValueSample2": ""login2"",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "string",
"maxlength": 50,
"nullable": false,
Expand Down Expand Up @@ -501,6 +505,8 @@ describe(`generator - ${generator}`, () => {
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""firstName1"",
"javaValueSample2": ""firstName2"",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "string",
"maxlength": 50,
"nullable": true,
Expand Down Expand Up @@ -583,6 +589,8 @@ describe(`generator - ${generator}`, () => {
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""lastName1"",
"javaValueSample2": ""lastName2"",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "string",
"maxlength": 50,
"nullable": true,
Expand Down Expand Up @@ -669,6 +677,8 @@ describe(`generator - ${generator}`, () => {
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""email1"",
"javaValueSample2": ""email2"",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "string",
"maxlength": 191,
"nullable": false,
Expand Down Expand Up @@ -752,6 +762,8 @@ describe(`generator - ${generator}`, () => {
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""imageUrl1"",
"javaValueSample2": ""imageUrl2"",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "string",
"maxlength": 256,
"nullable": true,
Expand Down Expand Up @@ -828,6 +840,8 @@ describe(`generator - ${generator}`, () => {
"fieldWithContentType": false,
"generateFakeData": Any<Function>,
"javaFieldType": "Boolean",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "boolean",
"nullable": true,
"path": [
Expand Down Expand Up @@ -909,6 +923,8 @@ describe(`generator - ${generator}`, () => {
"javaValueGenerator": "UUID.randomUUID().toString()",
"javaValueSample1": ""langKey1"",
"javaValueSample2": ""langKey2"",
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "string",
"maxlength": 10,
"nullable": true,
Expand Down Expand Up @@ -1195,6 +1211,8 @@ describe(`generator - ${generator}`, () => {
"jpaGeneratedValue": true,
"jpaGeneratedValueIdentity": false,
"jpaGeneratedValueSequence": false,
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "\${uuidType}",
"nullable": true,
"path": [
Expand Down Expand Up @@ -1534,6 +1552,8 @@ describe(`generator - ${generator}`, () => {
"jpaGeneratedValue": true,
"jpaGeneratedValueIdentity": false,
"jpaGeneratedValueSequence": false,
"liquibaseDefaultValueAttributeName": undefined,
"liquibaseDefaultValueAttributeValue": undefined,
"loadColumnType": "\${uuidType}",
"nullable": true,
"path": [
Expand Down
Loading
Loading