his_emr_api_lab 0.0.5.pre.p1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa64a790eb8ca474b8505b496671e5462c055ab42cc646a2e5788579f5fe0d79
-  data.tar.gz: c1b23bc070e065aafb50b4b36e68c125c96c02499648c55135f811ad378fc829
+  metadata.gz: d79ce0bd4282f205bd510bc5fbbaa09cbf50abf9038e98a906cfa0ec241da535
+  data.tar.gz: afb6a736ceefeab7ac2b58227e4a3e3214cd562368f8750b0584eae6cdbb163b
 SHA512:
-  metadata.gz: 9b988f69ecc23eddd265e0f67a40f2014ed630aeca9346eef44ebbb7a7faea1e27c58dae0cfd2c45bd38a8e53dee8fcf30315c3dfd98bf9f5c75787357071db6
-  data.tar.gz: cef9504aaebd53c1f96e9a67d518edafa6226bc07c487b1653ffc97ccc95bb9621080257f8d81f00e8375860703ce482e713466d2aa941a40b752a4e3399bb54
+  metadata.gz: affeaac951ade6771fe0b0b14a9ab3ef8795a40ce1a994c7f90a82c0d522bb8b8f44e8363c4532a8bc2a600dc2446aee3f3f677ae211cdf6feadc27f9fd1bf22
+  data.tar.gz: dd4ada5f115a2953c45bf20476ac32c5072a25b15f4dbaf1b451e55bd20c3e12dcd9663b8d474f0fefe8599e3dffdd8984b03b728d1fdcbdb3735090ca0175e3

data/app/services/lab/orders_search_service.rb

@@ -5,44 +5,54 @@ module Lab
   module OrdersSearchService
     class << self
       def find_orders(filters)
-        date = filters.delete(:date)
-        status = filters.delete(:status)
+        extra_filters = pop_filters(filters, :date, :end_date, :status)
 
         orders = Lab::LabOrder.prefetch_relationships
                               .where(filters)
                               .order(start_date: :desc)
 
-        orders = filter_orders_by_date(orders, date) if date
-        orders = filter_orders_by_status(orders, status) if status
+        orders = filter_orders_by_status(orders, pop_filters(extra_filters, :status))
+        orders = filter_orders_by_date(orders, extra_filters)
 
         orders.map { |order| Lab::LabOrderSerializer.serialize_order(order) }
       end
 
-      def filter_orders_by_date(orders, date)
-        orders.where('start_date < DATE(?)', date.to_date + 1.day)
-      end
+      def filter_orders_by_date(orders, date: nil, end_date: nil)
+        date = date&.to_date
+        end_date = end_date&.to_date
 
-      def filter_orders_by_status(orders, status)
-        case status.downcase
-        when 'ordered' then orders.where(concept_id: unknown_concept_id)
-        when 'drawn' then orders.where.not(concept_id: unknown_concept_id)
+        if date && end_date
+          return orders.where('start_date BETWEEN ? AND ?', date, end_date + 1.day)
         end
-      end
 
-      def unknown_concept_id
-        ConceptName.find_by_name!('Unknown').concept_id
+        if date
+          return orders.where('start_date BETWEEN ? AND ?', date, date + 1.day)
+        end
+
+        return orders.where('start_date < ?', end_date + 1.day) if end_date
+
+        orders
       end
 
-      def filter_orders_by_status(orders, status)
-        case status.downcase
+      def filter_orders_by_status(orders, status: nil)
+        case status&.downcase
         when 'ordered' then orders.where(concept_id: unknown_concept_id)
         when 'drawn' then orders.where.not(concept_id: unknown_concept_id)
+        else orders
         end
       end
 
       def unknown_concept_id
         ConceptName.find_by_name!('Unknown').concept_id
       end
+
+      def pop_filters(params, *filters)
+        filters.each_with_object({}) do |filter, popped_params|
+          next unless params.key?(filter)
+
+          popped_params[filter.to_sym] = params.delete(filter)
+        end
+      end
     end
   end
 end

data/lib/generators/lab/install/templates/swagger.yaml

@@ -175,6 +175,12 @@ paths:
         description: 'Filter by sample status: ordered, drawn'
         schema:
           type: string
+      - name: end_date
+        in: query
+        required: false
+        description: Select all results before this date
+        schema:
+          type: date
       responses:
         '200':
           description: Success
@@ -396,6 +402,32 @@ paths:
       responses:
         '204':
           description: No Content
+  "/api/v1/lab/reasons_for_test":
+    get:
+      summary: Reasons for test
+      description: Retrieve default reasons for test concept set
+      tags:
+      - Concepts
+      security:
+      - api_key: []
+      responses:
+        '200':
+          description: Success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    concept_id:
+                      type: integer
+                    name:
+                      type: string
+                      example: Routine
+                  required:
+                  - concept_id
+                  - name
   "/api/v1/lab/tests/{test_id}/results":
     post:
       summary: Add results to order

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '0.0.5-p1'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre.p1
+  version: 0.0.6
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -304,9 +304,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key: