Build #59

Plan branch:
Runs unit test and deploys artifacts to artifactory. More details of the release in https://wiki.openmrs.org/x/i4DTAw

Build: #59 was successful

Job: Build and test Module was successful

Stages & jobs

  1. Test module

  2. Release

    Requires a user to start manually

Code commits

Git

  • Wyclif Luyima

    Wyclif Luyima 57af749786f3ad0d86b76eae56d72dbbccc61cd3

    Fixed issue where module fails if there are no programs mapping datafilter_entity_basis_map table or if the logged in user has no roles
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplDataFilterListener.java (version 57af749786f3ad0d86b76eae56d72dbbccc61cd3)
    • api/src/test/java/org/openmrs/module/datafilter/impl/AccessUtilTest.java (version 57af749786f3ad0d86b76eae56d72dbbccc61cd3)
    • api/src/test/resources/org/openmrs/module/datafilter/moduleTestData.xml (version 57af749786f3ad0d86b76eae56d72dbbccc61cd3)
  • Wyclif Luyima

    Wyclif Luyima a3a6aad8f4b5f653895300ec0af18603008063a0

    Added tests to ensure users with no program privileges only view themselves and never those that have them
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/test/java/org/openmrs/module/datafilter/impl/UserProgramBasedFilterTest.java (version a3a6aad8f4b5f653895300ec0af18603008063a0)
  • Wyclif Luyima

    Wyclif Luyima 96449e3126931b861d87836e006d3ee8adc2d251

    Tweaked the program based filter condition
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version 96449e3126931b861d87836e006d3ee8adc2d251)
  • Wyclif Luyima

    Wyclif Luyima 8073fbe755e8aa9aacefff5fd5b427f1d1ed3262

    Changed provider program based filtering so that programs are associated to roles and not privileges
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplDataFilterListener.java (version 8073fbe755e8aa9aacefff5fd5b427f1d1ed3262)
    • api/src/main/resources/filters/hibernate/program.json (version 8073fbe755e8aa9aacefff5fd5b427f1d1ed3262)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderProgramBasedFilterTest.java (version 8073fbe755e8aa9aacefff5fd5b427f1d1ed3262)
    • api/src/test/resources/org/openmrs/module/datafilter/users.xml (version 8073fbe755e8aa9aacefff5fd5b427f1d1ed3262)
  • Wyclif Luyima

    Wyclif Luyima 3c12425cb28c035d941eeed05da5a9d6ad6c5403

    Changed user program based filtering so that programs are associated to roles and not privileges
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/java/org/openmrs/module/datafilter/impl/AccessUtil.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplConstants.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplDataFilterListener.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/main/java/org/openmrs/module/datafilter/impl/api/impl/DataFilterServiceImpl.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/main/resources/filters/hibernate/program.json (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/test/java/org/openmrs/module/datafilter/impl/AccessUtilTest.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/test/java/org/openmrs/module/datafilter/impl/BaseProgramBasedFilterTest.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderProgramBasedFilterTest.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/test/java/org/openmrs/module/datafilter/impl/UserProgramBasedFilterTest.java (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
    • api/src/test/resources/org/openmrs/module/datafilter/users.xml (version 3c12425cb28c035d941eeed05da5a9d6ad6c5403)
  • Wyclif Luyima

    Wyclif Luyima e15952a3d450b93f5bc889a288c16dd6e5871102

    Implemented provider program based filtering
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplConstants.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplDataFilterListener.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/main/resources/filters/hibernate/program.json (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/java/org/openmrs/module/datafilter/impl/BaseProgramBasedFilterTest.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/java/org/openmrs/module/datafilter/impl/DataFilterTestUtils.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderLocationBasedFilterTest.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderProgramBasedFilterTest.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/java/org/openmrs/module/datafilter/impl/UserProgramBasedFilterTest.java (version e15952a3d450b93f5bc889a288c16dd6e5871102)
    • api/src/test/resources/org/openmrs/module/datafilter/providers.xml (version e15952a3d450b93f5bc889a288c16dd6e5871102)
  • Wyclif Luyima

    Wyclif Luyima 6ebc9686c6950746cb4031ff6ec743b9b70f1cf1

    Users should see providers that work in the same programs
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/java/org/openmrs/module/datafilter/Util.java (version 6ebc9686c6950746cb4031ff6ec743b9b70f1cf1)
    • api/src/main/java/org/openmrs/module/datafilter/impl/AccessUtil.java (version 6ebc9686c6950746cb4031ff6ec743b9b70f1cf1)
    • api/src/main/java/org/openmrs/module/datafilter/impl/ImplDataFilterListener.java (version 6ebc9686c6950746cb4031ff6ec743b9b70f1cf1)
    • api/src/main/resources/filters/hibernate/program.json (version 6ebc9686c6950746cb4031ff6ec743b9b70f1cf1)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderLocationBasedFilterTest.java (version 6ebc9686c6950746cb4031ff6ec743b9b70f1cf1)
  • Wyclif Luyima

    Wyclif Luyima 0462cf6119227750d39c15be7967f83f3e2f57e4

    Changed test providers to be linked to person records
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderLocationBasedFilterTest.java (version 0462cf6119227750d39c15be7967f83f3e2f57e4)
    • api/src/test/resources/org/openmrs/module/datafilter/providers.xml (version 0462cf6119227750d39c15be7967f83f3e2f57e4)
  • Wyclif Luyima

    Wyclif Luyima 3726e97397bc8cc15f2c14e50db8f3949d18e035

    Changed provider filtering to assume all providers have user accounts
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version 3726e97397bc8cc15f2c14e50db8f3949d18e035)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderLocationBasedFilterTest.java (version 3726e97397bc8cc15f2c14e50db8f3949d18e035)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderProgramBasedFilterTest.java (version 3726e97397bc8cc15f2c14e50db8f3949d18e035)
    • api/src/test/resources/org/openmrs/module/datafilter/providers.xml (version 3726e97397bc8cc15f2c14e50db8f3949d18e035)
  • Wyclif Luyima

    Wyclif Luyima 78f6e8020fb268ed62c7e7027cf208bca8aa4af1

    Added comments and formatted the program based user query
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version 78f6e8020fb268ed62c7e7027cf208bca8aa4af1)
  • Wyclif Luyima

    Wyclif Luyima 1f5585e2aaf59f1ea7608e09b737a7447d6d4067

    Removed GPs for disabling filters
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • omod/src/main/resources/config.xml (version 1f5585e2aaf59f1ea7608e09b737a7447d6d4067)
  • Wyclif Luyima

    Wyclif Luyima 9f8bc924931f7da66b73d76a8c335207e966e2ce

    Enabled user and provider filtering
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/location.json (version 9f8bc924931f7da66b73d76a8c335207e966e2ce)
    • api/src/main/resources/filters/hibernate/program.json (version 9f8bc924931f7da66b73d76a8c335207e966e2ce)
    • api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 9f8bc924931f7da66b73d76a8c335207e966e2ce)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderLocationBasedFilterTest.java (version 9f8bc924931f7da66b73d76a8c335207e966e2ce)
    • api/src/test/java/org/openmrs/module/datafilter/impl/UserLocationBasedFilterTest.java (version 9f8bc924931f7da66b73d76a8c335207e966e2ce)
    • api/src/test/java/org/openmrs/module/datafilter/impl/UserProgramBasedFilterTest.java (version 9f8bc924931f7da66b73d76a8c335207e966e2ce)
  • Wyclif Luyima

    Wyclif Luyima b44c0e862ad512015544157a2deb926d8296939a

    One should be able to see providers linked to no person record but work in the same program in another role
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version b44c0e862ad512015544157a2deb926d8296939a)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderLocationBasedFilterTest.java (version b44c0e862ad512015544157a2deb926d8296939a)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderProgramBasedFilterTest.java (version b44c0e862ad512015544157a2deb926d8296939a)
    • api/src/test/resources/org/openmrs/module/datafilter/providers.xml (version b44c0e862ad512015544157a2deb926d8296939a)
  • Wyclif Luyima

    Wyclif Luyima 8d9dac2859c0e4bd615cc0825ee1e73f023a6e2a

    Added comments and formatted the program based user query
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version 8d9dac2859c0e4bd615cc0825ee1e73f023a6e2a)
  • Wyclif Luyima

    Wyclif Luyima 3f18b52dcbef9affc3e30f1ecd6ec0ce76f39589

    Added test data for a user with a common program privilege and an extra one that the authenticated user doesn't have
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/test/java/org/openmrs/module/datafilter/impl/UserLocationBasedFilterTest.java (version 3f18b52dcbef9affc3e30f1ecd6ec0ce76f39589)
    • api/src/test/java/org/openmrs/module/datafilter/impl/UserProgramBasedFilterTest.java (version 3f18b52dcbef9affc3e30f1ecd6ec0ce76f39589)
    • api/src/test/resources/org/openmrs/module/datafilter/persons.xml (version 3f18b52dcbef9affc3e30f1ecd6ec0ce76f39589)
    • api/src/test/resources/org/openmrs/module/datafilter/users.xml (version 3f18b52dcbef9affc3e30f1ecd6ec0ce76f39589)
  • Wyclif Luyima

    Wyclif Luyima 7e5d0b20fc0b4b12276129fabe5b3d7301c8d553

    Formatted the condition query for program based provider filtering
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version 7e5d0b20fc0b4b12276129fabe5b3d7301c8d553)
  • Wyclif Luyima

    Wyclif Luyima d9cf28240a8170d119e41a9b3e2322fa2bc0fcd4

    Added support to do program filtering for providers not linked to person records
    Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>

    • api/src/main/resources/filters/hibernate/program.json (version d9cf28240a8170d119e41a9b3e2322fa2bc0fcd4)
    • api/src/test/java/org/openmrs/module/datafilter/impl/ProviderProgramBasedFilterTest.java (version d9cf28240a8170d119e41a9b3e2322fa2bc0fcd4)
    • api/src/test/resources/org/openmrs/module/datafilter/providers.xml (version d9cf28240a8170d119e41a9b3e2322fa2bc0fcd4)