fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From my...@apache.org
Subject [fineract-cn-customer] 20/28: added member flag and extended search to use given name and surname too updated license header
Date Mon, 22 Jan 2018 15:24:57 GMT
This is an automated email from the ASF dual-hosted git repository.

myrle pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-customer.git

commit ee78660df419e9d8ec63e01b28ef8dada8fba8cd
Author: mgeiss <mgeiss@mifos.org>
AuthorDate: Sun Jun 11 16:47:42 2017 +0200

    added member flag and extended search to use given name and surname too
    updated license header
---
 .../java/io/mifos/customer/PermittableGroupIds.java |  2 +-
 .../customer/api/v1/CustomerEventConstants.java     |  2 +-
 .../api/v1/client/AddressValidationException.java   |  2 +-
 .../api/v1/client/CommandExecutionException.java    |  2 +-
 .../v1/client/ContactDetailValidationException.java |  2 +-
 .../v1/client/CustomerAlreadyExistsException.java   |  2 +-
 .../customer/api/v1/client/CustomerManager.java     |  2 +-
 .../api/v1/client/CustomerNotFoundException.java    |  2 +-
 .../api/v1/client/CustomerValidationException.java  |  2 +-
 .../client/IdentificationCardNotFoundException.java |  2 +-
 .../IdentificationCardValidationException.java      |  2 +-
 .../api/v1/client/PortraitNotFoundException.java    |  2 +-
 .../api/v1/client/PortraitValidationException.java  |  2 +-
 .../api/v1/client/TaskAlreadyExistsException.java   |  2 +-
 .../api/v1/client/TaskExecutionException.java       |  2 +-
 .../api/v1/client/TaskNotFoundException.java        |  2 +-
 .../api/v1/client/TaskValidationException.java      |  2 +-
 .../api/v1/client/TasksStillPendingException.java   |  2 +-
 .../api/v1/config/CustomerFeignClientConfig.java    | 15 +++++++++++++++
 .../api/v1/config/encoder/CustomDecoder.java        |  2 +-
 .../api/v1/config/encoder/CustomEncoder.java        |  2 +-
 .../io/mifos/customer/api/v1/domain/Address.java    |  2 +-
 .../io/mifos/customer/api/v1/domain/Command.java    |  2 +-
 .../mifos/customer/api/v1/domain/ContactDetail.java |  2 +-
 .../io/mifos/customer/api/v1/domain/Customer.java   | 12 +++++++++++-
 .../mifos/customer/api/v1/domain/CustomerPage.java  |  2 +-
 .../customer/api/v1/domain/ExpirationDate.java      |  2 +-
 .../customer/api/v1/domain/IdentificationCard.java  |  2 +-
 .../customer/api/v1/domain/TaskDefinition.java      |  2 +-
 .../mifos/customer/api/v1/domain/TaskInstance.java  |  2 +-
 .../catalog/api/v1/CatalogEventConstants.java       |  2 +-
 .../v1/client/CatalogAlreadyExistsException.java    |  2 +-
 .../catalog/api/v1/client/CatalogManager.java       |  2 +-
 .../api/v1/client/CatalogValidationException.java   |  2 +-
 .../customer/catalog/api/v1/domain/Catalog.java     |  2 +-
 .../mifos/customer/catalog/api/v1/domain/Field.java |  2 +-
 .../customer/catalog/api/v1/domain/Option.java      |  2 +-
 .../mifos/customer/catalog/api/v1/domain/Value.java |  2 +-
 .../main/java/io/mifos/customer/TestCustomer.java   |  3 ++-
 .../java/io/mifos/customer/TestInfrastructure.java  |  2 +-
 .../java/io/mifos/customer/TestTaskDefinition.java  |  2 +-
 .../java/io/mifos/customer/TestTaskInstance.java    |  2 +-
 .../java/io/mifos/customer/catalog/TestCatalog.java |  2 +-
 .../catalog/listener/CatalogEventListener.java      |  2 +-
 .../customer/catalog/util/CatalogGenerator.java     |  2 +-
 .../customer/listener/CustomerEventListener.java    |  2 +-
 .../customer/listener/MigrationEventListener.java   |  2 +-
 .../mifos/customer/listener/TaskEventListener.java  |  2 +-
 .../io/mifos/customer/util/AddressGenerator.java    |  2 +-
 .../io/mifos/customer/util/CommandGenerator.java    |  2 +-
 .../mifos/customer/util/ContactDetailGenerator.java |  2 +-
 .../io/mifos/customer/util/CustomerGenerator.java   |  3 ++-
 .../customer/util/IdentificationCardGenerator.java  |  2 +-
 .../java/io/mifos/customer/util/TaskGenerator.java  |  2 +-
 component-test/src/main/resources/logback.xml       |  2 +-
 .../internal/command/CreateCatalogCommand.java      |  2 +-
 .../internal/command/handler/CatalogAggregate.java  |  2 +-
 .../config/CatalogServiceConfiguration.java         |  2 +-
 .../service/internal/mapper/CatalogMapper.java      |  2 +-
 .../service/internal/mapper/FieldMapper.java        |  2 +-
 .../service/internal/mapper/OptionMapper.java       |  2 +-
 .../service/internal/repository/CatalogEntity.java  |  2 +-
 .../internal/repository/CatalogRepository.java      |  2 +-
 .../service/internal/repository/FieldEntity.java    |  2 +-
 .../internal/repository/FieldRepository.java        |  2 +-
 .../internal/repository/FieldValueEntity.java       |  2 +-
 .../internal/repository/FieldValueRepository.java   |  2 +-
 .../service/internal/repository/OptionEntity.java   |  2 +-
 .../service/internal/service/CatalogService.java    |  2 +-
 .../internal/service/FieldValueValidator.java       |  2 +-
 .../rest/config/CatalogRestConfiguration.java       |  2 +-
 .../rest/controller/CatalogRestController.java      |  2 +-
 .../mifos/customer/service/CustomerApplication.java |  2 +-
 .../io/mifos/customer/service/ServiceConstants.java |  2 +-
 .../internal/command/ActivateCustomerCommand.java   |  2 +-
 .../command/AddTaskDefinitionToCustomerCommand.java |  2 +-
 .../internal/command/CloseCustomerCommand.java      |  2 +-
 .../internal/command/CreateCustomerCommand.java     |  2 +-
 .../command/CreateIdentificationCardCommand.java    |  2 +-
 .../internal/command/CreatePortraitCommand.java     |  2 +-
 .../command/CreateTaskDefinitionCommand.java        |  2 +-
 .../command/DeleteIdentificationCardCommand.java    |  2 +-
 .../internal/command/DeletePortraitCommand.java     |  2 +-
 .../command/ExecuteTaskForCustomerCommand.java      |  2 +-
 .../internal/command/InitializeServiceCommand.java  |  2 +-
 .../internal/command/LockCustomerCommand.java       |  2 +-
 .../internal/command/ReopenCustomerCommand.java     |  2 +-
 .../internal/command/UnlockCustomerCommand.java     |  2 +-
 .../internal/command/UpdateAddressCommand.java      |  2 +-
 .../command/UpdateContactDetailsCommand.java        |  2 +-
 .../internal/command/UpdateCustomerCommand.java     |  2 +-
 .../command/UpdateIdentificationCardCommand.java    |  2 +-
 .../command/UpdateTaskDefinitionCommand.java        |  2 +-
 .../internal/command/handler/CustomerAggregate.java |  2 +-
 .../command/handler/MigrationAggregate.java         |  2 +-
 .../internal/command/handler/TaskAggregate.java     |  2 +-
 .../config/CustomerServiceConfiguration.java        |  2 +-
 .../service/internal/mapper/AddressMapper.java      |  2 +-
 .../service/internal/mapper/CommandMapper.java      |  2 +-
 .../internal/mapper/ContactDetailMapper.java        |  2 +-
 .../service/internal/mapper/CustomerMapper.java     |  4 +++-
 .../service/internal/mapper/FieldValueMapper.java   |  2 +-
 .../internal/mapper/IdentificationCardMapper.java   |  2 +-
 .../service/internal/mapper/PortraitMapper.java     |  2 +-
 .../internal/mapper/TaskDefinitionMapper.java       |  2 +-
 .../service/internal/mapper/TaskInstanceMapper.java |  2 +-
 .../service/internal/repository/AddressEntity.java  |  2 +-
 .../internal/repository/AddressRepository.java      |  2 +-
 .../service/internal/repository/CommandEntity.java  |  2 +-
 .../internal/repository/CommandRepository.java      |  2 +-
 .../internal/repository/ContactDetailEntity.java    |  2 +-
 .../repository/ContactDetailRepository.java         |  2 +-
 .../service/internal/repository/CustomerEntity.java | 12 +++++++++++-
 .../internal/repository/CustomerRepository.java     |  8 +++++---
 .../repository/IdentificationCardEntity.java        |  2 +-
 .../repository/IdentificationCardRepository.java    |  2 +-
 .../service/internal/repository/PortraitEntity.java |  2 +-
 .../internal/repository/PortraitRepository.java     |  2 +-
 .../internal/repository/TaskDefinitionEntity.java   |  2 +-
 .../repository/TaskDefinitionRepository.java        |  2 +-
 .../internal/repository/TaskInstanceEntity.java     |  2 +-
 .../internal/repository/TaskInstanceRepository.java |  2 +-
 .../service/internal/service/CustomerService.java   |  9 ++++++---
 .../service/internal/service/TaskService.java       |  2 +-
 .../rest/config/CustomerRestConfiguration.java      |  2 +-
 .../rest/controller/CustomerRestController.java     |  2 +-
 service/src/main/resources/application.yml          |  2 +-
 service/src/main/resources/bootstrap.yml            |  2 +-
 .../db/migrations/mariadb/V1__initial_setup.sql     |  2 +-
 .../db/migrations/mariadb/V2__customer_portrait.sql | 11 +----------
 .../migrations/mariadb/V3__added_is_member_flag.sql | 21 +++++++++++++++++++++
 .../resources/diagrams/customer-state-machine.uxf   |  2 +-
 132 files changed, 199 insertions(+), 143 deletions(-)

