feat: composite id backend support #19849
Closed
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
yelhouti
force-pushed
the
composite-key
branch
2 times, most recently
from
b119e86 to
51e38a6
Compare
yelhouti
force-pushed
the
composite-key
branch
from
51e38a6 to
8a0c5b3
Compare
github-actions
bot
added
theme: angular
theme: dependencies
This was referenced Oct 5, 2022
|
fixes #17919 |
yelhouti
force-pushed
the
composite-key
branch
2 times, most recently
from
4948702 to
ffda950
Compare
Tcharl
reviewed
Oct 11, 2022
...gelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
Tcharl
reviewed
Oct 11, 2022
Tcharl
reviewed
Oct 11, 2022
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/partials/update_template.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/partials/update_template.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
Tcharl
reviewed
Oct 11, 2022
generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs
Outdated
Show resolved
Hide resolved
|
@DanielFran I fixed the conflicts (if you could please have a look) I still have some small tests to fix ... I m willing to put more time if you are willing to merge |
|
@mshima thanks a lot man for the work you did on vscode to generate integration tests locally. It was always a PITA to know which test should be run how. Now it all works great and I can fix tests 10 times faster. Maybe this should be documented for others in CONTRIBUTING.md . |
yelhouti
force-pushed
the
composite-key
branch
5 times, most recently
from
75a17c2 to
1cec7fc
Compare
|
@mshima @DanielFran finally tests are passing here and in my compositeKey projects. Could anyone please merge this |
mshima
requested changes
Jul 8, 2023
|
@mshima sure, if you can point me to what to fix, I will gladly do |
|
At least it looks wrong at generated sample. |
When using MapsId, the id of the parent and the child are the same. Put I can change this, if you want, hopefully it won't break the composite with multi level... I must admit I don't remember why i changed it @mshima anything else you have issues with ? |
yelhouti
force-pushed
the
composite-key
branch
5 times, most recently
from
2ed5eaf to
ec79794
Compare
|
Guess, I need to rebase again ... |
mshima
requested changes
Jul 10, 2023
| }, | ||
| get nameDotted() { | ||
| function preparePrimaryKeyFields(field) { | ||
| Object.defineProperty(field, 'fieldNameDotted', { |
There was a problem hiding this comment.
A more meaningful name
Suggested change
| Object.defineProperty(field, 'fieldNameDotted', { | |
| Object.defineProperty(field, 'tsFieldPath', { |
| enumerable: true, | ||
| configurable: true, | ||
| }); | ||
| Object.defineProperty(field, 'fieldNameDottedAsserted', { |
There was a problem hiding this comment.
A more meaningful name
Suggested change
| Object.defineProperty(field, 'fieldNameDottedAsserted', { | |
| Object.defineProperty(field, 'tsFieldPathRequired', { |
| @@ -477,6 +477,12 @@ export const baseServerFiles = { | |||
| 'config/WebConfigurer.java', | |||
| ], | |||
| }, | |||
| { | |||
| condition: generator => !generator.reactive, | |||
There was a problem hiding this comment.
Only write if any composite key is found
| @@ -21,6 +21,12 @@ int databaseSizeBeforeUpdate = <%= entityInstance %>Repository.findAll()<%= call | |||
| // Update the <%= entityInstance %> using partial update | |||
| <%= persistClass %> partialUpdated<%= persistClass %> = new <%= persistClass %>(); | |||
| partialUpdated<%= persistClass %>.set<%= primaryKey.nameCapitalized %>(<%= persistInstance %>.get<%= primaryKey.nameCapitalized %>()); | |||
| <%_ primaryKey.composite && fields.filter(f => f.id).forEach(f => { _%> | |||
There was a problem hiding this comment.
for of is much easier to understand instead of forEach specially for ejs
| @@ -47,7 +53,7 @@ webTestClient | |||
| .expectStatus() | |||
| .isOk(); | |||
| <%_ } else { _%> | |||
| rest<%= entityClass %>MockMvc.perform(patch(ENTITY_API_URL_ID, partialUpdated<%= persistClass %>.get<%= primaryKey.nameCapitalized %>())<% if (authenticationUsesCsrf) { %>.with(csrf())<% }%> | |||
| rest<%= entityClass %>MockMvc.perform(patch(ENTITY_API_URL_ID, <%- persistInstanceUrlId.replaceAll(persistInstance, 'partialUpdated' + persistClass) %>)<% if (authenticationUsesCsrf) { %>.with(csrf())<% }%> | |||
There was a problem hiding this comment.
replaceAll in templates is really confusing.
We should simplify.
I will do a deeper look later.
| @@ -141,7 +141,7 @@ _%> | |||
| <%_ } _%> | |||
| <%_ } _%> | |||
|
|
|||
| <%_ const idNames = primaryKey ? [...primaryKey.fields.map(f => f.fieldName)] : [] _%> | |||
| <%_ const idNames = primaryKey ? (primaryKey.composite ? Array.from(new Set(primaryKey.fields.map(f => f.path[0]))) : [primaryKey.name]) : [] _%> | |||
There was a problem hiding this comment.
Using a set to deduplicate here is confusing.
| @@ -47,6 +47,9 @@ import <%= entityAbsolutePackage %>.repository.<%= mapsIdAssoc.otherEntityNameCa | |||
| <%_ if (searchEngineElasticsearch) { _%> | |||
| import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository; | |||
| <%_ } _%> | |||
| <%_ if (primaryKey.composite) { _%> | |||
| import <%=packageName%>.domain.<%=primaryKey.type%>; | |||
There was a problem hiding this comment.
Suggested change
| import <%=packageName%>.domain.<%=primaryKey.type%>; | |
| import <%= entityAbsolutePackage %>.domain.<%= primaryKey.type %>; |
| <%# I wouldn't expect to be needed the way @EmbeddedId works with "insertable = false, updatable = false" but it seems like it is so putting it here, this might not work for bigger depth, but for now I think its enough %> | ||
| <%_ for (const relationship of relationships.filter(r => r.id && !primaryKey.derived && r.otherEntity.primaryKey.fields.length > 1)) { _%> | ||
| <%_ for (const field of relationship.otherEntity.primaryKey.fields) { _%> | ||
| @Mapping(target = "<%= relationship.relationshipName %>.id.<%= field.fieldName %>", source = "<%= relationship.relationshipName %>.<%= field.fieldNameDotted %>") |
| @@ -24,6 +24,11 @@ _%> | |||
| <%_ if (!dtoMapstruct || serviceNo) { _%> | |||
| import <%= entityAbsolutePackage %>.domain.<%= persistClass %>; | |||
| <%_ } _%> | |||
| <%_ if (primaryKey.fields.length > 1) { _%> | |||
| import <%=packageName%>.domain.<%=primaryKey.type%>; | |||
There was a problem hiding this comment.
Replace every packageName with entityAbsolutePackage and add spaces to template tag
| <%_ if (primaryKey && primaryKey.hasUUID) { _%> | ||
| import java.util.UUID; | ||
| <%_ } _%> | ||
| <%_ | ||
| const initDTO = (dtoEntity, entityNbr) => { |
There was a problem hiding this comment.
We should definitely not add a template function inside templates.
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.