Clone
 

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

OLMIS-1973 fixed 500 error code while converting to order

While converting RequisitionLineItems to OrderLineItems RequisitionLineItems marked as skipped are filtered out

OLMIS-1913 modified number to be constatnt

OLMIS-1913 added validation for totalStockoutDays

added validation for field totalStockOutDays,

added unit test,

added proper message.

OLMIS-1859 modified 3 integration tests

simplified extracting List from endpoints responses where it was possible,

in shouldFindRequisitionWithStatuses,

in shouldReturnOnlyRequisitionsForWhichUserHasRights,

in shouldReturnEmptyListIfUserHasNoRightsToSeeFoundedRequisitions.

OLMIS-1859 modified 3 integration tests

simplified extracting List from endpoints responses where it was possible,

in shouldFindRequisitionWithStatuses,

in shouldReturnOnlyRequisitionsForWhichUserHasRights,

in shouldReturnEmptyListIfUserHasNoRightsToSeeFoundedRequisitions.

OLMIS-1859 removed unused inport

OLMIS-1859 removed unused inport

OLMIS-1859 renamed two integration tests

modified shouldReturnOnlySubmittedRequisitionsForWhichUserHasRight integration test.

OLMIS-1859 renamed two integration tests

modified shouldReturnOnlySubmittedRequisitionsForWhichUserHasRight integration test.

OLMIS-1859 Added IntegrationTests

Added integration tests for endpoints returning lists of requisitions from searching,

moved denyUserAllRights() to BaseWebIntegrationTest

OLMIS-1859 Added IntegrationTests

Added integration tests for endpoints returning lists of requisitions from searching,

moved denyUserAllRights() to BaseWebIntegrationTest

OLMIS-1859 added rights checks to endpoints

added rights check to /requisitions/periodsForInitiate

added rights check to requisitions/id/statusMessages,

added rights check to requisitions/search,

added rights check to requisitions/submitted,

added rights check to requisitionTemplates/search,

modified checkPermission to return 404 if cannot fing requisition to check rights,

modified raml,

added integration tests.

    • -0
    • +12
    /src/main/resources/api-definition.yaml
Merge remote-tracking branch 'origin' into OLMIS-1859

Merge remote-tracking branch 'origin' into OLMIS-1859

OLMIS-1859 added rights check to endpoints

updated raml,

added right check to /requisitions/periodsForInitiate,

added right check to /requisitions/id/statusMessages,

added right check to /requisitions/search,

added right check to /requisitions/submitted,

added right check to /requisitionTemplates/search,

changed checkPermission method so it now throws exception if can not find requisition.

    • -0
    • +12
    /src/main/resources/api-definition.yaml
OLMIS-1859 added rights check to endpoints

updated raml,

added right check to /requisitions/periodsForInitiate,

added right check to /requisitions/id/statusMessages,

added right check to /requisitions/search,

added right check to /requisitions/submitted,

added right check to /requisitionTemplates/search,

changed checkPermission method so it now throws exception if can not find requisition.

OLMIS-1690 changed fields names

changed field name productCategoryDisplayName to orderableCategoryDisplayName,

changed productCategoryDisplayOrder to orderableCategoryDisplayOrder.

    • -1
    • +1
    /src/main/resources/api-definition.yaml
OLMIS-1690 changed group name

changed group name from ProductCategory to OrderableDisplayCategory in requisitionLines.jrxml

OLMIS-1690 changed field name

changed field name from product to programOrderable in ApprovedProductDto,

fixed integration tests.

OLMIS-1690 changed field name

changed field name from product to programOrderable in ApprovedProductDto,

fixed integration tests.

OLMIS-1690 fixed failing integration tests

OLMIS-1690 fixed failing integration tests

OLMIS-1690 refactored class names

renamed OrderableProductDto to OrderableDto,

renamed ProductDto to ProgramOrderableDto,

renamed ProductCategoryDto to OrderableDisplayCategoryDto,

renamed fields according to changes,

changed fields names in demo-data,

changed endpoints to match changes

    • -7
    • +7
    /demo-data/requisition.columns_maps.json
    • -30
    • +30
    /demo-data/requisition.requisition_line_items.json
  1. … 23 more files in changeset.
OLMIS-1690 refactored class names

renamed OrderableProductDto to OrderableDto,

renamed ProductDto to ProgramOrderableDto,

renamed ProductCategoryDto to OrderableDisplayCategoryDto,

renamed fields according to changes,

changed fields names in demo-data,

changed endpoints to match changes

    • -7
    • +7
    /demo-data/requisition.columns_maps.json
    • -30
    • +30
    /demo-data/requisition.requisition_line_items.json
  1. … 23 more files in changeset.
OLMIS-1397 added missing messages to errors

    • -0
    • +15
    /src/main/resources/api-definition.yaml
OLMIS-1582 moved method getStatusMessages to OrderDtoBuilder

OLMIS-1397 style fixes in error messages

OLMIS-1397 added translatable messages to errors missing them.

    • -0
    • +3
    /src/main/resources/api-definition.yaml
OLMIS-1582 added statusMessage to OrderDto and demo-data for StatusMessage

    • -0
    • +18
    /demo-data/requisition.status_messages.json
OLMIS-1397 changed message keys to camelCase and update raml

added static Strings to use for message keys,

removed unused class,

moved ExceptionHandlers to GlobalErrorHandling.

  1. … 11 more files in changeset.