Merge pull request #7 from aasaru/improve_postman_scripts

Improve Postman provisioning scripts

README.md

@@ -39,20 +39,20 @@ First only start provisioner-ms by running following in project root:
 ```
 docker-compose up provisioner-ms 
 ```
-after it has started (and created table seshat to postgres) stop it.
+after it has started (and created table seshat to Postgre database) you can start rest of the services.
 This is just to make sure provisioner gets to create the database the other services require.
 
 ### Choose the services you want to run
 In the docker-compose.yml (that resides in project root) there are more than 10 services defined.
 Running all services together consumes a lot of memory. So you can start a subset of services.
 
-For example you could start the following micro services and an fims-web-app:
+For example you could start the following additional micro services and an fims-web-app:
 ```
-docker-compose up provisioner-ms identity-ms office-ms customer-ms accounting-ms fims-web-app
+docker-compose up rhythm-ms identity-ms customer-ms accounting-ms deposit-ms portfolio-ms fims-web-app
 ```
 
 If you want you can add other micro services (listed in docker-compose.yml) to the list.
-For example you could also start `deposit-account-management-ms`
+
 
 # Provision
 
@@ -83,12 +83,11 @@ The first request will retrieve a token. The response should look like this, wit
 ```
 
 If you don't get a token there is something wrong with your setup. The token is necessary for authentication in other requests thus be sure that this steps works.
+Important: Be sure to execute the requests in the right order! 
+The outcome is often stored in variables - check the Tests section of the requests.
 
-Important: Be sure to execute the requests in the right order! If you execute the requests that gives you the initial password (request "03.2 Create Identity Service for Tenant") twice you will not be able to retrieve the initial password again (due to the implementation of the identity service).
-If that happens the variable antonyUserPassword is empty (undefined) and you will not be able to sign in antony and change his password (03.3, 03.4).
-
-6. If you didn't start the micro service deposit-account-management-ms with docker-compose then
-you can assign deposits app to tenant (in step 07.1 and 07.2) but these services won't work.
+Use the Postman Runner to import accounts in step 08.1.
+Use the accounts_with_type.csv file found in postman_scripts and [follow the instructions](https://learning.getpostman.com/docs/postman/collection_runs/working_with_data_files/).
 
 
 #### Debugging help
@@ -132,7 +131,7 @@ If you want to use the same Postman scripts when running micro services locally
 127.0.0.1 customer-ms
 127.0.0.1 accounting-ms
 127.0.0.1 portfolio-ms
-127.0.0.1 deposit-account-management-ms
+127.0.0.1 deposit-ms
 127.0.0.1 teller-ms
 127.0.0.1 reporting-ms
 127.0.0.1 cheques-ms

docker-compose.yml

@@ -65,6 +65,8 @@ services:
   # TODO this image has error: https://issues.apache.org/jira/browse/FINCN-177
   rhythm-ms:
     image: apache/fineract-cn-rhythm:latest
+    ports:
+      - "2022:2022"
     environment:
       activemq.brokerUrl: ${ACTIVEMQ_BROKER_URL}
       cassandra.contactPoints: ${CASSANDRA_CONTACT_POINTS}
@@ -75,6 +77,7 @@ services:
       system.publicKey.exponent: ${PUBLIC_KEY_EXPONENT}
       system.publicKey.modulus: ${PUBLIC_KEY_MODULUS}
       system.publicKey.timestamp: ${PUBLIC_KEY_TIMESTAMP}
+      rhythm.beatCheckRate: 600000
     deploy:
       replicas: 1
       restart_policy:
@@ -155,8 +158,11 @@ services:
       cassandra.contactPoints: ${CASSANDRA_CONTACT_POINTS}
       eureka.client.serviceUrl.defaultZone: ${EUREKA_CLIENT_SERVICE_URL_DEFAULT_ZONE}
       eureka.instance.hostname: ${EUREKA_INSTANCE_HOSTNAME}
+      custom.postgresql.host: ${POSTGRESQL_HOST}
+      custom.postgresql.user: ${POSTGRESQL_USER}
       postgresql.host: ${POSTGRESQL_HOST}
       ribbon.listOfServers: ${RIBBON_EUREKA_SERVER}
+      spring.datasource.url: jdbc:postgresql://${POSTGRESQL_HOST}:${POSTGRESQL_PORT}/seshat
       system.publicKey.exponent: ${PUBLIC_KEY_EXPONENT}
       system.publicKey.modulus: ${PUBLIC_KEY_MODULUS}
       system.publicKey.timestamp: ${PUBLIC_KEY_TIMESTAMP}
@@ -165,7 +171,7 @@ services:
       fineract:
         ipv4_address: ${PORTFOLIO_IP}
 
-  deposit-account-management-ms:
+  deposit-ms:
     image: apache/fineract-cn-deposit-account-management:latest
     ports:
       - "2027:2027"
@@ -314,7 +320,6 @@ services:
       fineract:
         ipv4_address: ${FIMS_WEB_APP_IP}
 
-
 networks:
   external_tools_default:
     external: