From 5c8691598e0f08dfb5365ee4fff8715aeb516ea0 Mon Sep 17 00:00:00 2001 From: Chandrika Date: Thu, 14 May 2015 15:18:28 -0400 Subject: [PATCH] MIFOSX-2043 Adding new Database column 'key' to password preferences to support localization of description values. --- api-docs/apiLive.htm | 11 +++++++---- .../data/PasswordValidationPolicyData.java | 4 +++- ...sswordValidationPolicyReadPlatformServiceImpl.java | 6 ++++-- .../V260__alter_password_validation_policy.sql | 4 ++++ 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 mifosng-provider/src/main/resources/sql/migrations/core_db/V260__alter_password_validation_policy.sql diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index ebb0d5ca2..8a952ddae 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -31176,13 +31176,15 @@ GET https://DomainName/api/v1/passwordpreferences/template [ { "id": 1, -"description": "Password most be at least 1 character and not more that 50 characters long", -"active": true +"description": "Password must be at least 1 character and not more that 50 characters long", +"active": true, +"key" : "simple" }, { "id": 2, "description": "Password must be at least 6 characters, no more than 50 characters long, must include at least one upper case letter, one lower case letter, one numeric digit and no space", -"active": false +"active": false, +"key" : "secure" } ] @@ -31196,7 +31198,8 @@ GET https://DomainName/api/v1/passwordpreferences/ { "id": 1, "description": "Password most be at least 1 character and not more that 50 characters long", -"active": true +"active": true, +"key" : "simple" } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java index 2839c3205..ce611c469 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/data/PasswordValidationPolicyData.java @@ -18,11 +18,13 @@ public class PasswordValidationPolicyData implements Serializable { private final String description; @SuppressWarnings("unused") private final boolean active; + private final String key; - public PasswordValidationPolicyData(final Long id, final Boolean active, final String description) { + public PasswordValidationPolicyData(final Long id, final Boolean active, final String description, final String key) { this.id = id; this.active = active; this.description = description; + this.key = key; } } \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java index 38abce1fb..7d6077dfc 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java @@ -56,12 +56,14 @@ public class PasswordValidationPolicyReadPlatformServiceImpl implements Password final Long id = JdbcSupport.getLong(rs, "id"); final Boolean active = rs.getBoolean("active"); final String description = rs.getString("description"); + final String key = rs.getString("key"); - return new PasswordValidationPolicyData(id, active, description); + return new PasswordValidationPolicyData(id, active, description, key); } public String schema() { - return " pvp.id as id, pvp.active as active, pvp.description as description from m_password_validation_policy pvp"; + return " pvp.id as id, pvp.active as active, pvp.description as description, pvp.`key` as `key`" + + " from m_password_validation_policy pvp"; } } diff --git a/mifosng-provider/src/main/resources/sql/migrations/core_db/V260__alter_password_validation_policy.sql b/mifosng-provider/src/main/resources/sql/migrations/core_db/V260__alter_password_validation_policy.sql new file mode 100644 index 000000000..125dd1608 --- /dev/null +++ b/mifosng-provider/src/main/resources/sql/migrations/core_db/V260__alter_password_validation_policy.sql @@ -0,0 +1,4 @@ +ALTER TABLE `m_password_validation_policy` ADD COLUMN `key` VARCHAR(255) NOT NULL; + +UPDATE `m_password_validation_policy` pvp SET pvp.`key`='simple' where pvp.id='1' ; +UPDATE `m_password_validation_policy` pvp SET pvp.`key`='secure' where pvp.id='2' ;