Fix #691 - Add Mongock support #1424

beatfreaker · 2022-04-21T13:00:32Z

Fix #691 - Add Mongock support

codecov · 2022-04-21T14:37:18Z

Codecov Report

Merging #1424 (ee924e0) into main (3c7da02) will not change coverage.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                main     #1424    +/-   ##
============================================
  Coverage     100.00%   100.00%            
- Complexity      1597      1612    +15     
============================================
  Files            305       317    +12     
  Lines           5227      5340   +113     
  Branches         106       106            
============================================
+ Hits            5227      5340   +113

Impacted Files	Coverage Δ
...mongock/application/MongockApplicationService.java	`100.00% <100.00%> (ø)`
...migration/mongock/domain/MongockDomainService.java	`100.00% <100.00%> (ø)`
...nfrastructure/config/MongockBeanConfiguration.java	`100.00% <100.00%> (ø)`
...k/infrastructure/primary/rest/MongockResource.java	`100.00% <100.00%> (ø)`
...bapp/app/springboot/primary/Generator.component.ts	`100.00% <100.00%> (ø)`
...rimary/react-generator/ReactGenerator.component.ts	`100.00% <100.00%> (ø)`
...pp/app/springboot/primary/react-generator/index.ts	`100.00% <100.00%> (ø)`
...ng-boot-generator/SpringBootGenerator.component.ts	`100.00% <100.00%> (ø)`
.../springboot/primary/spring-boot-generator/index.ts	`100.00% <100.00%> (ø)`
...mary/svelte-generator/SvelteGenerator.component.ts	`100.00% <100.00%> (ø)`
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3af60a5...ee924e0. Read the comment docs.

beatfreaker · 2022-04-22T06:03:26Z

@pascalgrimaud can you please review this PR

pascalgrimaud · 2022-04-22T07:02:54Z

@beatfreaker : yes, will do it when possible. I'm a little bit late, as I have several PRs to review before this one. Just be patient :)

pascalgrimaud · 2022-04-22T16:48:12Z

@beatfreaker : can you resolve the conflict plz?

# Conflicts: # src/main/resources/generator/dependencies/pom.xml

pascalgrimaud · 2022-04-22T16:59:03Z

...ipster/lite/generator/server/springboot/dbmigration/mongock/domain/MongockDomainService.java

+
+  @Override
+  public void addConfigurationJava(Project project) {
+    String packageNamePath = project.getPackageNamePath().orElse(getPath("com/mycompany/myapp"));


use constant DefaultConfig for com/mycompany/myapp

pascalgrimaud · 2022-04-22T16:59:55Z

...ipster/lite/generator/server/springboot/dbmigration/mongock/domain/MongockDomainService.java

+  @Override
+  public void addConfigurationJava(Project project) {
+    String packageNamePath = project.getPackageNamePath().orElse(getPath("com/mycompany/myapp"));
+    String mongockConfigPath = "technical/infrastructure/secondary/mongock";


you can use TECHNICAL_INFRASTRUCTURE_SECONDARY + mongock

pascalgrimaud · 2022-04-22T17:00:10Z

...ipster/lite/generator/server/springboot/dbmigration/mongock/domain/MongockDomainService.java

+  @Override
+  public void addChangelogJava(Project project) {
+    project.addDefaultConfig(PACKAGE_NAME);
+    String packageNamePath = project.getPackageNamePath().orElse(getPath("com/mycompany/myapp"));


use constants in DefaultConfig

pascalgrimaud · 2022-04-22T17:00:24Z

...ipster/lite/generator/server/springboot/dbmigration/mongock/domain/MongockDomainService.java

+  public void addChangelogJava(Project project) {
+    project.addDefaultConfig(PACKAGE_NAME);
+    String packageNamePath = project.getPackageNamePath().orElse(getPath("com/mycompany/myapp"));
+    String mongockDBMigrationPath = "technical/infrastructure/secondary/mongock/dbmigration";


use TECHNICAL_INFRASTRUCTURE_SECONDARY

pascalgrimaud · 2022-04-22T17:03:18Z

...n/resources/generator/server/springboot/database/mongock/InitialMigrationSetup.java.mustache

+  public void rollback() {}
+
+}


Suggested change

public void rollback() {}

}

public void rollback() {}

}

pascalgrimaud · 2022-04-22T17:03:31Z

...n/resources/generator/server/springboot/database/mongock/InitialMigrationSetup.java.mustache

+  public InitialMigrationSetup(MongoTemplate template) {
+      this.template = template;
+  }


Suggested change

public InitialMigrationSetup(MongoTemplate template) {

this.template = template;

}

public InitialMigrationSetup(MongoTemplate template) {

this.template = template;

}

pascalgrimaud · 2022-04-22T17:04:40Z

...generator/server/springboot/dbmigration/mongock/application/MongockApplicationServiceIT.java

+    ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);
+    if (projectDTO == null) {
+      throw new GeneratorException("Error when reading file");
+    }
+    projectDTO.folder(FileUtils.tmpDirForTest());
+    Project project = ProjectDTO.toProject(projectDTO);


