Merge pull request #527 from IBM/lee-master

Set timezone to UTC for all storedprocedure timestamps

Author: prb112

docs/src/pages/Conformance.md

@@ -85,8 +85,8 @@ FHIR search modifiers are described at https://www.hl7.org/fhir/R4/search.html#m
 |Reference                 |`:[type]`,`:missing`            |exact match search|
 |URI                       |`:below`,`:above`,`:missing`    |exact match search|
 |Token                     |`:missing`                      |exact match search|
-|Number                    |`:missing`                      |exact match search|
-|Date                      |`:missing`                      |exact match search|
+|Number                    |`:missing`                      |implicit range search (see http://hl7.org/fhir/R4/search.html#number)|
+|Date                      |`:missing`                      |implicit range search (see https://www.hl7.org/fhir/search.html#date)|
 |Quantity                  |`:missing`                      |implicit range search (see http://hl7.org/fhir/R4/search.html#quantity)|
 |Composite                 |`:missing`                      |processes each parameter component according to its type|
 |Special (near)            | none                           |searches a bounding area according to the value of the `fhirServer/search/useBoundingRadius` property|
@@ -124,16 +124,25 @@ The `eb` and `ap` prefixes are not supported for searches which target values of
 If not specified on a query string, the default prefix is `eq`.
 
 ### Searching on Date
-The FHIR server adheres to the specification except in cases where a time is included in the search query value. When a time is specified, the implementation requires an hour, minute, second, and timezone value. Including these values is consistent with the way in which `instant` and `dateTime` data types are defined at https://www.hl7.org/fhir/R4/datatypes.html#primitive. However, the implementation differs from the description at https://www.hl7.org/fhir/R4/search.html#date, which allows clients to include hours and minutes, but to omit values for seconds and time zone.
+The IBM FHIR Server adheres to the specification with two minor exceptions:
+* The server supports search query values with fractional seconds; any search query value given with fractional seconds is treated as precise value, whereas search query values without fractional seconds are handled as an implicit range (e.g. `2000-04-30T23:59:00` becomes the range `[2000-04-30T23:59:00, 2000-04-30T23:59:01)`).
+* Dates and DateTimes (and query parameter values for date search parameters) which are expressed without timezones are handled as UTC values.
+* This differs slightly from the specification which indicates that "Where both search parameters and resource element date times do not have time zones, the servers local time zone should be assumed". However, because both the element values AND search query parameters are handled in the same way, this difference matters only when timezones are specified on one side (resource element or search query parameter) but not the other. For example, a query like `Patient?birthdate=2019-01-01` would match a resource with a value of `2019-01-01`, but would *not* match a resource with a value of `2019-01-01T20:00:00-04:00`.
 
-The IBM FHIR Server stores up to 6 fractional seconds (microsecond granularity) for Instant and DateTime values (when present) and allows clients to search with these as well.
+The IBM FHIR Server supports up to 6 fractional seconds (microsecond granularity) for Instant and DateTime values and all extracted parameter values are stored in the database in UTC in order to improve data portability.
 
-Query parameter values without fractional seconds will be handled as an implicit range. For example, a search like `Patient?date=2019-01-01T12:00:00Z` would include resources with the following effectiveDateTime values:
+Dates and DateTimes which are expressed without timezones are assumed to be in the local timezone of the application server at the time of parameter extraction.
+Similarly, query parameter date values with no timezone are assumed to be in the local time of the server at the time the search is invoked.
+To ensure consistency of search results, clients are recommended to include the timezone on all search query values that include a time.
+
+Finally, the server extends the specified capabilities with support for "exact match" semantics on fractional seconds.
+
+Query parameter values without fractional seconds is handled as an implicit range. For example, a search like `Observatoin?date=2019-01-01T12:00:00Z` would return resources with the following effectiveDateTime values:
 * 2019-01-01T12:00:00Z
 * 2019-01-01T12:00:00.1Z
 * 2019-01-01T12:00:00.999999Z
 
-Query parameter values with fractional seconds will be handled with exact match semantics (ignoring precision). For example, a search like `Patient?date=2019-01-01T12:00:00.100Z` would include resources with the following effectiveDateTime values:
+Query parameter values with fractional seconds is handled with exact match semantics (ignoring precision). For example, a search like `Patient?birthdate=2019-01-01T12:00:00.1Z` would include resources with the following effectiveDateTime values:
 * 2019-01-01T12:00:00.1Z
 * 2019-01-01T12:00:00.100Z
 * 2019-01-01T12:00:00.100000Z

fhir-core/src/main/java/com/ibm/fhir/core/FHIRUtilities.java

@@ -8,7 +8,6 @@
 
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
-import java.time.ZoneId;
 import java.util.Base64;
 import java.util.Date;
 import java.util.TimeZone;
@@ -118,7 +117,7 @@ public static boolean isEncoded(String s) {
      * @return
      */
     public static Timestamp convertToTimestamp(java.time.ZonedDateTime zdt) {
-        return Timestamp.from(zdt.withZoneSameInstant(ZoneId.of("UTC")).toInstant());
+        return Timestamp.from(zdt.toInstant());
     }
 
 

fhir-examples/src/main/resources/json/ibm/basic/BasicDate.json

@@ -14,7 +14,7 @@
     },
     {
       "url": "http://example.org/dateTime",
-      "valueDateTime": "2018-10-29T17:12:00-04:00"
+      "valueDateTime": "2019-12-31T20:00:00-04:00"
     },
     {
       "url": "http://example.org/time",

fhir-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/JDBCConstants.java

@@ -6,9 +6,11 @@
 package com.ibm.fhir.persistence.jdbc;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 
 import com.ibm.fhir.search.SearchConstants.Modifier;
 import com.ibm.fhir.search.SearchConstants.Type;
@@ -64,34 +66,38 @@ public class JDBCConstants {
     public static final char COMMA_CHAR = ',';
     public static final char QUOTE = '\'';
     public static final char PATH_CHAR = '/';
-    
+
     // JDBC Operators
     public static final String EQ = " = ";
     public static final String LIKE = " LIKE ";
     public static final String IN =" IN ";
     public static final String LT = " < ";
     public static final String LTE = " <= ";
-    public static final String GT = " > "; 
+    public static final String GT = " > ";
     public static final String GTE = " >= ";
     public static final String NE = " <> ";
     public static final String OR = " OR ";
     public static final String AND = " AND ";
-    
+
     // ASC/DESC
     public static final String ORDER_BY = " ORDER BY ";
     public static final String ASCENDING = "ASC";
     public static final String DESCENDING = "DESC";
-    
+
     public static final String DEFAULT_ORDERING = " ORDER BY RESOURCE_ID ASC ";
     public static final String DEFAULT_ORDERING_WITH_TABLE = " ORDER BY R.RESOURCE_ID ASC ";
-    
-    // MIN / MAX 
+
+    // MIN / MAX
     public static final String MAX = "MAX";
     public static final String MIN = "MIN";
 
     /**
-     * Maps search parameter types to the currently supported list of modifiers for
-     * that type.
+     * Calendar object to use while inserting Timestamp objects into the database.
+     */
+    public static final Calendar UTC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+
+    /**
+     * Maps search parameter types to the currently supported list of modifiers for that type.
      */
     public static final Map<Type, List<Modifier>> supportedModifiersMap;
 
@@ -123,4 +129,4 @@ public class JDBCConstants {
     private JDBCConstants() {
         // Hide the constructor
     }
-}
+}