Implement date offsets for Criteria queries. (#183)

Fixes #167, #168.

.editorconfig

@@ -0,0 +1,11 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{java,sql}]
+charset = utf-8
+indent_style = space
+indent_size = 2

pom.xml

@@ -88,25 +88,20 @@
     <repository>
       <id>ohdsi</id>
       <name>repo.ohdsi.org</name>
-      <url>https://repo.ohdsi.org/nexus/content/repositories/releases</url>
-    </repository>
-    <repository>
-      <id>ohdsi.thirdparty</id>
-      <name>repo.ohdsi.org</name>
-      <url>https://repo.ohdsi.org/nexus/content/repositories/thirdparty</url>
-    </repository>
-    <repository>
-      <id>ohdsi.snapshots</id>
-      <name>repo.ohdsi.org-snapshots</name>
-      <url>https://repo.ohdsi.org/nexus/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
+      <url>https://repo.ohdsi.org/nexus/content/groups/public</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>central</id>
+      <url>https://repo.maven.apache.org/maven2</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>ohdsi</id>
+      <name>repo.ohdsi.org</name>
+      <url>https://repo.ohdsi.org/nexus/content/groups/public</url>
+    </pluginRepository>
+  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

src/main/java/org/ohdsi/circe/cohortdefinition/ConditionOccurrence.java

@@ -47,7 +47,7 @@ public class ConditionOccurrence extends Criteria {
   public Concept[] conditionType;
 
   @JsonProperty("ConditionTypeExclude")
-  public boolean conditionTypeExclude = false;
+  public Boolean conditionTypeExclude;
 
   @JsonProperty("StopReason")
   public TextFilter stopReason;

src/main/java/org/ohdsi/circe/cohortdefinition/Criteria.java

@@ -28,7 +28,6 @@
  *
  * @author Chris Knoll <[email protected]>
  */
-
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.WRAPPER_OBJECT)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = ConditionEra.class, name = "ConditionEra"),
@@ -49,13 +48,17 @@
   @JsonSubTypes.Type(value = PayerPlanPeriod.class, name = "PayerPlanPeriod")
 })
 public abstract class Criteria {
+
   public String accept(IGetCriteriaSqlDispatcher dispatcher) {
     return this.accept(dispatcher, null);
   }
 
   public abstract String accept(IGetCriteriaSqlDispatcher dispatcher, BuilderOptions options);
 
-  @JsonProperty("CorrelatedCriteria")  
+  @JsonProperty("CorrelatedCriteria")
   public CriteriaGroup CorrelatedCriteria;
-
+
+  @JsonProperty("DateAdjustment")
+  public DateAdjustment dateAdjustment;
+
 }

src/main/java/org/ohdsi/circe/cohortdefinition/DateAdjustment.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 cknoll1.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.ohdsi.circe.cohortdefinition;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author cknoll1
+ */
+public class DateAdjustment {
+
+  public enum DateType {
+    @JsonProperty("START_DATE")
+    START_DATE,
+    @JsonProperty("END_DATE")
+    END_DATE
+  };
+
+  @JsonProperty("StartWith")
+  public DateType startWith = DateType.START_DATE;
+  @JsonProperty("StartOffset")
+  public int startOffset = 0;
+
+  @JsonProperty("EndWith")
+  public DateType endWith = DateType.END_DATE;
+ @JsonProperty("EndOffset")
+  public int endOffset = 0;
+
+}