Suggested change

ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class);

if (projectDTO == null) {

throw new GeneratorException("Error when reading file");

}

projectDTO.folder(FileUtils.tmpDirForTest());

Project project = ProjectDTO.toProject(projectDTO);

ProjectDTO projectDTO = TestUtils.readFileToObject("json/chips.json", ProjectDTO.class).folder(tmpDirForTest());

Project project = ProjectDTO.toProject(projectDTO);

pascalgrimaud · 2022-04-22T17:07:58Z

Very good job here, @beatfreaker
I still have 3 other comments:

plz add a package-info.java, defined as a BusinessContext
plz add a new README.md (similar to what is done in maven/README.md)
call the API in the generate.sh file, at the same level than mongodbapp

beatfreaker · 2022-04-26T05:41:18Z

Hello @pascalgrimaud

currently the build is failing for mongodbapp execution, and I suspect it is because of following warning

Warning:  Rule violated for class tech.jhipster.fullapp.technical.infrastructure.secondary.mongock.dbmigration.InitialMigrationSetup: lines covered ratio is 0.00, but expected minimum is 1.00
Warning:  Rule violated for class tech.jhipster.fullapp.technical.infrastructure.secondary.mongock.MongockDatabaseConfiguration: lines covered ratio is 0.00, but expected minimum is 1.00

As these generated files does not have any logic so I don't know what should we write in unit tests, could you please help me with it ?

pascalgrimaud · 2022-04-26T05:43:00Z

@beatfreaker : sure, what do you prefer? Suggestion in comment or commit directly to your branch ?

beatfreaker · 2022-04-26T05:50:45Z

@pascalgrimaud I am okay with both,

If you have limited time then just add it here, I can put it in code and test it.

pascalgrimaud · 2022-04-26T09:27:21Z

...n/resources/generator/server/springboot/database/mongock/InitialMigrationSetup.java.mustache

@@ -0,0 +1,21 @@
+package tech.jhipster.fullapp.technical.infrastructure.secondary.mongock.dbmigration;


bad package here, you should use packageName

pascalgrimaud · 2022-04-26T09:28:01Z

...rces/generator/server/springboot/database/mongock/MongockDatabaseConfiguration.java.mustache

@@ -0,0 +1,8 @@
+package tech.jhipster.fullapp.technical.infrastructure.secondary.mongock;


bad package here

pascalgrimaud · 2022-04-26T09:30:32Z

@beatfreaker : here the simple unit test you can use:

@UnitTest
@ExtendWith(MockitoExtension.class)
class InitialMigrationSetupTest {

  @InjectMocks
  InitialMigrationSetup initialMigrationSetup;

  @Test
  void shouldChangeSet() {
    assertThatCode(() -> initialMigrationSetup.changeSet()).doesNotThrowAnyException();
  }

  @Test
  void shouldRollback() {
    assertThatCode(() -> initialMigrationSetup.rollback()).doesNotThrowAnyException();
  }
}

beatfreaker · 2022-04-26T11:10:14Z

@beatfreaker : here the simple unit test you can use:

@UnitTest
@ExtendWith(MockitoExtension.class)
class InitialMigrationSetupTest {

  @InjectMocks
  InitialMigrationSetup initialMigrationSetup;

  @Test
  void shouldChangeSet() {
    assertThatCode(() -> initialMigrationSetup.changeSet()).doesNotThrowAnyException();
  }

  @Test
  void shouldRollback() {
    assertThatCode(() -> initialMigrationSetup.rollback()).doesNotThrowAnyException();
  }
}

This helps, thank you

beatfreaker · 2022-04-26T12:05:04Z

@pascalgrimaud
sonar is reporting below code smell, I added it so that it will be helpful for user to start using MongoTemplate
is it fine leave it as commented, or we should totally remove it ?

pascalgrimaud · 2022-04-26T12:35:35Z

Fine to remove it, in this initial migration file.
In the other migration files (for User for example), it will be there, so no worry about that

pascalgrimaud · 2022-04-27T05:42:03Z

src/main/java/tech/jhipster/lite/generator/server/springboot/dbmigration/mongock/README.md

+
+## Maintainers
+
+- [Pascal Grimaud](https://github.com/pascalgrimaud)


Don't you want to take the lead on this part @beatfreaker ? :-)

I can, updating it :)

Yes plz put your name :-)

pascalgrimaud · 2022-04-27T06:36:33Z

Thanks for your work here @beatfreaker ❤️

beatfreaker · 2022-04-30T19:11:25Z

@pascalgrimaud Bounty claimed at https://opencollective.com/generator-jhipster/expenses/74748

pascalgrimaud · 2022-04-30T19:16:38Z

@beatfreaker : approved. If possible, can you contribute to the front part too? Otherwise, the feature won't be available

beatfreaker · 2022-04-30T19:22:45Z

@pascalgrimaud yeah sure I can make respective changes on frontend too, will create new ticket to handle it.

beatfreaker added 3 commits April 21, 2022 17:58

Fix jhipster#691 - Add Mongock support

b4ef865

Fix jhipster#691 - Remove public from MongockResource to fix build

b4e4f1a

Fix jhipster#691 - Fix code smells

1ffd855

Fix jhipster#691 - Add tests to improve code coverage

306866c

pascalgrimaud added area: feature request 💡 server: spring boot theme: database migration labels Apr 22, 2022

Merge branch 'main' into mongock-support

a5bfd6a

# Conflicts: # src/main/resources/generator/dependencies/pom.xml

pascalgrimaud requested changes Apr 22, 2022

View reviewed changes

beatfreaker added 2 commits April 22, 2022 23:17

Fix jhipster#691 - Minor fixes and add missing required files

e5bfe66

Fix jhipster#691 - Minor fixes

c4a43d7

beatfreaker requested a review from pascalgrimaud April 22, 2022 18:37

beatfreaker added 2 commits April 25, 2022 01:26

Merge remote-tracking branch 'origin/main' into mongock-support

ad9dfe8

Fix jhipster#691 - Disable mongock in generated project junit

7501c25

pascalgrimaud requested changes Apr 26, 2022

View reviewed changes

Fix jhipster#691 - Generate mongock test files

2fe2729

Fix jhipster#691 - Fix code smells

77cebd0

beatfreaker requested a review from pascalgrimaud April 26, 2022 13:43

pascalgrimaud reviewed Apr 27, 2022

View reviewed changes

beatfreaker added 2 commits April 27, 2022 11:21

Merge remote-tracking branch 'origin/main' into mongock-support

29cf3ed

Fix jhipster#691 - Minor changes

ee924e0

beatfreaker requested a review from pascalgrimaud April 27, 2022 06:32

pascalgrimaud approved these changes Apr 27, 2022

View reviewed changes

pascalgrimaud merged commit 7e84164 into jhipster:main Apr 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #691 - Add Mongock support #1424

Fix #691 - Add Mongock support #1424

beatfreaker commented Apr 21, 2022

codecov bot commented Apr 21, 2022 •

edited

beatfreaker commented Apr 22, 2022

pascalgrimaud commented Apr 22, 2022

pascalgrimaud commented Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud Apr 22, 2022

pascalgrimaud commented Apr 22, 2022

beatfreaker commented Apr 26, 2022

pascalgrimaud commented Apr 26, 2022

beatfreaker commented Apr 26, 2022

pascalgrimaud Apr 26, 2022

pascalgrimaud Apr 26, 2022

pascalgrimaud commented Apr 26, 2022

beatfreaker commented Apr 26, 2022

beatfreaker commented Apr 26, 2022 •

edited

pascalgrimaud commented Apr 26, 2022

pascalgrimaud Apr 27, 2022

beatfreaker Apr 27, 2022

pascalgrimaud Apr 27, 2022

pascalgrimaud commented Apr 27, 2022

beatfreaker commented Apr 30, 2022

pascalgrimaud commented Apr 30, 2022

beatfreaker commented Apr 30, 2022

		@@ -0,0 +1,21 @@
		package tech.jhipster.fullapp.technical.infrastructure.secondary.mongock.dbmigration;

		@@ -0,0 +1,8 @@
		package tech.jhipster.fullapp.technical.infrastructure.secondary.mongock;


		## Maintainers

		- [Pascal Grimaud](https://github.com/pascalgrimaud)

Fix #691 - Add Mongock support #1424

Fix #691 - Add Mongock support #1424

Conversation

beatfreaker commented Apr 21, 2022

codecov bot commented Apr 21, 2022 • edited

Codecov Report

beatfreaker commented Apr 22, 2022

pascalgrimaud commented Apr 22, 2022

pascalgrimaud commented Apr 22, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pascalgrimaud commented Apr 22, 2022

beatfreaker commented Apr 26, 2022

pascalgrimaud commented Apr 26, 2022

beatfreaker commented Apr 26, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pascalgrimaud commented Apr 26, 2022

beatfreaker commented Apr 26, 2022

beatfreaker commented Apr 26, 2022 • edited

pascalgrimaud commented Apr 26, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pascalgrimaud commented Apr 27, 2022

beatfreaker commented Apr 30, 2022

pascalgrimaud commented Apr 30, 2022

beatfreaker commented Apr 30, 2022

codecov bot commented Apr 21, 2022 •

edited

beatfreaker commented Apr 26, 2022 •

edited