diff --git a/api/src/main/java/io/mifos/customer/PermittableGroupIds.java b/api/src/main/java/io/mifos/customer/PermittableGroupIds.java
index e905856..f4f4dec 100644
--- a/api/src/main/java/io/mifos/customer/PermittableGroupIds.java
+++ b/api/src/main/java/io/mifos/customer/PermittableGroupIds.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/CustomerEventConstants.java b/api/src/main/java/io/mifos/customer/api/v1/CustomerEventConstants.java
index 4265b90..97a15c8 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/CustomerEventConstants.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/CustomerEventConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/AddressValidationException.java b/api/src/main/java/io/mifos/customer/api/v1/client/AddressValidationException.java
index edba50a..34e014b 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/AddressValidationException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/AddressValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/CommandExecutionException.java b/api/src/main/java/io/mifos/customer/api/v1/client/CommandExecutionException.java
index 574fb0f..b627176 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/CommandExecutionException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/CommandExecutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/ContactDetailValidationException.java b/api/src/main/java/io/mifos/customer/api/v1/client/ContactDetailValidationException.java
index 20b3b86..5b2c51b 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/ContactDetailValidationException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/ContactDetailValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerAlreadyExistsException.java b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerAlreadyExistsException.java
index e43bbbc..8fddf9a 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerAlreadyExistsException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerAlreadyExistsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerManager.java b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerManager.java
index a4f4bcb..4634868 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerManager.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerNotFoundException.java b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerNotFoundException.java
index e735ccd..0de0598 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerNotFoundException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerValidationException.java b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerValidationException.java
index eefc2ed..f6b5d78 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/CustomerValidationException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/CustomerValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardNotFoundException.java b/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardNotFoundException.java
index 86ad582..8e52606 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardNotFoundException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardValidationException.java b/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardValidationException.java
index 6c8f949..5949aec 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardValidationException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/IdentificationCardValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/PortraitNotFoundException.java b/api/src/main/java/io/mifos/customer/api/v1/client/PortraitNotFoundException.java
index d5cb2b9..239de66 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/PortraitNotFoundException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/PortraitNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/PortraitValidationException.java b/api/src/main/java/io/mifos/customer/api/v1/client/PortraitValidationException.java
index 000b8d9..cbe3a33 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/PortraitValidationException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/PortraitValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/TaskAlreadyExistsException.java b/api/src/main/java/io/mifos/customer/api/v1/client/TaskAlreadyExistsException.java
index def90d1..94543ed 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/TaskAlreadyExistsException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/TaskAlreadyExistsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/TaskExecutionException.java b/api/src/main/java/io/mifos/customer/api/v1/client/TaskExecutionException.java
index 8eeb682..361a691 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/TaskExecutionException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/TaskExecutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/TaskNotFoundException.java b/api/src/main/java/io/mifos/customer/api/v1/client/TaskNotFoundException.java
index a95fbaa..98af5b2 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/TaskNotFoundException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/TaskNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/TaskValidationException.java b/api/src/main/java/io/mifos/customer/api/v1/client/TaskValidationException.java
index a47f698..b1f4828 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/TaskValidationException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/TaskValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/client/TasksStillPendingException.java b/api/src/main/java/io/mifos/customer/api/v1/client/TasksStillPendingException.java
index ff600e2..7687717 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/client/TasksStillPendingException.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/client/TasksStillPendingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/config/CustomerFeignClientConfig.java b/api/src/main/java/io/mifos/customer/api/v1/config/CustomerFeignClientConfig.java
index 37fa00f..345287f 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/config/CustomerFeignClientConfig.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/config/CustomerFeignClientConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017 The Mifos Initiative.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.mifos.customer.api.v1.config;/*
  * Copyright 2016 The Mifos Initiative.
  *
diff --git a/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomDecoder.java b/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomDecoder.java
index afce39d..e8317be 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomDecoder.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomEncoder.java b/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomEncoder.java
index 6e88d62..7a64320 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomEncoder.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/config/encoder/CustomEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/Address.java b/api/src/main/java/io/mifos/customer/api/v1/domain/Address.java
index d1d4e1d..8f6b419 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/Address.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/Command.java b/api/src/main/java/io/mifos/customer/api/v1/domain/Command.java
index bba797e..82e2481 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/Command.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/ContactDetail.java b/api/src/main/java/io/mifos/customer/api/v1/domain/ContactDetail.java
index cd9fffb..644f43c 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/ContactDetail.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/ContactDetail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/Customer.java b/api/src/main/java/io/mifos/customer/api/v1/domain/Customer.java
index 98b2473..ee130b9 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/Customer.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/Customer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,8 @@ public final class Customer {
   private String surname;
   @NotNull
   private DateOfBirth dateOfBirth;
+  @NotNull
+  private Boolean member;
   private String accountBeneficiary;
   private String referenceCustomer;
   private String assignedOffice;
@@ -116,6 +118,14 @@ public final class Customer {
     this.dateOfBirth = dateOfBirth;
   }
 
+  public Boolean getMember() {
+    return this.member;
+  }
+
+  public void setMember(final Boolean member) {
+    this.member = member;
+  }
+
   public String getAccountBeneficiary() {
     return this.accountBeneficiary;
   }
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/CustomerPage.java b/api/src/main/java/io/mifos/customer/api/v1/domain/CustomerPage.java
index 29a8c75..37deb7d 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/CustomerPage.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/CustomerPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/ExpirationDate.java b/api/src/main/java/io/mifos/customer/api/v1/domain/ExpirationDate.java
index d87d330..4196d0f 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/ExpirationDate.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/ExpirationDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/IdentificationCard.java b/api/src/main/java/io/mifos/customer/api/v1/domain/IdentificationCard.java
index 3d0aec4..42adba7 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/IdentificationCard.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/IdentificationCard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/TaskDefinition.java b/api/src/main/java/io/mifos/customer/api/v1/domain/TaskDefinition.java
index bd3dc48..a81fba6 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/TaskDefinition.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/TaskDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/api/v1/domain/TaskInstance.java b/api/src/main/java/io/mifos/customer/api/v1/domain/TaskInstance.java
index dc6411a..656fa2b 100644
--- a/api/src/main/java/io/mifos/customer/api/v1/domain/TaskInstance.java
+++ b/api/src/main/java/io/mifos/customer/api/v1/domain/TaskInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/CatalogEventConstants.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/CatalogEventConstants.java
index 15dfa2a..97b4955 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/CatalogEventConstants.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/CatalogEventConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogAlreadyExistsException.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogAlreadyExistsException.java
index 36e8428..f734758 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogAlreadyExistsException.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogAlreadyExistsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogManager.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogManager.java
index 8d716b9..cc41531 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogManager.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogValidationException.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogValidationException.java
index f3bb2fc..9e77c44 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogValidationException.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/client/CatalogValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Catalog.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Catalog.java
index 37dd458..cf0a8e0 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Catalog.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Catalog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Field.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Field.java
index 63192d2..61aebd4 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Field.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Option.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Option.java
index 9965cb7..0ccdd4f 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Option.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Option.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Value.java b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Value.java
index 84e9299..c6e688d 100644
--- a/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Value.java
+++ b/api/src/main/java/io/mifos/customer/catalog/api/v1/domain/Value.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/TestCustomer.java b/component-test/src/main/java/io/mifos/customer/TestCustomer.java
index 1b64b09..58ce486 100644
--- a/component-test/src/main/java/io/mifos/customer/TestCustomer.java
+++ b/component-test/src/main/java/io/mifos/customer/TestCustomer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -168,6 +168,7 @@ public class TestCustomer {
     Assert.assertNotNull(foundCustomer.getAddress());
     Assert.assertNotNull(foundCustomer.getContactDetails());
     Assert.assertEquals(2, foundCustomer.getContactDetails().size());
+    Assert.assertEquals(customer.getMember(), foundCustomer.getMember());
   }
 
   @Test
diff --git a/component-test/src/main/java/io/mifos/customer/TestInfrastructure.java b/component-test/src/main/java/io/mifos/customer/TestInfrastructure.java
index 7a1d338..cf284a1 100644
--- a/component-test/src/main/java/io/mifos/customer/TestInfrastructure.java
+++ b/component-test/src/main/java/io/mifos/customer/TestInfrastructure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/TestTaskDefinition.java b/component-test/src/main/java/io/mifos/customer/TestTaskDefinition.java
index 04fed29..a36bf86 100644
--- a/component-test/src/main/java/io/mifos/customer/TestTaskDefinition.java
+++ b/component-test/src/main/java/io/mifos/customer/TestTaskDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/TestTaskInstance.java b/component-test/src/main/java/io/mifos/customer/TestTaskInstance.java
index f9ac9c1..140b586 100644
--- a/component-test/src/main/java/io/mifos/customer/TestTaskInstance.java
+++ b/component-test/src/main/java/io/mifos/customer/TestTaskInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/catalog/TestCatalog.java b/component-test/src/main/java/io/mifos/customer/catalog/TestCatalog.java
index a4fffdf..e538822 100644
--- a/component-test/src/main/java/io/mifos/customer/catalog/TestCatalog.java
+++ b/component-test/src/main/java/io/mifos/customer/catalog/TestCatalog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/catalog/listener/CatalogEventListener.java b/component-test/src/main/java/io/mifos/customer/catalog/listener/CatalogEventListener.java
index eecbe1f..ad4575d 100644
--- a/component-test/src/main/java/io/mifos/customer/catalog/listener/CatalogEventListener.java
+++ b/component-test/src/main/java/io/mifos/customer/catalog/listener/CatalogEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/catalog/util/CatalogGenerator.java b/component-test/src/main/java/io/mifos/customer/catalog/util/CatalogGenerator.java
index 632e7eb..6e0e5c4 100644
--- a/component-test/src/main/java/io/mifos/customer/catalog/util/CatalogGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/catalog/util/CatalogGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/listener/CustomerEventListener.java b/component-test/src/main/java/io/mifos/customer/listener/CustomerEventListener.java
index cdc3328..f066746 100644
--- a/component-test/src/main/java/io/mifos/customer/listener/CustomerEventListener.java
+++ b/component-test/src/main/java/io/mifos/customer/listener/CustomerEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/listener/MigrationEventListener.java b/component-test/src/main/java/io/mifos/customer/listener/MigrationEventListener.java
index 61e7a70..c4b29e8 100644
--- a/component-test/src/main/java/io/mifos/customer/listener/MigrationEventListener.java
+++ b/component-test/src/main/java/io/mifos/customer/listener/MigrationEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/listener/TaskEventListener.java b/component-test/src/main/java/io/mifos/customer/listener/TaskEventListener.java
index 4d76476..6ef9392 100644
--- a/component-test/src/main/java/io/mifos/customer/listener/TaskEventListener.java
+++ b/component-test/src/main/java/io/mifos/customer/listener/TaskEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/util/AddressGenerator.java b/component-test/src/main/java/io/mifos/customer/util/AddressGenerator.java
index a21a469..3fc7f57 100644
--- a/component-test/src/main/java/io/mifos/customer/util/AddressGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/util/AddressGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/util/CommandGenerator.java b/component-test/src/main/java/io/mifos/customer/util/CommandGenerator.java
index 933a913..4e93647 100644
--- a/component-test/src/main/java/io/mifos/customer/util/CommandGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/util/CommandGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/util/ContactDetailGenerator.java b/component-test/src/main/java/io/mifos/customer/util/ContactDetailGenerator.java
index f057ff1..51ef8dc 100644
--- a/component-test/src/main/java/io/mifos/customer/util/ContactDetailGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/util/ContactDetailGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/util/CustomerGenerator.java b/component-test/src/main/java/io/mifos/customer/util/CustomerGenerator.java
index c6d1f74..874a448 100644
--- a/component-test/src/main/java/io/mifos/customer/util/CustomerGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/util/CustomerGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ public final class CustomerGenerator {
     customer.setMiddleName(RandomStringUtils.randomAlphanumeric(256));
     customer.setSurname(RandomStringUtils.randomAlphanumeric(256));
     customer.setDateOfBirth(DateOfBirth.fromLocalDate(LocalDate.now(Clock.systemUTC())));
+    customer.setMember(Boolean.TRUE);
     customer.setAssignedOffice(RandomStringUtils.randomAlphanumeric(8));
     customer.setAssignedEmployee(RandomStringUtils.randomAlphanumeric(8));
     customer.setCurrentState(Customer.State.PENDING.name());
diff --git a/component-test/src/main/java/io/mifos/customer/util/IdentificationCardGenerator.java b/component-test/src/main/java/io/mifos/customer/util/IdentificationCardGenerator.java
index d3c2b7d..7ebeebc 100644
--- a/component-test/src/main/java/io/mifos/customer/util/IdentificationCardGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/util/IdentificationCardGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/java/io/mifos/customer/util/TaskGenerator.java b/component-test/src/main/java/io/mifos/customer/util/TaskGenerator.java
index 03dbf86..c956075 100644
--- a/component-test/src/main/java/io/mifos/customer/util/TaskGenerator.java
+++ b/component-test/src/main/java/io/mifos/customer/util/TaskGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/component-test/src/main/resources/logback.xml b/component-test/src/main/resources/logback.xml
index c29d3cd..d327dfb 100644
--- a/component-test/src/main/resources/logback.xml
+++ b/component-test/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2017 The Mifos Initiative
+    Copyright 2017 The Mifos Initiative.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/command/CreateCatalogCommand.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/command/CreateCatalogCommand.java
index 09be13e..da03273 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/command/CreateCatalogCommand.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/command/CreateCatalogCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/command/handler/CatalogAggregate.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/command/handler/CatalogAggregate.java
index 74bf29d..31de88d 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/command/handler/CatalogAggregate.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/command/handler/CatalogAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/config/CatalogServiceConfiguration.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/config/CatalogServiceConfiguration.java
index eeb14db..f169330 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/config/CatalogServiceConfiguration.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/config/CatalogServiceConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/CatalogMapper.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/CatalogMapper.java
index da25b3d..1874c16 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/CatalogMapper.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/CatalogMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/FieldMapper.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/FieldMapper.java
index cb4f52f..a6c7930 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/FieldMapper.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/FieldMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/OptionMapper.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/OptionMapper.java
index c2e18e7..b2a103f 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/OptionMapper.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/mapper/OptionMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogEntity.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogEntity.java
index 82e16e7..dbf684b 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogEntity.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogRepository.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogRepository.java
index 702cff5..3ce6a2f 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogRepository.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/CatalogRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldEntity.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldEntity.java
index ac83ceb..949d932 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldEntity.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldRepository.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldRepository.java
index 0733cbb..ad183f8 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldRepository.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueEntity.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueEntity.java
index 53410a6..878cc2e 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueEntity.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueRepository.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueRepository.java
index 4058c35..af97cf6 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueRepository.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/FieldValueRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/OptionEntity.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/OptionEntity.java
index b37c8a9..0dfc293 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/OptionEntity.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/repository/OptionEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/service/CatalogService.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/service/CatalogService.java
index fa1773e..78cc511 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/service/CatalogService.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/service/CatalogService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/internal/service/FieldValueValidator.java b/service/src/main/java/io/mifos/customer/catalog/service/internal/service/FieldValueValidator.java
index a41f0dc..35500f7 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/internal/service/FieldValueValidator.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/internal/service/FieldValueValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/rest/config/CatalogRestConfiguration.java b/service/src/main/java/io/mifos/customer/catalog/service/rest/config/CatalogRestConfiguration.java
index 47a2e42..ad7ea42 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/rest/config/CatalogRestConfiguration.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/rest/config/CatalogRestConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/catalog/service/rest/controller/CatalogRestController.java b/service/src/main/java/io/mifos/customer/catalog/service/rest/controller/CatalogRestController.java
index 0d4f583..84a4a33 100644
--- a/service/src/main/java/io/mifos/customer/catalog/service/rest/controller/CatalogRestController.java
+++ b/service/src/main/java/io/mifos/customer/catalog/service/rest/controller/CatalogRestController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/CustomerApplication.java b/service/src/main/java/io/mifos/customer/service/CustomerApplication.java
index 8096c60..575be17 100644
--- a/service/src/main/java/io/mifos/customer/service/CustomerApplication.java
+++ b/service/src/main/java/io/mifos/customer/service/CustomerApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/ServiceConstants.java b/service/src/main/java/io/mifos/customer/service/ServiceConstants.java
index ae85302..1a4044e 100644
--- a/service/src/main/java/io/mifos/customer/service/ServiceConstants.java
+++ b/service/src/main/java/io/mifos/customer/service/ServiceConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/ActivateCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/ActivateCustomerCommand.java
index 23be615..0416f26 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/ActivateCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/ActivateCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/AddTaskDefinitionToCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/AddTaskDefinitionToCustomerCommand.java
index 364e09c..17a585f 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/AddTaskDefinitionToCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/AddTaskDefinitionToCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/CloseCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/CloseCustomerCommand.java
index 1382582..0cc783a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/CloseCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/CloseCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/CreateCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/CreateCustomerCommand.java
index 4b84686..bf6e0df 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/CreateCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/CreateCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/CreateIdentificationCardCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/CreateIdentificationCardCommand.java
index 7c5e5c9..e5526b3 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/CreateIdentificationCardCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/CreateIdentificationCardCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/CreatePortraitCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/CreatePortraitCommand.java
index 2173212..5df166b 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/CreatePortraitCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/CreatePortraitCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/CreateTaskDefinitionCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/CreateTaskDefinitionCommand.java
index 3457d2c..e54399c 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/CreateTaskDefinitionCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/CreateTaskDefinitionCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/DeleteIdentificationCardCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/DeleteIdentificationCardCommand.java
index c96bdef..545728f 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/DeleteIdentificationCardCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/DeleteIdentificationCardCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/DeletePortraitCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/DeletePortraitCommand.java
index 5987dfc..fcd5aff 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/DeletePortraitCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/DeletePortraitCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/ExecuteTaskForCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/ExecuteTaskForCustomerCommand.java
index 9ca0daf..ad49be9 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/ExecuteTaskForCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/ExecuteTaskForCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/InitializeServiceCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/InitializeServiceCommand.java
index 7863e9c..7b6d083 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/InitializeServiceCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/InitializeServiceCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/LockCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/LockCustomerCommand.java
index f285c33..f8f4060 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/LockCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/LockCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/ReopenCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/ReopenCustomerCommand.java
index 82574f0..cd75abd 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/ReopenCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/ReopenCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/UnlockCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/UnlockCustomerCommand.java
index 3ecec4d..49d068a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/UnlockCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/UnlockCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateAddressCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateAddressCommand.java
index e6cfe90..3f13b4f 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateAddressCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateAddressCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateContactDetailsCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateContactDetailsCommand.java
index 9299eca..76b0a35 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateContactDetailsCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateContactDetailsCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateCustomerCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateCustomerCommand.java
index 6cf69af..dd7070a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateCustomerCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateCustomerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateIdentificationCardCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateIdentificationCardCommand.java
index e5bae13..0b7672d 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateIdentificationCardCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateIdentificationCardCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateTaskDefinitionCommand.java b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateTaskDefinitionCommand.java
index e99ac92..e76af75 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/UpdateTaskDefinitionCommand.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/UpdateTaskDefinitionCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/handler/CustomerAggregate.java b/service/src/main/java/io/mifos/customer/service/internal/command/handler/CustomerAggregate.java
index 3d74ee8..6b22f22 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/handler/CustomerAggregate.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/handler/CustomerAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/customer/service/internal/command/handler/MigrationAggregate.java
index 896c6ef..d7a5680 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/handler/MigrationAggregate.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/handler/MigrationAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/command/handler/TaskAggregate.java b/service/src/main/java/io/mifos/customer/service/internal/command/handler/TaskAggregate.java
index 5933498..00b86b3 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/command/handler/TaskAggregate.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/command/handler/TaskAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/config/CustomerServiceConfiguration.java b/service/src/main/java/io/mifos/customer/service/internal/config/CustomerServiceConfiguration.java
index 6679ee6..c504b5a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/config/CustomerServiceConfiguration.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/config/CustomerServiceConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/AddressMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/AddressMapper.java
index 30a629f..8e644d2 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/AddressMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/AddressMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/CommandMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/CommandMapper.java
index ceb5546..5162a5a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/CommandMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/CommandMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/ContactDetailMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/ContactDetailMapper.java
index 2440ccf..ba6c1be 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/ContactDetailMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/ContactDetailMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/CustomerMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/CustomerMapper.java
index d4218e7..c319c01 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/CustomerMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/CustomerMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ public final class CustomerMapper {
     customerEntity.setMiddleName(customer.getMiddleName());
     customerEntity.setSurname(customer.getSurname());
     customerEntity.setDateOfBirth(Date.valueOf(customer.getDateOfBirth().toLocalDate()));
+    customerEntity.setMember(customer.getMember());
     customerEntity.setAccountBeneficiary(customer.getAccountBeneficiary());
     customerEntity.setReferenceCustomer(customer.getReferenceCustomer());
     customerEntity.setAssignedOffice(customer.getAssignedOffice());
@@ -57,6 +58,7 @@ public final class CustomerMapper {
     customer.setMiddleName(customerEntity.getMiddleName());
     customer.setSurname(customerEntity.getSurname());
     customer.setDateOfBirth(DateOfBirth.fromLocalDate(customerEntity.getDateOfBirth().toLocalDate()));
+    customer.setMember(customerEntity.getMember());
     customer.setAccountBeneficiary(customerEntity.getAccountBeneficiary());
     customer.setReferenceCustomer(customerEntity.getReferenceCustomer());
     customer.setAssignedOffice(customerEntity.getAssignedOffice());
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/FieldValueMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/FieldValueMapper.java
index 6845c93..e6919f4 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/FieldValueMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/FieldValueMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/IdentificationCardMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/IdentificationCardMapper.java
index 25ff76b..ffaa7ec 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/IdentificationCardMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/IdentificationCardMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/PortraitMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/PortraitMapper.java
index f9b66aa..762d464 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/PortraitMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/PortraitMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskDefinitionMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskDefinitionMapper.java
index 33521ef..e56b37a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskDefinitionMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskDefinitionMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskInstanceMapper.java b/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskInstanceMapper.java
index b0b13fb..2ffbb1b 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskInstanceMapper.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/mapper/TaskInstanceMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/AddressEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/AddressEntity.java
index bf950ce..ed9baa4 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/AddressEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/AddressEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/AddressRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/AddressRepository.java
index 6ee6439..638d22f 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/AddressRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/AddressRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/CommandEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/CommandEntity.java
index 567c2e8..6661d1f 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/CommandEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/CommandEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/CommandRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/CommandRepository.java
index 40ec087..7d0be4f 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/CommandRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/CommandRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailEntity.java
index 82a87d6..1d03f79 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailRepository.java
index 888c4e1..5d843b7 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/ContactDetailRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerEntity.java
index d4bbf79..438eb4a 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,8 @@ public class CustomerEntity {
   private String surname;
   @Column(name = "date_of_birth")
   private Date dateOfBirth;
+  @Column(name = "is_member", nullable = false)
+  private Boolean member;
   @Column(name = "account_beneficiary")
   private String accountBeneficiary;
   @Column(name = "reference_customer")
@@ -135,6 +137,14 @@ public class CustomerEntity {
     this.dateOfBirth = dateOfBirth;
   }
 
+  public Boolean getMember() {
+    return this.member;
+  }
+
+  public void setMember(final Boolean member) {
+    this.member = member;
+  }
+
   public String getAccountBeneficiary() {
     return this.accountBeneficiary;
   }
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerRepository.java
index 8d83fd8..0a85fa9 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/CustomerRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,13 @@ public interface CustomerRepository extends JpaRepository<CustomerEntity, Long>
   @Query("SELECT CASE WHEN COUNT(c) > 0 THEN 'true' ELSE 'false' END FROM CustomerEntity c WHERE c.identifier = :identifier")
   Boolean existsByIdentifier(@Param("identifier") final String identifier);
 
-  Page<CustomerEntity> findByIdentifierContaining(final String identifier, final Pageable pageable);
+  Page<CustomerEntity> findByIdentifierContainingOrGivenNameContainingOrSurnameContaining(
+      final String identifier, final String givenName, final String surname, final Pageable pageable);
 
   CustomerEntity findByIdentifier(final String identifier);
 
   Page<CustomerEntity> findByCurrentStateNot(final String state, final Pageable pageable);
 
-  Page<CustomerEntity> findByCurrentStateNotAndIdentifierContaining(final String state, final String identifier, final Pageable pageable);
+  Page<CustomerEntity> findByCurrentStateNotAndIdentifierContainingOrGivenNameContainingOrSurnameContaining(
+      final String state, final String identifier, final String givenName, final String surname, final Pageable pageable);
 }
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardEntity.java
index 06573eb..99be134 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardRepository.java
index 596104a..294c249 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/IdentificationCardRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitEntity.java
index e77b86f..3d734b7 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitRepository.java
index 20cc1de..4deafc4 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/PortraitRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The Mifos Initiative.
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionEntity.java
index d8a52c6..a2a2060 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionRepository.java
index 8f00df0..f7be5c7 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskDefinitionRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceEntity.java b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceEntity.java
index 761c549..f795f98 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceEntity.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceRepository.java b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceRepository.java
index 0a7e2e8..d8e45d2 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceRepository.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/repository/TaskInstanceRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/internal/service/CustomerService.java b/service/src/main/java/io/mifos/customer/service/internal/service/CustomerService.java
index d71a584..728af4b 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/service/CustomerService.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/service/CustomerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,13 +126,16 @@ public class CustomerService {
     final Page<CustomerEntity> customerEntities;
     if (includeClosed) {
       if (term != null) {
-        customerEntities = this.customerRepository.findByIdentifierContaining(term, pageable);
+        customerEntities =
+            this.customerRepository.findByIdentifierContainingOrGivenNameContainingOrSurnameContaining(term, term, term, pageable);
       } else {
         customerEntities = this.customerRepository.findAll(pageable);
       }
     } else {
       if (term != null) {
-        customerEntities = this.customerRepository.findByCurrentStateNotAndIdentifierContaining(Customer.State.CLOSED.name(), term, pageable);
+        customerEntities =
+            this.customerRepository.findByCurrentStateNotAndIdentifierContainingOrGivenNameContainingOrSurnameContaining(
+                Customer.State.CLOSED.name(), term, term, term, pageable);
       } else {
         customerEntities = this.customerRepository.findByCurrentStateNot(Customer.State.CLOSED.name(), pageable);
       }
diff --git a/service/src/main/java/io/mifos/customer/service/internal/service/TaskService.java b/service/src/main/java/io/mifos/customer/service/internal/service/TaskService.java
index 5f4c9de..a6100f5 100644
--- a/service/src/main/java/io/mifos/customer/service/internal/service/TaskService.java
+++ b/service/src/main/java/io/mifos/customer/service/internal/service/TaskService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/rest/config/CustomerRestConfiguration.java b/service/src/main/java/io/mifos/customer/service/rest/config/CustomerRestConfiguration.java
index d0cf473..e426f15 100644
--- a/service/src/main/java/io/mifos/customer/service/rest/config/CustomerRestConfiguration.java
+++ b/service/src/main/java/io/mifos/customer/service/rest/config/CustomerRestConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/java/io/mifos/customer/service/rest/controller/CustomerRestController.java b/service/src/main/java/io/mifos/customer/service/rest/controller/CustomerRestController.java
index f47d532..31a3959 100644
--- a/service/src/main/java/io/mifos/customer/service/rest/controller/CustomerRestController.java
+++ b/service/src/main/java/io/mifos/customer/service/rest/controller/CustomerRestController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Mifos Initiative
+ * Copyright 2017 The Mifos Initiative.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 24a4e94..58cd71b 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 The Mifos Initiative
+# Copyright 2017 The Mifos Initiative.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/service/src/main/resources/bootstrap.yml b/service/src/main/resources/bootstrap.yml
index f62e9b8..e351bd7 100644
--- a/service/src/main/resources/bootstrap.yml
+++ b/service/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 The Mifos Initiative
+# Copyright 2017 The Mifos Initiative.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql b/service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql
index db08c49..bd6b413 100644
--- a/service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql
+++ b/service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql
@@ -1,5 +1,5 @@
 --
--- Copyright 2017 The Mifos Initiative
+-- Copyright 2017 The Mifos Initiative.
 --
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
diff --git a/service/src/main/resources/db/migrations/mariadb/V2__customer_portrait.sql b/service/src/main/resources/db/migrations/mariadb/V2__customer_portrait.sql
index d5eaf56..2c19547 100644
--- a/service/src/main/resources/db/migrations/mariadb/V2__customer_portrait.sql
+++ b/service/src/main/resources/db/migrations/mariadb/V2__customer_portrait.sql
@@ -1,5 +1,5 @@
 --
--- Copyright 2017 The Mifos Initiative
+-- Copyright 2017 The Mifos Initiative.
 --
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
@@ -13,15 +13,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-CREATE TABLE maat_portraits (
-  id BIGINT NOT NULL AUTO_INCREMENT,
-  customer_id BIGINT NOT NULL,
-  content_type VARCHAR(256) NOT NULL,
-  size BIGINT NOT NULL,
-  image BLOB NOT NULL,
-  CONSTRAINT maat_portraits_pk PRIMARY KEY (id),
-  CONSTRAINT maat_id_portraits_customers_fk FOREIGN KEY (customer_id) REFERENCES maat_customers (id) ON UPDATE RESTRICT
-);
 
 ALTER TABLE maat_identification_cards ADD created_by VARCHAR(32) NULL;
 ALTER TABLE maat_identification_cards ADD created_on TIMESTAMP(3) NULL;
diff --git a/service/src/main/resources/db/migrations/mariadb/V3__added_is_member_flag.sql b/service/src/main/resources/db/migrations/mariadb/V3__added_is_member_flag.sql
new file mode 100644
index 0000000..b0c3bb3
--- /dev/null
+++ b/service/src/main/resources/db/migrations/mariadb/V3__added_is_member_flag.sql
@@ -0,0 +1,21 @@
+--
+-- Copyright 2017 The Mifos Initiative.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--    http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+ALTER TABLE maat_customers ADD is_member BOOLEAN NULL;
+
+UPDATE maat_customers set is_member = TRUE;
+
+ALTER TABLE maat_customers MODIFY is_member BOOLEAN NOT NULL;
\ No newline at end of file
diff --git a/service/src/main/resources/diagrams/customer-state-machine.uxf b/service/src/main/resources/diagrams/customer-state-machine.uxf
index 3adc32a..5c8b309 100644
--- a/service/src/main/resources/diagrams/customer-state-machine.uxf
+++ b/service/src/main/resources/diagrams/customer-state-machine.uxf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-    Copyright 2017 The Mifos Initiative
+    Copyright 2017 The Mifos Initiative.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

-- 
To stop receiving notification emails like this one, please contact
myrle@apache.org.

Mime
View raw message