Skip to content

Feature/as 3281 unit test endpoint for crop unit conversion #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hwang-vividsolutions merged 7 commits into from
Oct 10, 2025
Merged

Feature/as 3281 unit test endpoint for crop unit conversion #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ab06eb
AS-3281: Drop the check on insert when the insert is optional.
hwang-vividsolutions Oct 9, 2025
70c2cf7
AS-3281: Implement CropUnitConversionEndpointsTest.
hwang-vividsolutions Oct 9, 2025
91e84f6
AS-3281: Implement CropUnitConversionEndpointsTest.
hwang-vividsolutions Oct 10, 2025
105d219
AS-3281: Implement CropUnitConversionEndpointsTest.
hwang-vividsolutions Oct 10, 2025
35df259
AS-3281: Implement CropUnitConversionEndpointsTest.
hwang-vividsolutions Oct 10, 2025
7934e5d
AS-3281: Implement CropUnitConversionEndpointsTest.
hwang-vividsolutions Oct 10, 2025
4bfcb98
AS-3281: Implement CropUnitConversionEndpointsTest.
hwang-vividsolutions Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
231 changes: 231 additions & 0 deletions .../src/test/java/ca/bc/gov/farms/api/rest/v1/endpoints/CropUnitConversionEndpointsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
package ca.bc.gov.farms.api.rest.v1.endpoints;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response;

import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;

import ca.bc.gov.brmb.common.api.rest.code.endpoints.spring.CodeEndpointsSpringConfig;
import ca.bc.gov.farms.api.rest.v1.endpoints.impl.CropUnitConversionEndpointsImpl;
import ca.bc.gov.farms.api.rest.v1.resource.ConversionUnitRsrc;
import ca.bc.gov.farms.api.rest.v1.resource.CropUnitConversionRsrc;
import ca.bc.gov.farms.api.rest.v1.spring.EndpointsSpringConfigTest;
import ca.bc.gov.farms.api.rest.v1.spring.ResourceFactorySpringConfig;
import ca.bc.gov.farms.model.v1.ConversionUnit;
import ca.bc.gov.farms.service.api.v1.spring.ServiceApiSpringConfig;

