internal: add type to mutateData #27932
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tcharl
reviewed
Nov 19, 2024
| @@ -202,7 +202,7 @@ export default class AngularGenerator extends BaseApplicationGenerator { | |||
|
|
|||
| return returnValue; | |||
| }, | |||
| }); | |||
| } as any); | |||
There was a problem hiding this comment.
if it's legit, any other comment of this PR should be ignored
| @@ -152,7 +153,7 @@ export const loadDerivedAppConfig = ({ application }: { application: any }) => { | |||
|
|
|||
| projectDescription: ({ projectDescription, baseName }) => projectDescription ?? `Description for ${baseName}`, | |||
| endpointPrefix: ({ applicationType, lowercaseBaseName }) => (applicationType === 'microservice' ? `services/${lowercaseBaseName}` : ''), | |||
| }); | |||
| } as any); | |||
| @@ -285,7 +289,7 @@ export function derivedPrimaryKeyProperties(primaryKey) { | |||
| typeLong: primaryKey.type === LONG, | |||
| typeInteger: primaryKey.type === INTEGER, | |||
| typeNumeric: !primaryKey.composite && primaryKey.fields[0].fieldTypeNumeric, | |||
| }); | |||
| } as any); | |||
| microserviceName: ({ builtIn }) => (!builtIn && config.applicationType === MICROSERVICE ? config.baseName : undefined), | ||
| }); | ||
| if (entity.searchEngine === true && (!entity.microserviceName || entity.microserviceName === config.baseName)) { | ||
| } as any); |
| @@ -647,7 +652,7 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity: any) { | |||
| entity.eagerLoad || | |||
| // Fetch relationships if otherEntityField differs otherwise the id is enough | |||
| (ownerSide && otherEntity.primaryKey.name !== otherEntityField)), | |||
| }); | |||
| } as any); | |||
| } | ||
|
|
||
| mutateData(relationship, { | ||
| __override__: false, | ||
| columnDataType: data => data.otherEntity.columnType, | ||
| columnRequired: data => data.nullable === false || data.relationshipRequired, | ||
| liquibaseGenerateFakeData: data => data.columnRequired && data.persistableRelationship && !data.collection, | ||
| }); | ||
| } as any); |
| @@ -161,7 +159,7 @@ export const loadDerivedServerConfig = ({ application }: { application: any }) = | |||
| authenticationUsesCsrf: ({ authenticationType }) => [OAUTH2, SESSION].includes(authenticationType), | |||
| imperativeOrReactive: ({ reactive }) => (reactive ? 'reactive' : 'imperative'), | |||
| generateSpringAuditor: ctx => ctx.databaseTypeSql || ctx.databaseTypeMongodb || ctx.databaseTypeNeo4j || ctx.databaseTypeCouchbase, | |||
| }); | |||
| } as any); | |||
| @@ -33,7 +34,7 @@ const { MapperTypes } = entityOptions; | |||
| const { MAPSTRUCT } = MapperTypes; | |||
| const { INTEGER, LONG, UUID } = CommonDBTypes; | |||
|
|
|||
| export default function prepareField(entityWithConfig, field, generator) { | |||
| export default function prepareField(entityWithConfig, field: Field & any, generator) { | |||
There was a problem hiding this comment.
Introduce ServerField type?
| @@ -52,7 +53,7 @@ export default function prepareField(entityWithConfig, field, generator) { | |||
| fieldJavadoc: formatDocAsJavaDoc(field.documentation, 4), | |||
| fieldApiDescription: formatDocAsApiDescription(field.documentation), | |||
| propertyApiDescription: ({ fieldApiDescription }) => fieldApiDescription, | |||
| }); | |||
| } as any); | |||
| import { mutateData } from '../../../lib/utils/object.js'; | ||
| import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js'; | ||
|
|
||
| export function prepareRelationship({ relationship }: { relationship: any; entity: any }) { | ||
| export function prepareRelationship({ relationship }: { relationship: Relationship; entity: any }) { |
DanielFran
approved these changes
Nov 19, 2024
|
@Tcharl sorry, did not see your reviews before I committed |
|
@Tcharl |
|
@DanielFran @mshima No problem! I even think I've made the review post merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please make sure the below checklist is followed for Pull Requests.
When you are still working on the PR, consider converting it to Draft (below reviewers) and adding
skip-cilabel, you can still see CI build result at your branch.