You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/03/22 06:10:37 UTC
[1/2] incubator-fineract git commit: FINERACT-243 : Constitution Type
Required Field
Repository: incubator-fineract
Updated Branches:
refs/heads/develop e47f4dde8 -> 7f9591ce9
FINERACT-243 : Constitution Type Required Field
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/770b33cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/770b33cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/770b33cf
Branch: refs/heads/develop
Commit: 770b33cf69cc55d08e3d8359db38f6fe0317ecc5
Parents: 8cc560c
Author: nazeer1100126 <na...@confluxtechnologies.com>
Authored: Wed Mar 15 16:29:06 2017 +0530
Committer: nazeer1100126 <na...@confluxtechnologies.com>
Committed: Wed Mar 15 16:29:06 2017 +0530
----------------------------------------------------------------------
.../infrastructure/core/api/JsonCommand.java | 8 +++++++-
.../portfolio/client/data/ClientDataValidator.java | 4 ++--
.../ClientWritePlatformServiceJpaRepositoryImpl.java | 15 +++++++++++++--
3 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/770b33cf/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
index 488e7ba..d06d128 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
@@ -40,7 +40,6 @@ import org.joda.time.format.DateTimeFormatter;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
import com.google.gson.reflect.TypeToken;
/**
@@ -126,6 +125,13 @@ public final class JsonCommand {
return this.parsedCommand;
}
+ public JsonElement jsonElement(final String paramName) {
+ if (this.parsedCommand.getAsJsonObject().has(paramName)) {
+ return this.parsedCommand.getAsJsonObject().get(paramName);
+ }
+ return null;
+ }
+
public String jsonFragment(final String paramName) {
String jsonFragment = null;
if (this.parsedCommand.getAsJsonObject().has(paramName)) {
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/770b33cf/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
index 585c222..51f4e95 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
@@ -250,7 +250,7 @@ public final class ClientDataValidator {
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.constitutionIdParamName, element)) {
final Integer constitution = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.constitutionIdParamName,
element);
- baseDataValidator.reset().parameter(ClientApiConstants.constitutionIdParamName).value(constitution).notNull().integerGreaterThanZero();
+ baseDataValidator.reset().parameter(ClientApiConstants.constitutionIdParamName).value(constitution).ignoreIfNull().integerGreaterThanZero();
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.mainBusinessLineIdParamName, element)) {
@@ -532,7 +532,7 @@ public final class ClientDataValidator {
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.constitutionIdParamName, element)) {
atLeastOneParameterPassedForUpdate = true;
final Integer constitutionId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(ClientApiConstants.constitutionIdParamName, element);
- baseDataValidator.reset().parameter(ClientApiConstants.constitutionIdParamName).value(constitutionId).notNull().integerGreaterThanZero();
+ baseDataValidator.reset().parameter(ClientApiConstants.constitutionIdParamName).value(constitutionId).ignoreIfNull().integerGreaterThanZero();
}
if (this.fromApiJsonHelper.parameterExists(ClientApiConstants.mainBusinessLineIdParamName, element)) {
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/770b33cf/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
index cd334fa..2a131a0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
@@ -497,7 +497,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
final ClientNonPerson clientNonPersonForUpdate = this.clientNonPersonRepository.findOneByClientId(clientId);
if(clientNonPersonForUpdate != null)
{
- final JsonElement clientNonPersonElement = this.fromApiJsonHelper.parse(command.jsonFragment(ClientApiConstants.clientNonPersonDetailsParamName));
+ final JsonElement clientNonPersonElement = command.jsonElement(ClientApiConstants.clientNonPersonDetailsParamName);
final Map<String, Object> clientNonPersonChanges = clientNonPersonForUpdate.update(JsonCommand.fromExistingCommand(command, clientNonPersonElement));
if (clientNonPersonChanges.containsKey(ClientApiConstants.constitutionIdParamName)) {
@@ -525,8 +525,19 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
}
changes.putAll(clientNonPersonChanges);
+ } else {
+ final Integer legalFormParamValue = command.integerValueOfParameterNamed(ClientApiConstants.legalFormIdParamName);
+ boolean isEntity = false;
+ if (legalFormParamValue != null) {
+ final LegalForm legalForm = LegalForm.fromInt(legalFormParamValue);
+ if (legalForm != null) {
+ isEntity = legalForm.isEntity();
+ }
+ }
+ if (isEntity) {
+ extractAndCreateClientNonPerson(clientForUpdate, command);
+ }
}
-
return new CommandProcessingResultBuilder() //
.withCommandId(command.commandId()) //
.withOfficeId(clientForUpdate.officeId()) //
[2/2] incubator-fineract git commit: Merge branch 'FINERACT-243' into
develop
Posted by na...@apache.org.
Merge branch 'FINERACT-243' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/7f9591ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/7f9591ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/7f9591ce
Branch: refs/heads/develop
Commit: 7f9591ce96bc69dac0d7fc20bd4ce64c341b9617
Parents: e47f4dd 770b33c
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Mar 22 11:40:13 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Mar 22 11:40:13 2017 +0530
----------------------------------------------------------------------
.../infrastructure/core/api/JsonCommand.java | 8 +++++++-
.../portfolio/client/data/ClientDataValidator.java | 4 ++--
.../ClientWritePlatformServiceJpaRepositoryImpl.java | 15 +++++++++++++--
3 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------