import org.glassfish.jersey.internal.inject.AbstractBinder;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.json.JSONArray;
import org.json.JSONObject;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class CropUnitConversionEndpointsTest extends JerseyTest {

@Override
protected Application configure() {
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
when(mockRequest.getHeader("X-Forwarded-Proto")).thenReturn("http");
when(mockRequest.getHeader("X-Forwarded-Host")).thenReturn("localhost");
when(mockRequest.getHeader("If-Match")).thenReturn("*");

// Load Spring context manually
ApplicationContext applicationContext = new AnnotationConfigApplicationContext(EndpointsSpringConfigTest.class,
ServiceApiSpringConfig.class, ResourceFactorySpringConfig.class, CodeEndpointsSpringConfig.class);

// Create Jersey ResourceConfig and integrate Spring context
ResourceConfig config = new ResourceConfig();
config.register(ObjectMapperContextResolver.class);
config.register(CropUnitConversionEndpointsImpl.class);
config.property("contextConfig", applicationContext);

// Bind the mockRequest so it can be injected
config.register(new AbstractBinder() {
@Override
protected void configure() {
bind(mockRequest).to(HttpServletRequest.class);
}
});

return config;
}

@Test
@Order(1)
public void testCreateCropUnitConversion() throws Exception {
CropUnitConversionRsrc cropUnitConversion = new CropUnitConversionRsrc();
cropUnitConversion.setInventoryItemCode("5560");
cropUnitConversion.setCropUnitCode("2");
List<ConversionUnit> conversionUnits = new ArrayList<>();
ConversionUnit conversionUnit = new ConversionUnitRsrc();
conversionUnit.setConversionFactor(new BigDecimal("2204.622600"));
conversionUnit.setTargetCropUnitCode("1");
conversionUnits.add(conversionUnit);
cropUnitConversion.setConversionUnits(conversionUnits);
cropUnitConversion.setUserEmail("jsmith@gmail.com");

Response response = target("/cropUnitConversions").request().post(Entity.json(cropUnitConversion));
assertEquals(201, response.getStatus());

String jsonString = response.readEntity(String.class);
JSONObject jsonObject = new JSONObject(jsonString);
assertEquals("CropUnitConversionRsrc", jsonObject.getString("@type"));
assertEquals(1681, jsonObject.getInt("cropUnitDefaultId"));
assertEquals("5560", jsonObject.getString("inventoryItemCode"));
assertEquals("Alfalfa Dehy", jsonObject.getString("inventoryItemDesc"));
assertEquals("2", jsonObject.getString("cropUnitCode"));
assertEquals("Tonnes", jsonObject.getString("cropUnitDesc"));

JSONArray conversionUnitList = jsonObject.getJSONArray("conversionUnits");
JSONObject conversionUnitJson = conversionUnitList.getJSONObject(0);

assertEquals(1981, conversionUnitJson.getInt("cropUnitConversionFactorId"));
assertEquals(2204.622600, conversionUnitJson.getDouble("conversionFactor"));
assertEquals("1", conversionUnitJson.getString("targetCropUnitCode"));
assertEquals("Pounds", conversionUnitJson.getString("targetCropUnitDesc"));
}

@Test
@Order(2)
public void testGetAllCropUnitConversions() throws Exception {
Response response = target("/cropUnitConversions").request().get();
assertEquals(200, response.getStatus());

String jsonString = response.readEntity(String.class);
JSONObject jsonObject = new JSONObject(jsonString);

assertEquals("CropUnitConversionListRsrc", jsonObject.getString("@type"));

JSONArray cropUnitConversionList = jsonObject.getJSONArray("cropUnitConversionList");
JSONObject cropUnitConversion = cropUnitConversionList.getJSONObject(0);
assertEquals("CropUnitConversionRsrc", cropUnitConversion.getString("@type"));
assertEquals(1681, cropUnitConversion.getInt("cropUnitDefaultId"));
assertEquals("5560", cropUnitConversion.getString("inventoryItemCode"));
assertEquals("Alfalfa Dehy", cropUnitConversion.getString("inventoryItemDesc"));
assertEquals("2", cropUnitConversion.getString("cropUnitCode"));
assertEquals("Tonnes", cropUnitConversion.getString("cropUnitDesc"));

JSONArray conversionUnitList = cropUnitConversion.getJSONArray("conversionUnits");
JSONObject conversionUnitJson = conversionUnitList.getJSONObject(0);

assertEquals(1981, conversionUnitJson.getInt("cropUnitConversionFactorId"));
assertEquals(2204.622600, conversionUnitJson.getDouble("conversionFactor"));
assertEquals("1", conversionUnitJson.getString("targetCropUnitCode"));
assertEquals("Pounds", conversionUnitJson.getString("targetCropUnitDesc"));
}

@Test
@Order(3)
public void testGetAllCropUnitConversions1() throws Exception {
Response response = target("/cropUnitConversions").queryParam("inventoryItemCode", "5560").request().get();
assertEquals(200, response.getStatus());

String jsonString = response.readEntity(String.class);
JSONObject jsonObject = new JSONObject(jsonString);

assertEquals("CropUnitConversionListRsrc", jsonObject.getString("@type"));

JSONArray cropUnitConversionList = jsonObject.getJSONArray("cropUnitConversionList");
JSONObject cropUnitConversion = cropUnitConversionList.getJSONObject(0);
assertEquals("CropUnitConversionRsrc", cropUnitConversion.getString("@type"));
assertEquals(1681, cropUnitConversion.getInt("cropUnitDefaultId"));
assertEquals("5560", cropUnitConversion.getString("inventoryItemCode"));
assertEquals("Alfalfa Dehy", cropUnitConversion.getString("inventoryItemDesc"));
assertEquals("2", cropUnitConversion.getString("cropUnitCode"));
assertEquals("Tonnes", cropUnitConversion.getString("cropUnitDesc"));

JSONArray conversionUnitList = cropUnitConversion.getJSONArray("conversionUnits");
JSONObject conversionUnitJson = conversionUnitList.getJSONObject(0);

assertEquals(1981, conversionUnitJson.getInt("cropUnitConversionFactorId"));
assertEquals(2204.622600, conversionUnitJson.getDouble("conversionFactor"));
assertEquals("1", conversionUnitJson.getString("targetCropUnitCode"));
assertEquals("Pounds", conversionUnitJson.getString("targetCropUnitDesc"));
}

@Test
@Order(4)
public void testGetCropUnitConversion() throws Exception {
Response response = target("/cropUnitConversions/1681").request().get();
assertEquals(200, response.getStatus());

String jsonString = response.readEntity(String.class);
JSONObject jsonObject = new JSONObject(jsonString);
assertEquals("CropUnitConversionRsrc", jsonObject.getString("@type"));
assertEquals(1681, jsonObject.getInt("cropUnitDefaultId"));
assertEquals("5560", jsonObject.getString("inventoryItemCode"));
assertEquals("Alfalfa Dehy", jsonObject.getString("inventoryItemDesc"));
assertEquals("2", jsonObject.getString("cropUnitCode"));
assertEquals("Tonnes", jsonObject.getString("cropUnitDesc"));

JSONArray conversionUnitList = jsonObject.getJSONArray("conversionUnits");
JSONObject conversionUnitJson = conversionUnitList.getJSONObject(0);

assertEquals(1981, conversionUnitJson.getInt("cropUnitConversionFactorId"));
assertEquals(2204.622600, conversionUnitJson.getDouble("conversionFactor"));
assertEquals("1", conversionUnitJson.getString("targetCropUnitCode"));
assertEquals("Pounds", conversionUnitJson.getString("targetCropUnitDesc"));
}

@Test
@Order(5)
public void testUpdateCropUnitConversion() throws Exception {
CropUnitConversionRsrc cropUnitConversion = new CropUnitConversionRsrc();
cropUnitConversion.setCropUnitDefaultId(1681L);
cropUnitConversion.setInventoryItemCode("5560");
cropUnitConversion.setCropUnitCode("1");
List<ConversionUnit> conversionUnits = new ArrayList<>();
ConversionUnit conversionUnit = new ConversionUnitRsrc();
conversionUnit.setCropUnitConversionFactorId(1981L);
conversionUnit.setConversionFactor(new BigDecimal("3204.622600"));
conversionUnit.setTargetCropUnitCode("2");
conversionUnits.add(conversionUnit);
cropUnitConversion.setConversionUnits(conversionUnits);
cropUnitConversion.setUserEmail("jsmith@gmail.com");

Response response = target("/cropUnitConversions/1681").request().put(Entity.json(cropUnitConversion));
assertEquals(200, response.getStatus());

String jsonString = response.readEntity(String.class);
JSONObject jsonObject = new JSONObject(jsonString);
assertEquals("CropUnitConversionRsrc", jsonObject.getString("@type"));
assertEquals(1681, jsonObject.getInt("cropUnitDefaultId"));
assertEquals("5560", jsonObject.getString("inventoryItemCode"));
assertEquals("Alfalfa Dehy", jsonObject.getString("inventoryItemDesc"));
assertEquals("1", jsonObject.getString("cropUnitCode"));
assertEquals("Pounds", jsonObject.getString("cropUnitDesc"));

JSONArray conversionUnitList = jsonObject.getJSONArray("conversionUnits");
JSONObject conversionUnitJson = conversionUnitList.getJSONObject(0);

assertEquals(1981, conversionUnitJson.getInt("cropUnitConversionFactorId"));
assertEquals(3204.622600, conversionUnitJson.getDouble("conversionFactor"));
assertEquals("2", conversionUnitJson.getString("targetCropUnitCode"));
assertEquals("Tonnes", conversionUnitJson.getString("targetCropUnitDesc"));
}

@Test
@Order(6)
public void testDeleteCropUnitConversion() throws Exception {
Response response = target("/cropUnitConversions/1681").request().delete();
assertEquals(204, response.getStatus());
}
}
14 changes: 5 additions & 9 deletions ...e/src/main/java/ca/bc/gov/farms/persistence/v1/dao/mybatis/CropUnitConversionDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,29 +87,25 @@ public List<CropUnitConversionDto> fetchByInventoryItemCode(String inventoryItem
public void insert(CropUnitConversionDto dto, String userId) throws DaoException {
logger.debug("<insert");

Long cropUnitDefaultId = null;

try {
Map<String, Object> parameters = new HashMap<>();

parameters.put("dto", dto);
parameters.put("userId", userId);
int count = this.mapper.insertCropUnitDefault(parameters);
if (count == 0) {
throw new DaoException("Record not inserted: " + count);
}

cropUnitDefaultId = (Long) parameters.get("cropUnitDefaultId");
dto.setCropUnitDefaultId(cropUnitDefaultId);
this.mapper.insertCropUnitDefault(parameters);

parameters.put("inventoryItemCode", dto.getInventoryItemCode());
for (ConversionUnitDto conversionUnit : dto.getConversionUnits()) {
parameters.put("dto", conversionUnit);
count = this.mapper.insertCropUnitConversionFactor(parameters);
int count = this.mapper.insertCropUnitConversionFactor(parameters);
if (count == 0) {
throw new DaoException("Record not inserted: " + count);
}
}

List<CropUnitConversionDto> dtos = this.mapper.fetchBy(parameters);
dto.setCropUnitDefaultId(dtos.iterator().next().getCropUnitDefaultId());
} catch (RuntimeException e) {
handleException(e);
}
Expand Down
9 changes: 2 additions & 7 deletions ...e/src/main/java/ca/bc/gov/farms/persistence/v1/dao/mybatis/FruitVegTypeDetailDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,8 @@ public void insert(FruitVegTypeDetailDto dto, String userId) throws DaoException

parameters.put("dto", dto);
parameters.put("userId", userId);
int count = this.mapper.insertFruitVegTypeCode(parameters);

if (count == 0) {
throw new DaoException("Record not inserted: " + count);
}

count = this.mapper.insertFruitVegTypeDetail(parameters);
this.mapper.insertFruitVegTypeCode(parameters);
int count = this.mapper.insertFruitVegTypeDetail(parameters);

if (count == 0) {
throw new DaoException("Record not inserted: " + count);
Expand Down
4 changes: 2 additions & 2 deletions .../resources/ca/bc/gov/farms/persistence/v1/dao/mybatis/mapper/CropUnitConversionMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
from farms.farm_crop_unit_defaults cud
join farms.farm_inventory_item_codes iic on cud.inventory_item_code = iic.inventory_item_code
join farms.farm_crop_unit_codes cuc on cud.crop_unit_code = cuc.crop_unit_code
join farms.farm_crop_unit_conversn_fctrs cucf on cud.inventory_item_code = cucf.inventory_item_code
join farms.farm_crop_unit_codes tcuc on tcuc.crop_unit_code = cucf.target_crop_unit_code
left join farms.farm_crop_unit_conversn_fctrs cucf on cud.inventory_item_code = cucf.inventory_item_code
left join farms.farm_crop_unit_codes tcuc on tcuc.crop_unit_code = cucf.target_crop_unit_code
</sql>

<select id="fetch" resultMap="CropUnitConversionDtoMap">
Expand Down
2 changes: 1 addition & 1 deletion farms-api/farms-persistence/src/test/resources/farms/tables/data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ insert into farms.farm_crop_unit_defaults (
who_updated,
when_updated
) values (
nextval('farms.farm_fmv_seq'),
nextval('farms.farm_cud_seq'),
'5560',
'2',
1,
Expand Down