feat: composite id backend support #19849

yelhouti · 2022-09-27T02:05:23Z

Please make sure the below checklist is followed for Pull Requests.

All continuous integration tests are green
Tests are added where necessary
The JDL part is updated if necessary
jhipster-online is updated if necessary
Documentation is added/updated where necessary
Coding Rules & Commit Guidelines as per our CONTRIBUTING.md document are followed

When you are still working on the PR, consider converting it to Draft (below reviewers) and adding skip-ci label, you can still see CI build result at your branch.

yelhouti · 2022-10-05T12:23:07Z

fixes #17919

...gelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs

generators/entity-client/files-angular.cjs

generators/entity-server/templates/partials/save_template.ejs

generators/entity-server/templates/partials/update_template.ejs

generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs

generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs

generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs

yelhouti · 2023-07-06T22:31:58Z

@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

yelhouti · 2023-07-07T17:44:11Z

@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 · 2023-07-08T00:42:09Z

@mshima @DanielFran finally tests are passing here and in my compositeKey projects. Could anyone please merge this

mshima

Entity suffix is not correct.
I need to do a deeper review.

yelhouti · 2023-07-08T04:00:41Z

@mshima sure, if you can point me to what to fix, I will gladly do

mshima · 2023-07-08T20:43:29Z

At least it looks wrong at generated sample.

yelhouti · 2023-07-08T21:43:58Z

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 · 2023-07-10T01:12:07Z

Guess, I need to rebase again ...

mshima

We should avoid complicating templates.

This is a partial review, would be much better if split into multiple PRs.

mshima · 2023-07-10T01:22:23Z

generators/base-application/support/prepare-entity.mts

- },
- get nameDotted() {
+function preparePrimaryKeyFields(field) {
+ Object.defineProperty(field, 'fieldNameDotted', {


A more meaningful name

Suggested change

Object.defineProperty(field, 'fieldNameDotted', {

Object.defineProperty(field, 'tsFieldPath', {

mshima · 2023-07-10T01:25:12Z

generators/base-application/support/prepare-entity.mts

+ enumerable: true,
+ configurable: true,
+ });
+ Object.defineProperty(field, 'fieldNameDottedAsserted', {


A more meaningful name

Suggested change

Object.defineProperty(field, 'fieldNameDottedAsserted', {

Object.defineProperty(field, 'tsFieldPathRequired', {

mshima · 2023-07-10T01:26:57Z

generators/server/files.mjs

@@ -477,6 +477,12 @@ export const baseServerFiles = {
 'config/WebConfigurer.java',
 ],
 },
+ {
+ condition: generator => !generator.reactive,


Only write if any composite key is found

mshima · 2023-07-10T01:33:16Z

generators/server/templates/entity/partials/it_patch_update.partial.java.ejs

@@ -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 => { _%>


for of is much easier to understand instead of forEach specially for ejs

mshima · 2023-07-10T01:36:58Z

generators/server/templates/entity/partials/it_patch_update.partial.java.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())<% }%>


replaceAll in templates is really confusing.
We should simplify.
I will do a deeper look later.

mshima · 2023-07-10T14:19:26Z

generators/server/templates/entity/src/main/java/package/service/dto/_DtoClass_.java.ejs

@@ -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]) : [] _%>


Using a set to deduplicate here is confusing.

mshima · 2023-07-10T14:19:47Z

...server/templates/entity/src/main/java/package/service/impl/_EntityClass_ServiceImpl.java.ejs

@@ -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%>;


Suggested change

import <%=packageName%>.domain.<%=primaryKey.type%>;

import <%= entityAbsolutePackage %>.domain.<%= primaryKey.type %>;

mshima · 2023-07-10T14:21:43Z

...rs/server/templates/entity/src/main/java/package/service/mapper/_EntityClass_Mapper.java.ejs

+ <%# 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 %>")


primaryKey.name?

mshima · 2023-07-10T14:23:24Z

...rators/server/templates/entity/src/main/java/package/web/rest/_EntityClass_Resource.java.ejs

@@ -24,6 +24,11 @@ _%>
 <%_ if (!dtoMapstruct || serviceNo) { _%>
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ } _%>
+<%_ if (primaryKey.fields.length > 1) { _%>
+import <%=packageName%>.domain.<%=primaryKey.type%>;


Replace every packageName with entityAbsolutePackage and add spaces to template tag

mshima · 2023-07-10T14:28:40Z

generators/server/templates/entity/src/test/java/package/service/dto/_DtoClass_Test.java.ejs

 <%_ if (primaryKey && primaryKey.hasUUID) { _%>
 import java.util.UUID;
 <%_ } _%>
+<%_
+const initDTO = (dtoEntity, entityNbr) => {


We should definitely not add a template function inside templates.

github-actions bot added theme: java theme: jhipster-internals labels Sep 27, 2022

yelhouti force-pushed the composite-key branch 2 times, most recently from b119e86 to 51e38a6 Compare September 27, 2022 02:35

yelhouti force-pushed the composite-key branch from 51e38a6 to 8a0c5b3 Compare October 4, 2022 17:36

github-actions bot added theme: angular theme: dependencies Pull requests that update a dependency file theme: front labels Oct 4, 2022

This was referenced Oct 5, 2022

Update to Angular/PrimeNG 12/13/14 tailosoft/jhipster-primeng-blueprint#48

Closed

Doesn't support jhipster 7.1.0 to 7.7.0 tailosoft/jhipster-primeng-blueprint#37

Closed

naris mentioned this pull request Oct 6, 2022

ERROR! Directory import is not supported resolving ES modules imported tailosoft/jhipster-primeng-blueprint#58

Closed

yelhouti force-pushed the composite-key branch 2 times, most recently from 4948702 to ffda950 Compare October 10, 2022 21:19