Clone
 

jakub hopen <jhopen@soldevelo.com> in openlmis-referencedata

OLMIS-1474 fixed debug message when supported program not found

OLMIS-1474 facilityController searches program by id or code

when creating facility, controller will search program by id if code is not provided,

endpoint will return 400 if id nor code are provided,

added message to return when both id and code are null.

OLMIS-1593 fixed failing integration tests

added equals and hashCode methods to FacilityTypeApprovedProduct,

removed unused imports,

added doc to ProgramOrderableDeserializer.

OLMIS-1593 changed right name to FACILITY_APPROVED_ORDERABLES_MANAGE

fixed some integration tests,

added deserializer for ProgramOrderable.java,

changed response code for facilityTypeApprovedProducts/{id} DELETE endpoint to 204 from 200.

    • -0
    • +12
    /src/main/resources/db/migration/20170216082252561__create_facility_approved_orderables_manage_right.sql
OLMIS-1593 Created FACILITY_APPROVED_PRODUCT_MANAGE right

added FACILITY_APPROVED_PRODUCT_MANAGE right,

added right check to facilityTypeApprovedProducts endpoints,

added integration tests,

modified raml.

    • -0
    • +16
    /src/main/resources/api-definition.yaml
    • -0
    • +12
    /src/main/resources/db/migration/20170215122344292__create_manage_facility_approved_product_right.sql
OLMIS-1662 Created SYSTEM_SETTINGS_MANAGE right

assigned it to System Administrator role.

OLMIS-1747 Changed right name FULFILLMENT_TRANSFER_ORDER to ORDERS_TRANSFER

OLMIS-1690 changed fields names

changed field name productCategoryDisplayName to orderableCategoryDisplayName,

changed productCategoryDisplayOrder to orderableCategoryDisplayOrder.

OLMIS-1690 changed field name and fixed message keys

changed field name from productCategory to orderableDisplayCategory in ProgramOrderableBuilderTest,

fixed 3 message keys in messages_en.properties.

OLMIS-1690 fixed failing integration tests

OLMIS-1690 fixed column names in demo-data

    • -20
    • +20
    /demo-data/referencedata.program_orderables.json
OLMIS-1960 changed remaining fields names

chamged field name from product to orderable,

updated raml and chemas,

updated integration test,

updated MassageKeys.

    • -11
    • +11
    /demo-data/referencedata.program_orderables.json
    • -3
    • +3
    /src/main/resources/api-definition.yaml
OLMIS-1960 changed remaining fields names

chamged field name from product to orderable,

updated raml and chemas,

updated integration test,

updated MassageKeys.

    • -11
    • +11
    /demo-data/referencedata.program_orderables.json
    • -3
    • +3
    /src/main/resources/api-definition.yaml
  1. … 3 more files in changeset.
OLMIS-1690 refactored class names

renamed GlobalProduct and all dependand classes to CommodityType,

renamed OrderableProduct and all dependant classes to Orderable,

renamed ProductCategory and all dependant classes to OrderableDisplayCategory,

renamed ProgramProduct and all dependant classes to ProgramOrderable,

changed endpoints accordingly yo renaming,

updated raml and demo-data,

changed fields names according to renaming.

    • -11
    • +11
    /demo-data/referencedata.facility_type_approved_products.json
    • -0
    • +56
    /demo-data/referencedata.orderable_display_categories.json
    • -152
    • +0
    /demo-data/referencedata.orderable_products.json
    • -0
    • +152
    /demo-data/referencedata.orderables.json
    • -56
    • +0
    /demo-data/referencedata.product_categories.json
    • -0
    • +133
    /demo-data/referencedata.program_orderables.json
    • -133
    • +0
    /demo-data/referencedata.program_products.json
  1. … 82 more files in changeset.
OLMIS-1690 refactored class names

renamed GlobalProduct and all dependand classes to CommodityType,

renamed OrderableProduct and all dependant classes to Orderable,

renamed ProductCategory and all dependant classes to OrderableDisplayCategory,

renamed ProgramProduct and all dependant classes to ProgramOrderable,

changed endpoints accordingly yo renaming,

updated raml and demo-data,

changed fields names according to renaming.

    • -31
    • +31
    /demo-data/referencedata.facility_type_approved_products.json
    • -0
    • +56
    /demo-data/referencedata.orderable_display_categories.json
    • -452
    • +0
    /demo-data/referencedata.orderable_products.json
    • -0
    • +452
    /demo-data/referencedata.orderables.json
    • -56
    • +0
    /demo-data/referencedata.product_categories.json
    • -0
    • +374
    /demo-data/referencedata.program_orderables.json
    • -374
    • +0
    /demo-data/referencedata.program_products.json
  1. … 82 more files in changeset.
OLMIS-1385 changed back facility for supervisoryNode FP Approval point

there was no need for change in first place

    • -1
    • +1
    /demo-data/referencedata.supervisory_nodes.json
OLMIS-1385 changed demo-data for supplying facility

changed demo-data so CMST Warehouse is selectable while converting to order

    • -1
    • +1
    /demo-data/referencedata.role_assignments.json
    • -1
    • +1
    /demo-data/referencedata.supervisory_nodes.json
    • -1
    • +1
    /demo-data/referencedata.supply_lines.json
OLMIS-1385 changed CONVERT_TO_ORDER right type to ORDER_FULFILLMENT

    • -1
    • +1
    /demo-data/referencedata.role_rights.json
OLMIS-1385 Added REQUISITION_CONVERT_TO_ORDER right to bootstrap.sql

    • -0
    • +4
    /demo-data/referencedata.role_rights.json
OLMIS-1385 Added REQUISITION_CONVERT_TO_ORDER right to bootstrap.sql

    • -0
    • +4
    /demo-data/referencedata.role_rights.json
OLMIS-1162 Split RequisitionGroupBaseDto, moved fields from SupervisoryNodeDto to SupervisoryNodeBaseDto

moved RequisitionGroupProgramSchedules and memberFacility from RequisitionGroupBaseDto

to RequisitionGroupDto based on the review comments,

moved name and description fields back to SupervisoryNodeBaseDto

OLMIS-1162 Fixed failing IT, split SupervisoryNodeBaseDto

fixed setRequisitionGroup method to set required values,

split required values to SupervisoryNodeBaseDto and not required to SupervisoryNodeDto

to avoid infinite loop in the object graph

OLMIS-1162 Fix ignored Integration Tests

newRequisitionGroup and newRequisitionGroupProgramSchedule factories returns null if any of required fields is null

OLMIS-1104 Calculation login to determine number of months in period is incorrect

Returns correct value when period is longer than year

OLMIS-1104

Will return 1 month when less than 14 days

OLMIS-1104 calculation logic to determine number of months in poeriod is incorrect

endpoint return json, changed methods names

    • -1
    • +13
    /src/main/resources/api-definition.yaml
OLMIS-1104 After review fix

fixed tests

OLMIS-1104 After review fix

fixed tests, rename method

OLMIS-1104 After review fix

    • -1
    • +1
    /src/main/resources/api-definition.yaml
OLMIS-1104 Calculation logic to determine number of months in period is incorrect

    • -32
    • +2
    /src/main/resources/api-definition.yaml