[FINERACT-1760] Loan product external id

integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanProductExternalIdTest.java

@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.fineract.integrationtests;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import java.util.UUID;
+import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
+import org.apache.fineract.client.models.PutLoanProductsProductIdRequest;
+import org.apache.fineract.client.models.PutLoanProductsProductIdResponse;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.loans.LoanProductHelper;
+import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class LoanProductExternalIdTest {
+
+    private ResponseSpecification responseSpec;
+    private RequestSpecification requestSpec;
+    private LoanTransactionHelper loanTransactionHelper;
+    private LoanProductHelper loanProductHelper;
+
+    @BeforeEach
+    public void setup() {
+        Utils.initializeRESTAssured();
+        this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
+        this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+        this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
+        this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
+        this.loanProductHelper = new LoanProductHelper();
+    }
+
+    @Test
+    public void testLoanProductWithExternalId() {
+        String externalId = UUID.randomUUID().toString();
+        HashMap<String, Object> request = new LoanProductTestBuilder().withExternalId(externalId).build(null, null);
+        Integer loanProductId = loanTransactionHelper.getLoanProductId(Utils.convertToJson(request));
+        assertNotNull(loanProductId);
+
+        GetLoanProductsProductIdResponse getLoanProductsProductIdResponse = loanProductHelper.retrieveLoanProductByExternalId(externalId);
+        assertNotNull(getLoanProductsProductIdResponse.getId());
+        assertEquals(loanProductId, getLoanProductsProductIdResponse.getId().intValue());
+
+        final PutLoanProductsProductIdRequest requestModifyLoan = new PutLoanProductsProductIdRequest()
+                .shortName(Utils.uniqueRandomStringGenerator("", 3));
+        PutLoanProductsProductIdResponse putLoanProductsProductIdResponse = loanProductHelper.updateLoanProductByExternalId(externalId,
+                requestModifyLoan);
+        assertNotNull(putLoanProductsProductIdResponse.getResourceId());
+        assertEquals(loanProductId, putLoanProductsProductIdResponse.getResourceId().intValue());
+    }
+}

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanProductHelper.java

@@ -18,8 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common.loans;
 
+import org.apache.fineract.client.models.GetLoanProductsProductIdResponse;
 import org.apache.fineract.client.models.PostLoanProductsRequest;
 import org.apache.fineract.client.models.PostLoanProductsResponse;
+import org.apache.fineract.client.models.PutLoanProductsProductIdRequest;
+import org.apache.fineract.client.models.PutLoanProductsProductIdResponse;
 import org.apache.fineract.integrationtests.client.IntegrationTest;
 
 public class LoanProductHelper extends IntegrationTest {
@@ -29,4 +32,12 @@ public class LoanProductHelper extends IntegrationTest {
     public PostLoanProductsResponse createLoanProduct(PostLoanProductsRequest request) {
         return ok(fineract().loanProducts.createLoanProduct(request));
     }
+
+    public GetLoanProductsProductIdResponse retrieveLoanProductByExternalId(String externalId) {
+        return ok(fineract().loanProducts.retrieveLoanProductDetails1(externalId));
+    }
+
+    public PutLoanProductsProductIdResponse updateLoanProductByExternalId(String externalId, PutLoanProductsProductIdRequest request) {
+        return ok(fineract().loanProducts.updateLoanProduct1(externalId, request));
+    }
 }

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanProductTestBuilder.java

@@ -76,6 +76,7 @@ public class LoanProductTestBuilder {
 
     private String nameOfLoanProduct = Utils.uniqueRandomStringGenerator("LOAN_PRODUCT_", 6);
     private String shortName = Utils.uniqueRandomStringGenerator("", 4);
+    private String externalId = null;
     private String principal = "10000.00";
     private String numberOfRepayments = "5";
     private String repaymentFrequency = MONTHS;
@@ -160,6 +161,7 @@ public class LoanProductTestBuilder {
         }
         map.put("name", this.nameOfLoanProduct);
         map.put("shortName", this.shortName);
+        map.put("externalId", this.externalId);
         map.put("currencyCode", this.currencyCode);
         map.put("locale", LOCALE);
         map.put("dateFormat", "dd MMMM yyyy");
@@ -281,6 +283,11 @@ public class LoanProductTestBuilder {
         return map;
     }
 
+    public LoanProductTestBuilder withExternalId(String externalId) {
+        this.externalId = externalId;
+        return this;
+    }
+
     public LoanProductTestBuilder withInstallmentAmountInMultiplesOf(String installmentAmountInMultiplesOf) {
         this.installmentAmountInMultiplesOf = installmentAmountInMultiplesOf;
         return this;