First sprint from AtolCD

[ftavin]

Mantis issues:

• adding team members (#620)
• adding secondary OrgUnits (#243)
• adding framework in db (V2.3 from atolcd #106)

Tools for devs:

• adding docker-compose.yml file
• removal of unuseful permutations during maven compilation with sigmah-dev profile

[ghost]

It seems we have a problem here: those two classes does not exist. I guess these have been added at one point in the development process but removed later and someone forgot to remove these two lines while removing the classes themselves.

@ftavin, as the author of the commit, can you confirm? (and commit a fix)

[ghost]

Also, it seems that 5 classes should be declared in this file while they are not (org.sigmah.server.domain.Framework*)

[ftavin]

Class list fixed.

[ghost]

Thanks!

There is a test failure which is specifically on the branch which is not on master:

-------------------------------------------------------------------------------
Test set: org.sigmah.server.servlet.importer.AutomatedImporterTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 3.423 sec <<< FAILURE! - in org.sigmah.server.servlet.importer.AutomatedImporterTest
testImportCorrespondances(org.sigmah.server.servlet.importer.AutomatedImporterTest)  Time elapsed: 1.857 sec  <<< ERROR!
java.lang.NullPointerException: null
    at org.sigmah.server.handler.UpdateProjectHandler.searchForConflicts(UpdateProjectHandler.java:734)
    at org.sigmah.server.handler.UpdateProjectHandler.updateProject(UpdateProjectHandler.java:184)
    at com.google.inject.persist.jpa.JpaLocalTxnInterceptor.invoke(JpaLocalTxnInterceptor.java:66)
    at org.sigmah.server.handler.UpdateProjectHandler.execute(UpdateProjectHandler.java:148)
    at org.sigmah.server.handler.UpdateProjectHandler.execute(UpdateProjectHandler.java:95)
    at org.sigmah.server.handler.base.AbstractCommandHandler.execute(AbstractCommandHandler.java:117)
    at org.sigmah.server.dispatch.impl.UserDispatch.doExecute(UserDispatch.java:341)
    at org.sigmah.server.dispatch.impl.UserDispatch.access$000(UserDispatch.java:57)
    at org.sigmah.server.dispatch.impl.UserDispatch$UserExecutionContext.execute(UserDispatch.java:133)
    at org.sigmah.server.dispatch.impl.UserDispatch$UserExecutionContext.execute(UserDispatch.java:123)
    at org.sigmah.server.servlet.importer.AutomatedImporter.updateContainerWithDetails(AutomatedImporter.java:312)
    at org.sigmah.server.servlet.importer.AutomatedImporter.onContainerFound(AutomatedImporter.java:140)
    at org.sigmah.server.servlet.importer.AutomatedImporter.importCorrespondances(AutomatedImporter.java:102)
    at org.sigmah.server.servlet.importer.AutomatedImporterTest.testImportCorrespondances(AutomatedImporterTest.java:130)

The stack-trace leads to a code added in 11c3fc8:

final ProfileDTO profile = Handlers.aggregateProfiles(context.getUser(), mapper).get(project.getOrgUnit().getId());

Didn't see anything obviously wrong at first sight, @ftavin can you check it? Thanks.

[ftavin]

Fixed !

[ftavin]

New fix : we now have exactly the same test failure than the master branch !

[ghost]

Replace by HQL argument (see comment on FrameworkFulfillmentHibernateDAO)

[Raphcal]

@numero-six By a JPQL argument.

[ghost]

Woaw, I've made tens of comments 😮

@ftavin no panic! I'm globally quite happy with the code and I think most of the things I've noted are secondary details that should not prevent a merge. Most of them should be fixed in seconds.

I let @osarrat see, according to the time AtolCD have and priorities, if the lil' time to spend worth it.

[osarrat]

If @numero-six , you consider those changes secondary, I let @ftavin free to decide how much it is worth to work on them now. If @ftavin prefers to postpone or not work on it because workplan is too tight until release, then I will open an issue on next-but-one version to work on this.

[ghost]

Merging to meet deadlines but fixes of above comments will still be welcomed