CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

FINERACT-1760: Update office by external id

Browse Source 
- [x] Add new resource to update
- [x] Integration test
This commit is contained in:
Janos Haber
2023-08-30 09:50:56 +02:00
committed by Arnold Gálovics
parent adcdd1a224
commit 63d6cb38ab
13 changed files with 218 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/OfficeIntegrationTest.java
+22
View File
@@ -23,12 +23,16 @@ import io.restassured.builder.ResponseSpecBuilder;
import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;
import io.restassured.specification.ResponseSpecification;
import java.io.IOException;
import java.util.UUID;
import org.apache.fineract.client.models.PutOfficesOfficeIdResponse;
import org.apache.fineract.integrationtests.common.OfficeDomain;
import org.apache.fineract.integrationtests.common.OfficeHelper;
import org.apache.fineract.integrationtests.common.Utils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import retrofit2.Response;
public class OfficeIntegrationTest {
@@ -57,4 +61,22 @@ public class OfficeIntegrationTest {
Assertions.assertTrue(name.equals(newOffice.getName()));
Assertions.assertArrayEquals(dateArr, newOffice.getOpeningDate());
}
@Test
public void testOfficeModificationWithExternalId() throws IOException {
OfficeHelper oh = new OfficeHelper(requestSpec, responseSpec);
String externalId = UUID.randomUUID().toString();
int officeId = oh.createOfficeWithExternalId(externalId, "01 July 2007");
String date = "02 July 2007";
String name = Utils.uniqueRandomStringGenerator("New_Office_", 4);
String[] dateArr = { "2007", "7", "2" };
Response<PutOfficesOfficeIdResponse> updateResult = oh.updateOfficeUsingExternalId(externalId, name, date);
Assertions.assertTrue(updateResult.isSuccessful());
Assertions.assertEquals(officeId, updateResult.body().getOfficeId());
OfficeDomain newOffice = oh.retrieveOfficeByID(officeId);
Assertions.assertTrue(name.equals(newOffice.getName()));
Assertions.assertArrayEquals(dateArr, newOffice.getOpeningDate());
}
}
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
+26 -1
View File
@@ -30,13 +30,17 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import org.apache.fineract.client.models.GetOfficesResponse;
import org.apache.fineract.client.models.PutOfficesOfficeIdRequest;
import org.apache.fineract.client.models.PutOfficesOfficeIdResponse;
import org.apache.fineract.client.util.JSON;
import org.apache.fineract.integrationtests.client.IntegrationTest;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import retrofit2.Response;
public class OfficeHelper {
public class OfficeHelper extends IntegrationTest {
public static final long HEAD_OFFICE_ID = 1L; // The ID is hardcoded in the initial Liquibase migration script
@@ -69,6 +73,12 @@ public class OfficeHelper {
CommonConstants.RESPONSE_RESOURCE_ID);
}
public Integer createOfficeWithExternalId(String externalId, final String openingDate) {
String json = getAsJSON(externalId, openingDate);
return Utils.performServerPost(this.requestSpec, this.responseSpec, OFFICE_URL + "?" + Utils.TENANT_IDENTIFIER, json,
CommonConstants.RESPONSE_RESOURCE_ID);
}
public Integer updateOffice(int id, String name, String openingDate) {
final HashMap<String, String> map = new HashMap<String, String>();
map.put("name", name);
@@ -82,13 +92,28 @@ public class OfficeHelper {
new Gson().toJson(map), "resourceId");
}
public Response<PutOfficesOfficeIdResponse> updateOfficeUsingExternalId(String externalId, String name, String openingDate)
throws IOException {
return fineract().offices
.updateOfficeWithExternalId(externalId,
new PutOfficesOfficeIdRequest().name(name).openingDate(openingDate).dateFormat("dd MMMM yyyy").locale("en"))
.execute();
}
public static String getAsJSON(final String openingDate) {
return getAsJSON(null, openingDate);
}
public static String getAsJSON(String externalId, final String openingDate) {
final HashMap<String, String> map = new HashMap<>();
map.put("parentId", "1");
map.put("name", Utils.uniqueRandomStringGenerator("Office_", 4));
map.put("dateFormat", "dd MMMM yyyy");
map.put("locale", "en");
map.put("openingDate", openingDate);
if (externalId != null) {
map.put("externalId", externalId);
}
LOG.info("map : {}", map);
return new Gson().toJson(map);
}