From f7b8f2871fc367c8fc58b4f59f84f6953a64bd75 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Mon, 6 Sep 2021 08:44:26 +0300
Subject: [PATCH 01/47] Add mybatis artifacts for template table

---
 .../org/opensrp/domain/postgres/Template.java | 236 ++++++
 .../domain/postgres/TemplateExample.java      | 732 ++++++++++++++++++
 .../postgres/mapper/TemplateMapper.java       |  96 +++
 .../postgres/mapper/xml/TemplateMapper.xml    | 318 ++++++++
 4 files changed, 1382 insertions(+)
 create mode 100644 src/main/java/org/opensrp/domain/postgres/Template.java
 create mode 100644 src/main/java/org/opensrp/domain/postgres/TemplateExample.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml

diff --git a/src/main/java/org/opensrp/domain/postgres/Template.java b/src/main/java/org/opensrp/domain/postgres/Template.java
new file mode 100644
index 000000000..2b3a3558d
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/postgres/Template.java
@@ -0,0 +1,236 @@
+package org.opensrp.domain.postgres;
+
+import java.util.Date;
+
+public class Template {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.id
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.template_id
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private Integer templateId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private Object template;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.type
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private String type;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.version
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private Integer version;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.date_created
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private Date dateCreated;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.template.date_edited
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    private Date dateEdited;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.id
+     *
+     * @return the value of core.template.id
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.id
+     *
+     * @param id the value for core.template.id
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.template_id
+     *
+     * @return the value of core.template.template_id
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Integer getTemplateId() {
+        return templateId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.template_id
+     *
+     * @param templateId the value for core.template.template_id
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setTemplateId(Integer templateId) {
+        this.templateId = templateId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.template
+     *
+     * @return the value of core.template.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Object getTemplate() {
+        return template;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.template
+     *
+     * @param template the value for core.template.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setTemplate(Object template) {
+        this.template = template;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.type
+     *
+     * @return the value of core.template.type
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.type
+     *
+     * @param type the value for core.template.type
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.version
+     *
+     * @return the value of core.template.version
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.version
+     *
+     * @param version the value for core.template.version
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.date_created
+     *
+     * @return the value of core.template.date_created
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Date getDateCreated() {
+        return dateCreated;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.date_created
+     *
+     * @param dateCreated the value for core.template.date_created
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setDateCreated(Date dateCreated) {
+        this.dateCreated = dateCreated;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.template.date_edited
+     *
+     * @return the value of core.template.date_edited
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Date getDateEdited() {
+        return dateEdited;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.template.date_edited
+     *
+     * @param dateEdited the value for core.template.date_edited
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setDateEdited(Date dateEdited) {
+        this.dateEdited = dateEdited;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/domain/postgres/TemplateExample.java b/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
new file mode 100644
index 000000000..7ae778ce1
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
@@ -0,0 +1,732 @@
+package org.opensrp.domain.postgres;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TemplateExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public TemplateExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIsNull() {
+            addCriterion("template_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIsNotNull() {
+            addCriterion("template_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdEqualTo(Integer value) {
+            addCriterion("template_id =", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotEqualTo(Integer value) {
+            addCriterion("template_id <>", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdGreaterThan(Integer value) {
+            addCriterion("template_id >", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("template_id >=", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLessThan(Integer value) {
+            addCriterion("template_id <", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("template_id <=", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIn(List<Integer> values) {
+            addCriterion("template_id in", values, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotIn(List<Integer> values) {
+            addCriterion("template_id not in", values, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdBetween(Integer value1, Integer value2) {
+            addCriterion("template_id between", value1, value2, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("template_id not between", value1, value2, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIsNull() {
+            addCriterion("template is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIsNotNull() {
+            addCriterion("template is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateEqualTo(Object value) {
+            addCriterion("template =", value, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateNotEqualTo(Object value) {
+            addCriterion("template <>", value, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateGreaterThan(Object value) {
+            addCriterion("template >", value, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateGreaterThanOrEqualTo(Object value) {
+            addCriterion("template >=", value, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateLessThan(Object value) {
+            addCriterion("template <", value, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateLessThanOrEqualTo(Object value) {
+            addCriterion("template <=", value, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIn(List<Object> values) {
+            addCriterion("template in", values, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateNotIn(List<Object> values) {
+            addCriterion("template not in", values, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateBetween(Object value1, Object value2) {
+            addCriterion("template between", value1, value2, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateNotBetween(Object value1, Object value2) {
+            addCriterion("template not between", value1, value2, "template");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIsNull() {
+            addCriterion("version is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIsNotNull() {
+            addCriterion("version is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionEqualTo(Integer value) {
+            addCriterion("version =", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNotEqualTo(Integer value) {
+            addCriterion("version <>", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionGreaterThan(Integer value) {
+            addCriterion("version >", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionGreaterThanOrEqualTo(Integer value) {
+            addCriterion("version >=", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionLessThan(Integer value) {
+            addCriterion("version <", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionLessThanOrEqualTo(Integer value) {
+            addCriterion("version <=", value, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionIn(List<Integer> values) {
+            addCriterion("version in", values, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNotIn(List<Integer> values) {
+            addCriterion("version not in", values, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionBetween(Integer value1, Integer value2) {
+            addCriterion("version between", value1, value2, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNotBetween(Integer value1, Integer value2) {
+            addCriterion("version not between", value1, value2, "version");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedIsNull() {
+            addCriterion("date_created is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedIsNotNull() {
+            addCriterion("date_created is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedEqualTo(Date value) {
+            addCriterion("date_created =", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedNotEqualTo(Date value) {
+            addCriterion("date_created <>", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedGreaterThan(Date value) {
+            addCriterion("date_created >", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedGreaterThanOrEqualTo(Date value) {
+            addCriterion("date_created >=", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedLessThan(Date value) {
+            addCriterion("date_created <", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedLessThanOrEqualTo(Date value) {
+            addCriterion("date_created <=", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedIn(List<Date> values) {
+            addCriterion("date_created in", values, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedNotIn(List<Date> values) {
+            addCriterion("date_created not in", values, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedBetween(Date value1, Date value2) {
+            addCriterion("date_created between", value1, value2, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedNotBetween(Date value1, Date value2) {
+            addCriterion("date_created not between", value1, value2, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedIsNull() {
+            addCriterion("date_edited is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedIsNotNull() {
+            addCriterion("date_edited is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedEqualTo(Date value) {
+            addCriterion("date_edited =", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedNotEqualTo(Date value) {
+            addCriterion("date_edited <>", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedGreaterThan(Date value) {
+            addCriterion("date_edited >", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedGreaterThanOrEqualTo(Date value) {
+            addCriterion("date_edited >=", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedLessThan(Date value) {
+            addCriterion("date_edited <", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedLessThanOrEqualTo(Date value) {
+            addCriterion("date_edited <=", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedIn(List<Date> values) {
+            addCriterion("date_edited in", values, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedNotIn(List<Date> values) {
+            addCriterion("date_edited not in", values, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedBetween(Date value1, Date value2) {
+            addCriterion("date_edited between", value1, value2, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedNotBetween(Date value1, Date value2) {
+            addCriterion("date_edited not between", value1, value2, "dateEdited");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table core.template
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Sep 06 08:33:43 EAT 2021
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java b/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java
new file mode 100644
index 000000000..68147990a
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java
@@ -0,0 +1,96 @@
+package org.opensrp.repository.postgres.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.opensrp.domain.postgres.Template;
+import org.opensrp.domain.postgres.TemplateExample;
+
+public interface TemplateMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    long countByExample(TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int deleteByExample(TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int insert(Template record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int insertSelective(Template record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    List<Template> selectByExample(TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    Template selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int updateByExampleSelective(@Param("record") Template record, @Param("example") TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int updateByExample(@Param("record") Template record, @Param("example") TemplateExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int updateByPrimaryKeySelective(Template record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.template
+     *
+     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     */
+    int updateByPrimaryKey(Template record);
+}
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml
new file mode 100644
index 000000000..28d73bf45
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.opensrp.repository.postgres.mapper.TemplateMapper">
+  <resultMap id="BaseResultMap" type="org.opensrp.domain.postgres.Template">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="template_id" jdbcType="INTEGER" property="templateId" />
+    <result column="template" jdbcType="OTHER" property="template" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="date_created" jdbcType="TIMESTAMP" property="dateCreated" />
+    <result column="date_edited" jdbcType="TIMESTAMP" property="dateEdited" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    id, template_id, template, type, version, date_created, date_edited
+  </sql>
+  <select id="selectByExample" parameterType="org.opensrp.domain.postgres.TemplateExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from core.template
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from core.template
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    delete from core.template
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="org.opensrp.domain.postgres.TemplateExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    delete from core.template
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="org.opensrp.domain.postgres.Template">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    insert into core.template (id, template_id, template, 
+      type, version, date_created, 
+      date_edited)
+    values (#{id,jdbcType=BIGINT}, #{templateId,jdbcType=INTEGER}, #{template,jdbcType=OTHER}, 
+      #{type,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{dateCreated,jdbcType=TIMESTAMP}, 
+      #{dateEdited,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="org.opensrp.domain.postgres.Template">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    insert into core.template
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="templateId != null">
+        template_id,
+      </if>
+      <if test="template != null">
+        template,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="version != null">
+        version,
+      </if>
+      <if test="dateCreated != null">
+        date_created,
+      </if>
+      <if test="dateEdited != null">
+        date_edited,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="templateId != null">
+        #{templateId,jdbcType=INTEGER},
+      </if>
+      <if test="template != null">
+        #{template,jdbcType=OTHER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="version != null">
+        #{version,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreated != null">
+        #{dateCreated,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateEdited != null">
+        #{dateEdited,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="org.opensrp.domain.postgres.TemplateExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    select count(*) from core.template
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    update core.template
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.templateId != null">
+        template_id = #{record.templateId,jdbcType=INTEGER},
+      </if>
+      <if test="record.template != null">
+        template = #{record.template,jdbcType=OTHER},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.version != null">
+        version = #{record.version,jdbcType=INTEGER},
+      </if>
+      <if test="record.dateCreated != null">
+        date_created = #{record.dateCreated,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.dateEdited != null">
+        date_edited = #{record.dateEdited,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    update core.template
+    set id = #{record.id,jdbcType=BIGINT},
+      template_id = #{record.templateId,jdbcType=INTEGER},
+      template = #{record.template,jdbcType=OTHER},
+      type = #{record.type,jdbcType=VARCHAR},
+      version = #{record.version,jdbcType=INTEGER},
+      date_created = #{record.dateCreated,jdbcType=TIMESTAMP},
+      date_edited = #{record.dateEdited,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="org.opensrp.domain.postgres.Template">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    update core.template
+    <set>
+      <if test="templateId != null">
+        template_id = #{templateId,jdbcType=INTEGER},
+      </if>
+      <if test="template != null">
+        template = #{template,jdbcType=OTHER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="version != null">
+        version = #{version,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreated != null">
+        date_created = #{dateCreated,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateEdited != null">
+        date_edited = #{dateEdited,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="org.opensrp.domain.postgres.Template">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+    -->
+    update core.template
+    set template_id = #{templateId,jdbcType=INTEGER},
+      template = #{template,jdbcType=OTHER},
+      type = #{type,jdbcType=VARCHAR},
+      version = #{version,jdbcType=INTEGER},
+      date_created = #{dateCreated,jdbcType=TIMESTAMP},
+      date_edited = #{dateEdited,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

From aaedb8eebb9a43e1de270311d44619d6777c6de9 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Sat, 11 Sep 2021 11:06:30 +0300
Subject: [PATCH 02/47] Added mybatis artifacts for plan processing status

---
 .../domain/postgres/PlanProcessingStatus.java | 236 ++++++
 .../postgres/PlanProcessingStatusExample.java | 722 ++++++++++++++++++
 .../mapper/PlanProcessingStatusMapper.java    |  96 +++
 .../mapper/xml/PlanProcessingStatusMapper.xml | 318 ++++++++
 4 files changed, 1372 insertions(+)
 create mode 100644 src/main/java/org/opensrp/domain/postgres/PlanProcessingStatus.java
 create mode 100644 src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/PlanProcessingStatusMapper.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/xml/PlanProcessingStatusMapper.xml

diff --git a/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatus.java b/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatus.java
new file mode 100644
index 000000000..e083a5fe3
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatus.java
@@ -0,0 +1,236 @@
+package org.opensrp.domain.postgres;
+
+import java.util.Date;
+
+public class PlanProcessingStatus {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.plan_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Long planId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.event_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Long eventId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.template_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Long templateId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Integer status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.date_created
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Date dateCreated;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column core.plan_processing_status.date_edited
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    private Date dateEdited;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.id
+     *
+     * @return the value of core.plan_processing_status.id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.id
+     *
+     * @param id the value for core.plan_processing_status.id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.plan_id
+     *
+     * @return the value of core.plan_processing_status.plan_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Long getPlanId() {
+        return planId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.plan_id
+     *
+     * @param planId the value for core.plan_processing_status.plan_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setPlanId(Long planId) {
+        this.planId = planId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.event_id
+     *
+     * @return the value of core.plan_processing_status.event_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Long getEventId() {
+        return eventId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.event_id
+     *
+     * @param eventId the value for core.plan_processing_status.event_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setEventId(Long eventId) {
+        this.eventId = eventId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.template_id
+     *
+     * @return the value of core.plan_processing_status.template_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Long getTemplateId() {
+        return templateId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.template_id
+     *
+     * @param templateId the value for core.plan_processing_status.template_id
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.status
+     *
+     * @return the value of core.plan_processing_status.status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.status
+     *
+     * @param status the value for core.plan_processing_status.status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.date_created
+     *
+     * @return the value of core.plan_processing_status.date_created
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Date getDateCreated() {
+        return dateCreated;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.date_created
+     *
+     * @param dateCreated the value for core.plan_processing_status.date_created
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setDateCreated(Date dateCreated) {
+        this.dateCreated = dateCreated;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column core.plan_processing_status.date_edited
+     *
+     * @return the value of core.plan_processing_status.date_edited
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Date getDateEdited() {
+        return dateEdited;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column core.plan_processing_status.date_edited
+     *
+     * @param dateEdited the value for core.plan_processing_status.date_edited
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setDateEdited(Date dateEdited) {
+        this.dateEdited = dateEdited;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java b/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java
new file mode 100644
index 000000000..fe5c90980
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java
@@ -0,0 +1,722 @@
+package org.opensrp.domain.postgres;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PlanProcessingStatusExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public PlanProcessingStatusExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdIsNull() {
+            addCriterion("plan_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdIsNotNull() {
+            addCriterion("plan_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdEqualTo(Long value) {
+            addCriterion("plan_id =", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotEqualTo(Long value) {
+            addCriterion("plan_id <>", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdGreaterThan(Long value) {
+            addCriterion("plan_id >", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("plan_id >=", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdLessThan(Long value) {
+            addCriterion("plan_id <", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdLessThanOrEqualTo(Long value) {
+            addCriterion("plan_id <=", value, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdIn(List<Long> values) {
+            addCriterion("plan_id in", values, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotIn(List<Long> values) {
+            addCriterion("plan_id not in", values, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdBetween(Long value1, Long value2) {
+            addCriterion("plan_id between", value1, value2, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanIdNotBetween(Long value1, Long value2) {
+            addCriterion("plan_id not between", value1, value2, "planId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdIsNull() {
+            addCriterion("event_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdIsNotNull() {
+            addCriterion("event_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdEqualTo(Long value) {
+            addCriterion("event_id =", value, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdNotEqualTo(Long value) {
+            addCriterion("event_id <>", value, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdGreaterThan(Long value) {
+            addCriterion("event_id >", value, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("event_id >=", value, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdLessThan(Long value) {
+            addCriterion("event_id <", value, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdLessThanOrEqualTo(Long value) {
+            addCriterion("event_id <=", value, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdIn(List<Long> values) {
+            addCriterion("event_id in", values, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdNotIn(List<Long> values) {
+            addCriterion("event_id not in", values, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdBetween(Long value1, Long value2) {
+            addCriterion("event_id between", value1, value2, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEventIdNotBetween(Long value1, Long value2) {
+            addCriterion("event_id not between", value1, value2, "eventId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIsNull() {
+            addCriterion("template_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIsNotNull() {
+            addCriterion("template_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdEqualTo(Long value) {
+            addCriterion("template_id =", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotEqualTo(Long value) {
+            addCriterion("template_id <>", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdGreaterThan(Long value) {
+            addCriterion("template_id >", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("template_id >=", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLessThan(Long value) {
+            addCriterion("template_id <", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdLessThanOrEqualTo(Long value) {
+            addCriterion("template_id <=", value, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdIn(List<Long> values) {
+            addCriterion("template_id in", values, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotIn(List<Long> values) {
+            addCriterion("template_id not in", values, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdBetween(Long value1, Long value2) {
+            addCriterion("template_id between", value1, value2, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateIdNotBetween(Long value1, Long value2) {
+            addCriterion("template_id not between", value1, value2, "templateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedIsNull() {
+            addCriterion("date_created is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedIsNotNull() {
+            addCriterion("date_created is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedEqualTo(Date value) {
+            addCriterion("date_created =", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedNotEqualTo(Date value) {
+            addCriterion("date_created <>", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedGreaterThan(Date value) {
+            addCriterion("date_created >", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedGreaterThanOrEqualTo(Date value) {
+            addCriterion("date_created >=", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedLessThan(Date value) {
+            addCriterion("date_created <", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedLessThanOrEqualTo(Date value) {
+            addCriterion("date_created <=", value, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedIn(List<Date> values) {
+            addCriterion("date_created in", values, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedNotIn(List<Date> values) {
+            addCriterion("date_created not in", values, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedBetween(Date value1, Date value2) {
+            addCriterion("date_created between", value1, value2, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateCreatedNotBetween(Date value1, Date value2) {
+            addCriterion("date_created not between", value1, value2, "dateCreated");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedIsNull() {
+            addCriterion("date_edited is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedIsNotNull() {
+            addCriterion("date_edited is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedEqualTo(Date value) {
+            addCriterion("date_edited =", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedNotEqualTo(Date value) {
+            addCriterion("date_edited <>", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedGreaterThan(Date value) {
+            addCriterion("date_edited >", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedGreaterThanOrEqualTo(Date value) {
+            addCriterion("date_edited >=", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedLessThan(Date value) {
+            addCriterion("date_edited <", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedLessThanOrEqualTo(Date value) {
+            addCriterion("date_edited <=", value, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedIn(List<Date> values) {
+            addCriterion("date_edited in", values, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedNotIn(List<Date> values) {
+            addCriterion("date_edited not in", values, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedBetween(Date value1, Date value2) {
+            addCriterion("date_edited between", value1, value2, "dateEdited");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEditedNotBetween(Date value1, Date value2) {
+            addCriterion("date_edited not between", value1, value2, "dateEdited");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated do_not_delete_during_merge Sat Sep 11 11:04:03 EAT 2021
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/PlanProcessingStatusMapper.java b/src/main/java/org/opensrp/repository/postgres/mapper/PlanProcessingStatusMapper.java
new file mode 100644
index 000000000..a7caeb9de
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/PlanProcessingStatusMapper.java
@@ -0,0 +1,96 @@
+package org.opensrp.repository.postgres.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+import org.opensrp.domain.postgres.PlanProcessingStatusExample;
+
+public interface PlanProcessingStatusMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    long countByExample(PlanProcessingStatusExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int deleteByExample(PlanProcessingStatusExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int insert(PlanProcessingStatus record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int insertSelective(PlanProcessingStatus record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    List<PlanProcessingStatus> selectByExample(PlanProcessingStatusExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    PlanProcessingStatus selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int updateByExampleSelective(@Param("record") PlanProcessingStatus record, @Param("example") PlanProcessingStatusExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int updateByExample(@Param("record") PlanProcessingStatus record, @Param("example") PlanProcessingStatusExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int updateByPrimaryKeySelective(PlanProcessingStatus record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table core.plan_processing_status
+     *
+     * @mbg.generated Sat Sep 11 11:04:03 EAT 2021
+     */
+    int updateByPrimaryKey(PlanProcessingStatus record);
+}
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/xml/PlanProcessingStatusMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/xml/PlanProcessingStatusMapper.xml
new file mode 100644
index 000000000..1589b6a86
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/xml/PlanProcessingStatusMapper.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.opensrp.repository.postgres.mapper.PlanProcessingStatusMapper">
+  <resultMap id="BaseResultMap" type="org.opensrp.domain.postgres.PlanProcessingStatus">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="plan_id" jdbcType="BIGINT" property="planId" />
+    <result column="event_id" jdbcType="BIGINT" property="eventId" />
+    <result column="template_id" jdbcType="BIGINT" property="templateId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="date_created" jdbcType="TIMESTAMP" property="dateCreated" />
+    <result column="date_edited" jdbcType="TIMESTAMP" property="dateEdited" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    id, plan_id, event_id, template_id, status, date_created, date_edited
+  </sql>
+  <select id="selectByExample" parameterType="org.opensrp.domain.postgres.PlanProcessingStatusExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from core.plan_processing_status
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from core.plan_processing_status
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    delete from core.plan_processing_status
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="org.opensrp.domain.postgres.PlanProcessingStatusExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    delete from core.plan_processing_status
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="org.opensrp.domain.postgres.PlanProcessingStatus">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    insert into core.plan_processing_status (id, plan_id, event_id, 
+      template_id, status, date_created, 
+      date_edited)
+    values (#{id,jdbcType=BIGINT}, #{planId,jdbcType=BIGINT}, #{eventId,jdbcType=BIGINT}, 
+      #{templateId,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{dateCreated,jdbcType=TIMESTAMP}, 
+      #{dateEdited,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="org.opensrp.domain.postgres.PlanProcessingStatus">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    insert into core.plan_processing_status
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="planId != null">
+        plan_id,
+      </if>
+      <if test="eventId != null">
+        event_id,
+      </if>
+      <if test="templateId != null">
+        template_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="dateCreated != null">
+        date_created,
+      </if>
+      <if test="dateEdited != null">
+        date_edited,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="planId != null">
+        #{planId,jdbcType=BIGINT},
+      </if>
+      <if test="eventId != null">
+        #{eventId,jdbcType=BIGINT},
+      </if>
+      <if test="templateId != null">
+        #{templateId,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreated != null">
+        #{dateCreated,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateEdited != null">
+        #{dateEdited,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="org.opensrp.domain.postgres.PlanProcessingStatusExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    select count(*) from core.plan_processing_status
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    update core.plan_processing_status
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.planId != null">
+        plan_id = #{record.planId,jdbcType=BIGINT},
+      </if>
+      <if test="record.eventId != null">
+        event_id = #{record.eventId,jdbcType=BIGINT},
+      </if>
+      <if test="record.templateId != null">
+        template_id = #{record.templateId,jdbcType=BIGINT},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.dateCreated != null">
+        date_created = #{record.dateCreated,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.dateEdited != null">
+        date_edited = #{record.dateEdited,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    update core.plan_processing_status
+    set id = #{record.id,jdbcType=BIGINT},
+      plan_id = #{record.planId,jdbcType=BIGINT},
+      event_id = #{record.eventId,jdbcType=BIGINT},
+      template_id = #{record.templateId,jdbcType=BIGINT},
+      status = #{record.status,jdbcType=INTEGER},
+      date_created = #{record.dateCreated,jdbcType=TIMESTAMP},
+      date_edited = #{record.dateEdited,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="org.opensrp.domain.postgres.PlanProcessingStatus">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    update core.plan_processing_status
+    <set>
+      <if test="planId != null">
+        plan_id = #{planId,jdbcType=BIGINT},
+      </if>
+      <if test="eventId != null">
+        event_id = #{eventId,jdbcType=BIGINT},
+      </if>
+      <if test="templateId != null">
+        template_id = #{templateId,jdbcType=BIGINT},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="dateCreated != null">
+        date_created = #{dateCreated,jdbcType=TIMESTAMP},
+      </if>
+      <if test="dateEdited != null">
+        date_edited = #{dateEdited,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="org.opensrp.domain.postgres.PlanProcessingStatus">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Sat Sep 11 11:04:03 EAT 2021.
+    -->
+    update core.plan_processing_status
+    set plan_id = #{planId,jdbcType=BIGINT},
+      event_id = #{eventId,jdbcType=BIGINT},
+      template_id = #{templateId,jdbcType=BIGINT},
+      status = #{status,jdbcType=INTEGER},
+      date_created = #{dateCreated,jdbcType=TIMESTAMP},
+      date_edited = #{dateEdited,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

From ea7dc8c5f55b2bb3b2b8f91c135400d2507382a3 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Mon, 13 Sep 2021 20:07:52 +0300
Subject: [PATCH 03/47] Add template repository and mapper classes

---
 .../java/org/opensrp/domain/Template.java     |  42 +++++
 .../repository/TemplateRepository.java        |  12 ++
 .../postgres/TemplateRepositoryImpl.java      | 172 ++++++++++++++++++
 .../mapper/custom/CustomTemplateMapper.java   |  14 ++
 .../custom/xml/CustomTemplateMapper.xml       |  49 +++++
 5 files changed, 289 insertions(+)
 create mode 100644 src/main/java/org/opensrp/domain/Template.java
 create mode 100644 src/main/java/org/opensrp/repository/TemplateRepository.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomTemplateMapper.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml

diff --git a/src/main/java/org/opensrp/domain/Template.java b/src/main/java/org/opensrp/domain/Template.java
new file mode 100644
index 000000000..1a8668fd7
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/Template.java
@@ -0,0 +1,42 @@
+package org.opensrp.domain;
+
+import java.io.Serializable;
+
+public class Template implements Serializable {
+    private int templateId;
+    private String template;
+    private String Type;
+    private int version;
+
+    public int getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(int templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getTemplate() {
+        return template;
+    }
+
+    public void setTemplate(String template) {
+        this.template = template;
+    }
+
+    public String getType() {
+        return Type;
+    }
+
+    public void setType(String type) {
+        Type = type;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+}
diff --git a/src/main/java/org/opensrp/repository/TemplateRepository.java b/src/main/java/org/opensrp/repository/TemplateRepository.java
new file mode 100644
index 000000000..3a69bf71b
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/TemplateRepository.java
@@ -0,0 +1,12 @@
+package org.opensrp.repository;
+
+import org.opensrp.domain.Template;
+
+public interface TemplateRepository extends BaseRepository<Template> {
+
+    Template getByPrimaryKey(Long id);
+
+    org.opensrp.domain.postgres.Template  getTemplate(int templateId);
+
+    Template getTemplateByTemplateId(int id);
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
new file mode 100644
index 000000000..5cc6715fc
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -0,0 +1,172 @@
+package org.opensrp.repository.postgres;
+
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.StringUtils;
+import org.opensrp.domain.Template;
+import org.opensrp.domain.postgres.TemplateExample;
+import org.opensrp.repository.TemplateRepository;
+import org.opensrp.repository.postgres.mapper.custom.CustomTemplateMapper;
+import org.opensrp.util.Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Repository
+public class TemplateRepositoryImpl extends BaseRepositoryImpl<Template> implements TemplateRepository {
+
+    @Autowired
+    private CustomTemplateMapper templateMapper;
+
+    @Override
+    public Template get(String id) {
+        throw new NotImplementedException();
+    }
+
+    @Override
+    public void add(Template template) {
+        if (template == null) {
+            return;
+        }
+        if (getUniqueField(template) == null) {
+            return;
+        }
+
+        if (retrievePrimaryKey(template) != null) {
+            return; // template already added
+        }
+
+        org.opensrp.domain.postgres.Template pgTemplate = convert(template);
+
+        templateMapper.insertSelective(pgTemplate);
+    }
+
+    @Override
+    public void update(Template template) {
+        if (template == null) {
+            return;
+        }
+        if (getUniqueField(template) == null) {
+            return;
+        }
+
+        Long id = retrievePrimaryKey(template);
+        if ( id == null) {
+            return; // template does not exist
+        }
+
+        org.opensrp.domain.postgres.Template pgTemplate = convert(template);
+
+        pgTemplate.setId(id);
+        templateMapper.updateByPrimaryKey(pgTemplate);
+    }
+
+    @Override
+    public List<Template> getAll() {
+        TemplateExample templateExample = new TemplateExample();
+        templateExample.createCriteria();
+        List<org.opensrp.domain.postgres.Template> pgTemplateList = templateMapper.selectMany(templateExample, 0,
+                DEFAULT_FETCH_SIZE);
+        return convert(pgTemplateList);
+    }
+
+    @Override
+    public void safeRemove(Template template) {
+        if (template == null) {
+            return;
+        }
+
+        Long id = retrievePrimaryKey(template);
+        if (id == null) {
+            return;
+        }
+
+        templateMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public Template getByPrimaryKey(Long id) {
+        if (id == null) {
+            return null;
+        }
+        TemplateExample example = new TemplateExample();
+        example.createCriteria().andIdEqualTo(id);
+        List<org.opensrp.domain.postgres.Template> templates = templateMapper.selectByExample(example);
+        return templates.isEmpty() ? null : convert(templates.get(0));
+    }
+
+    @Override
+    public Template getTemplateByTemplateId(int templateId) {
+
+        org.opensrp.domain.postgres.Template pgTemplate = getTemplate(templateId);
+
+        return pgTemplate != null ? convert(pgTemplate) : null;
+    }
+
+    @Override
+    public org.opensrp.domain.postgres.Template getTemplate(int templateId) {
+        TemplateExample templateExample = new TemplateExample();
+        templateExample.createCriteria().andTemplateIdEqualTo(templateId);
+
+        List<org.opensrp.domain.postgres.Template> templateList = templateMapper.selectByExample(templateExample);
+
+        return Utils.isEmptyList(templateList) ? null : templateList.get(0);
+    }
+
+    @Override
+    protected Long retrievePrimaryKey(Template template) {
+        Object uniqueId = getUniqueField(template);
+        if (uniqueId == null) {
+            return null;
+        }
+
+        int id = (int) uniqueId;
+        org.opensrp.domain.postgres.Template pgPractitioner = getTemplate(id);
+
+        return pgPractitioner == null ? null : pgPractitioner.getId();
+    }
+
+    @Override
+    protected Object getUniqueField(Template template) {
+        return template == null ? null : template.getTemplateId();
+    }
+
+    private Template convert(org.opensrp.domain.postgres.Template pgTemplate) {
+        if (pgTemplate == null) {
+            return null;
+        }
+        Template template = new Template();
+        template.setTemplate(pgTemplate.getTemplate().toString());
+        template.setTemplateId(pgTemplate.getTemplateId());
+        template.setVersion(pgTemplate.getVersion());
+        template.setType(pgTemplate.getType());
+
+        return template;
+    }
+
+    private org.opensrp.domain.postgres.Template convert(Template template) {
+        if (template == null) {
+            return null;
+        }
+        org.opensrp.domain.postgres.Template pgTemplate = new org.opensrp.domain.postgres.Template();
+        pgTemplate.setTemplate(template.getTemplate());
+        pgTemplate.setTemplateId(template.getTemplateId());
+        pgTemplate.setVersion(template.getVersion());
+        pgTemplate.setType(template.getType());
+
+        return pgTemplate;
+    }
+
+    private List<Template> convert(List<org.opensrp.domain.postgres.Template> pgTemplates) {
+        List<Template> templates = new ArrayList<>();
+        if (Utils.isEmptyList(pgTemplates)) {
+            return templates;
+        }
+        for(org.opensrp.domain.postgres.Template pgTemplate : pgTemplates) {
+            templates.add(convert(pgTemplate));
+        }
+        return templates;
+    }
+
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomTemplateMapper.java b/src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomTemplateMapper.java
new file mode 100644
index 000000000..f5250c9b1
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomTemplateMapper.java
@@ -0,0 +1,14 @@
+package org.opensrp.repository.postgres.mapper.custom;
+
+import org.apache.ibatis.annotations.Param;
+import org.opensrp.domain.postgres.Template;
+import org.opensrp.domain.postgres.TemplateExample;
+import org.opensrp.repository.postgres.mapper.TemplateMapper;
+
+import java.util.List;
+
+public interface CustomTemplateMapper extends TemplateMapper {
+
+    List<Template> selectMany(@Param("example") TemplateExample templateExample,
+                              @Param("offset") int offset, @Param("limit") int limit);
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml
new file mode 100644
index 000000000..53c31140a
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.opensrp.repository.postgres.mapper.custom.CustomTemplateMapper">
+
+    <sql id="Example_Where_Clause">
+        <where>
+            <foreach collection="example.oredCriteria" item="criteria" separator="or">
+                <if test="criteria.valid">
+                    <trim prefix="(" prefixOverrides="and" suffix=")">
+                        <foreach collection="criteria.criteria" item="criterion">
+                            <choose>
+                                <when test="criterion.noValue">
+                                    and ${criterion.condition}
+                                </when>
+                                <when test="criterion.singleValue">
+                                    and ${criterion.condition} #{criterion.value}
+                                </when>
+                                <when test="criterion.betweenValue">
+                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                                </when>
+                                <when test="criterion.listValue">
+                                    and ${criterion.condition}
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                        #{listItem}
+                                    </foreach>
+                                </when>
+                            </choose>
+                        </foreach>
+                    </trim>
+                </if>
+            </foreach>
+        </where>
+    </sql>
+    <select id="selectMany"
+            resultMap="org.opensrp.repository.postgres.mapper.TemplateMapper.BaseResultMap">
+        select
+        <include
+                refid="org.opensrp.repository.postgres.mapper.TemplateMapper.Base_Column_List" />
+        from team.practitioner_role pr
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause" />
+        </if>
+        <if test="example.orderByClause != null">
+            order by pr.${example.orderByClause}
+        </if>
+        LIMIT #{limit} OFFSET #{offset}
+    </select>
+
+</mapper>
\ No newline at end of file

From fff61909539913bc0921a1392ab52e53c40b8e55 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Mon, 13 Sep 2021 20:23:41 +0300
Subject: [PATCH 04/47] Add template service

---
 .../java/org/opensrp/domain/Template.java     |  6 +--
 .../org/opensrp/service/TemplateService.java  | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/opensrp/service/TemplateService.java

diff --git a/src/main/java/org/opensrp/domain/Template.java b/src/main/java/org/opensrp/domain/Template.java
index 1a8668fd7..f729e7ffa 100644
--- a/src/main/java/org/opensrp/domain/Template.java
+++ b/src/main/java/org/opensrp/domain/Template.java
@@ -3,16 +3,16 @@
 import java.io.Serializable;
 
 public class Template implements Serializable {
-    private int templateId;
+    private Integer templateId;
     private String template;
     private String Type;
     private int version;
 
-    public int getTemplateId() {
+    public Integer getTemplateId() {
         return templateId;
     }
 
-    public void setTemplateId(int templateId) {
+    public void setTemplateId(Integer templateId) {
         this.templateId = templateId;
     }
 
diff --git a/src/main/java/org/opensrp/service/TemplateService.java b/src/main/java/org/opensrp/service/TemplateService.java
new file mode 100644
index 000000000..a7082c85c
--- /dev/null
+++ b/src/main/java/org/opensrp/service/TemplateService.java
@@ -0,0 +1,39 @@
+package org.opensrp.service;
+
+import org.opensrp.domain.Template;
+import org.opensrp.repository.TemplateRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TemplateService {
+
+    private TemplateRepository templateRepository;
+
+    @Autowired
+    public void setTemplateRepository(TemplateRepository templateRepository) {
+        this.templateRepository = templateRepository;
+    }
+
+    public TemplateRepository getTemplateRepository() {
+        return templateRepository;
+    }
+
+    public Template getTemplateByTemplateId(int templateId) {
+        return getTemplateRepository().getTemplateByTemplateId(templateId);
+    }
+
+    public Template addOrUpdateTemplate(Template template) {
+        if (template.getTemplateId() == null) {
+            throw new IllegalArgumentException("Identifier not specified");
+        }
+
+        if (getTemplateRepository().getTemplateByTemplateId(template.getTemplateId()) != null) {
+            getTemplateRepository().update(template);
+        } else {
+            getTemplateRepository().add(template);
+        }
+        return template;
+    }
+
+}

From d22e2b33a3b36992e56864be23da01cda54a154b Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 14 Sep 2021 07:11:48 +0300
Subject: [PATCH 05/47] Add Repository and mapper classes for plan processing
 status

---
 .../PlanProcessingStatusRepository.java       |  10 ++
 .../PlanProcessingStatusRepositoryImpl.java   | 115 ++++++++++++++++++
 .../postgres/TemplateRepositoryImpl.java      |   1 -
 .../CustomPlanProcessingStatusMapper.java     |  14 +++
 .../xml/CustomPlanProcessingStatusMapper.xml  |  49 ++++++++
 5 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomPlanProcessingStatusMapper.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml

diff --git a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
new file mode 100644
index 000000000..601f64c73
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
@@ -0,0 +1,10 @@
+package org.opensrp.repository;
+
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+
+public interface PlanProcessingStatusRepository extends BaseRepository<PlanProcessingStatus> {
+
+    PlanProcessingStatus getByPrimaryKey(Long id);
+
+    PlanProcessingStatus getByEventId(Long eventId);
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
new file mode 100644
index 000000000..2007b3f2e
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
@@ -0,0 +1,115 @@
+package org.opensrp.repository.postgres;
+
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+import org.opensrp.domain.postgres.PlanProcessingStatusExample;
+import org.opensrp.repository.PlanProcessingStatusRepository;
+import org.opensrp.repository.postgres.mapper.custom.CustomPlanProcessingStatusMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class PlanProcessingStatusRepositoryImpl extends  BaseRepositoryImpl<PlanProcessingStatus> implements PlanProcessingStatusRepository {
+
+    @Autowired
+    private CustomPlanProcessingStatusMapper planProcessingStatusMapper;
+
+    @Override
+    public PlanProcessingStatus get(String id) {
+        return null;
+    }
+
+    @Override
+    public void add(PlanProcessingStatus planProcessingStatus) {
+        if (planProcessingStatus == null) {
+            return;
+        }
+        if (getUniqueField(planProcessingStatus) == null) {
+            return;
+        }
+
+        if (retrievePrimaryKey(planProcessingStatus) != null) {
+            return; // planProcessingStatus already added
+        }
+
+        planProcessingStatusMapper.insertSelective(planProcessingStatus);
+    }
+
+    @Override
+    public void update(PlanProcessingStatus planProcessingStatus) {
+        if (planProcessingStatus == null) {
+            return;
+        }
+        if (getUniqueField(planProcessingStatus) == null) {
+            return;
+        }
+
+        Long id = retrievePrimaryKey(planProcessingStatus);
+        if ( id == null) {
+            return; // planProcessingStatus does not exist
+        }
+
+        planProcessingStatusMapper.updateByPrimaryKey(planProcessingStatus);
+    }
+
+    @Override
+    public List<PlanProcessingStatus> getAll() {
+        PlanProcessingStatusExample planProcessingStatusExample = new PlanProcessingStatusExample();
+        planProcessingStatusExample.createCriteria();
+        List<PlanProcessingStatus> pgPlanProcessingStatuses = planProcessingStatusMapper.selectMany(planProcessingStatusExample, 0,
+                DEFAULT_FETCH_SIZE);
+        return pgPlanProcessingStatuses;
+    }
+
+    @Override
+    public void safeRemove(PlanProcessingStatus planProcessingStatus) {
+        if (planProcessingStatus == null) {
+            return;
+        }
+
+        Long id = retrievePrimaryKey(planProcessingStatus);
+        if (id == null) {
+            return;
+        }
+
+        planProcessingStatusMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public PlanProcessingStatus getByPrimaryKey(Long id) {
+        if (id == null) {
+            return null;
+        }
+        PlanProcessingStatusExample example = new PlanProcessingStatusExample();
+        example.createCriteria().andIdEqualTo(id);
+        List<PlanProcessingStatus> templates = planProcessingStatusMapper.selectByExample(example);
+        return templates.isEmpty() ? null : templates.get(0);
+    }
+
+    @Override
+    public PlanProcessingStatus getByEventId(Long eventId) {
+        if (eventId == null) {
+            return null;
+        }
+        PlanProcessingStatusExample example = new PlanProcessingStatusExample();
+        example.createCriteria().andEventIdEqualTo(eventId);
+        List<PlanProcessingStatus> templates = planProcessingStatusMapper.selectByExample(example);
+        return templates.isEmpty() ? null : templates.get(0);
+    }
+
+    @Override
+    protected Long retrievePrimaryKey(PlanProcessingStatus planProcessingStatus) {
+        Object uniqueId = getUniqueField(planProcessingStatus);
+        if (uniqueId == null) {
+            return null;
+        }
+
+        return (Long) uniqueId;
+    }
+
+    @Override
+    protected Object getUniqueField(PlanProcessingStatus planProcessingStatus) {
+        return planProcessingStatus == null ? null : planProcessingStatus.getId();
+    }
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
index 5cc6715fc..d3dbeb57e 100644
--- a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -1,7 +1,6 @@
 package org.opensrp.repository.postgres;
 
 import org.apache.commons.lang.NotImplementedException;
-import org.apache.commons.lang3.StringUtils;
 import org.opensrp.domain.Template;
 import org.opensrp.domain.postgres.TemplateExample;
 import org.opensrp.repository.TemplateRepository;
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomPlanProcessingStatusMapper.java b/src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomPlanProcessingStatusMapper.java
new file mode 100644
index 000000000..cdd83fefd
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/CustomPlanProcessingStatusMapper.java
@@ -0,0 +1,14 @@
+package org.opensrp.repository.postgres.mapper.custom;
+
+import org.apache.ibatis.annotations.Param;
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+import org.opensrp.domain.postgres.PlanProcessingStatusExample;
+import org.opensrp.repository.postgres.mapper.PlanProcessingStatusMapper;
+
+import java.util.List;
+
+public interface CustomPlanProcessingStatusMapper extends PlanProcessingStatusMapper {
+
+    List<PlanProcessingStatus> selectMany(@Param("example") PlanProcessingStatusExample templateExample,
+                              @Param("offset") int offset, @Param("limit") int limit);
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml
new file mode 100644
index 000000000..a08b2f02e
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.opensrp.repository.postgres.mapper.custom.PlanProcessingStatus">
+
+    <sql id="Example_Where_Clause">
+        <where>
+            <foreach collection="example.oredCriteria" item="criteria" separator="or">
+                <if test="criteria.valid">
+                    <trim prefix="(" prefixOverrides="and" suffix=")">
+                        <foreach collection="criteria.criteria" item="criterion">
+                            <choose>
+                                <when test="criterion.noValue">
+                                    and ${criterion.condition}
+                                </when>
+                                <when test="criterion.singleValue">
+                                    and ${criterion.condition} #{criterion.value}
+                                </when>
+                                <when test="criterion.betweenValue">
+                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                                </when>
+                                <when test="criterion.listValue">
+                                    and ${criterion.condition}
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                        #{listItem}
+                                    </foreach>
+                                </when>
+                            </choose>
+                        </foreach>
+                    </trim>
+                </if>
+            </foreach>
+        </where>
+    </sql>
+    <select id="selectMany"
+            resultMap="org.opensrp.repository.postgres.mapper.PlanProcessingStatus.BaseResultMap">
+        select
+        <include
+                refid="org.opensrp.repository.postgres.mapper.PlanProcessingStatus.Base_Column_List" />
+        from team.practitioner_role pr
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause" />
+        </if>
+        <if test="example.orderByClause != null">
+            order by pr.${example.orderByClause}
+        </if>
+        LIMIT #{limit} OFFSET #{offset}
+    </select>
+
+</mapper>
\ No newline at end of file

From bfa643b90c647f2aa4b3fb300fb1813bb353f9b7 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 14 Sep 2021 07:21:46 +0300
Subject: [PATCH 06/47] Add plan processing status service

---
 .../service/PlanProcessingStatusService.java  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/main/java/org/opensrp/service/PlanProcessingStatusService.java

diff --git a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
new file mode 100644
index 000000000..e0f41fa77
--- /dev/null
+++ b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
@@ -0,0 +1,39 @@
+package org.opensrp.service;
+
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+import org.opensrp.repository.PlanProcessingStatusRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PlanProcessingStatusService {
+
+    private PlanProcessingStatusRepository planProcessingStatusRepository;
+
+    @Autowired
+    public void setPlanProcessingStatusRepository(PlanProcessingStatusRepository planProcessingStatusRepository) {
+        this.planProcessingStatusRepository = planProcessingStatusRepository;
+    }
+
+    public PlanProcessingStatusRepository getPlanProcessingStatusRepository() {
+        return planProcessingStatusRepository;
+    }
+
+    public PlanProcessingStatus getTemplateByTemplateId(Long eventId) {
+        return getPlanProcessingStatusRepository().getByEventId(eventId);
+    }
+
+    public PlanProcessingStatus addOrUpdatePlanProcessingStatus(PlanProcessingStatus planProcessingStatus) {
+        if (planProcessingStatus.getEventId() == null) {
+            throw new IllegalArgumentException("Event id not specified");
+        }
+
+        if (getPlanProcessingStatusRepository().getByEventId(planProcessingStatus.getEventId()) != null) {
+            getPlanProcessingStatusRepository().update(planProcessingStatus);
+        } else {
+            getPlanProcessingStatusRepository().add(planProcessingStatus);
+        }
+        return planProcessingStatus;
+    }
+
+}

From 0c3276fa1ae15bfd3fef9dc95b088f482cb0bcb4 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 22 Sep 2021 06:24:38 +0300
Subject: [PATCH 07/47] Add method for retrieving processing status by status
 value

---
 .../repository/PlanProcessingStatusRepository.java    |  4 ++++
 .../postgres/PlanProcessingStatusRepositoryImpl.java  | 11 +++++++++++
 .../opensrp/service/PlanProcessingStatusService.java  |  8 +++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
index 601f64c73..fdb851d89 100644
--- a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
+++ b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
@@ -2,9 +2,13 @@
 
 import org.opensrp.domain.postgres.PlanProcessingStatus;
 
+import java.util.List;
+
 public interface PlanProcessingStatusRepository extends BaseRepository<PlanProcessingStatus> {
 
     PlanProcessingStatus getByPrimaryKey(Long id);
 
     PlanProcessingStatus getByEventId(Long eventId);
+
+    List<PlanProcessingStatus> getByStatus(Integer status);
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
index 2007b3f2e..4a67d6542 100644
--- a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
@@ -98,6 +98,17 @@ public PlanProcessingStatus getByEventId(Long eventId) {
         return templates.isEmpty() ? null : templates.get(0);
     }
 
+    @Override
+    public List<PlanProcessingStatus>  getByStatus(Integer status) {
+        if (status == null) {
+            return null;
+        }
+        PlanProcessingStatusExample example = new PlanProcessingStatusExample();
+        example.createCriteria().andStatusEqualTo(status);
+
+        return planProcessingStatusMapper.selectByExample(example);
+    }
+
     @Override
     protected Long retrievePrimaryKey(PlanProcessingStatus planProcessingStatus) {
         Object uniqueId = getUniqueField(planProcessingStatus);
diff --git a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
index e0f41fa77..d2524d415 100644
--- a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
+++ b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
@@ -5,6 +5,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class PlanProcessingStatusService {
 
@@ -19,7 +21,7 @@ public PlanProcessingStatusRepository getPlanProcessingStatusRepository() {
         return planProcessingStatusRepository;
     }
 
-    public PlanProcessingStatus getTemplateByTemplateId(Long eventId) {
+    public PlanProcessingStatus getProcessingStatusByEventId(Long eventId) {
         return getPlanProcessingStatusRepository().getByEventId(eventId);
     }
 
@@ -36,4 +38,8 @@ public PlanProcessingStatus addOrUpdatePlanProcessingStatus(PlanProcessingStatus
         return planProcessingStatus;
     }
 
+    public List<PlanProcessingStatus> getProcessingStatusByStatus(Integer status) {
+        return getPlanProcessingStatusRepository().getByStatus(status);
+    }
+
 }

From e1950dfc287429c3f7af77428b8adb532c80cd8e Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 22 Sep 2021 06:47:13 +0300
Subject: [PATCH 08/47] Add method for retrieving event by database id

---
 .../java/org/opensrp/repository/EventsRepository.java |  2 ++
 .../repository/postgres/EventsRepositoryImpl.java     | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/org/opensrp/repository/EventsRepository.java b/src/main/java/org/opensrp/repository/EventsRepository.java
index 91db455f3..423d6cbcb 100644
--- a/src/main/java/org/opensrp/repository/EventsRepository.java
+++ b/src/main/java/org/opensrp/repository/EventsRepository.java
@@ -104,5 +104,7 @@ Pair<List<String>, Long> findIdsByEventType(String eventType, boolean isDeleted,
 	 * @return true if exists else false
 	 */
 	boolean checkEventExists(@NonNull String caseNumber, @NonNull String flag);
+
+	Event findByDbId(Long id);
 	
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
index 40995f31e..e9e7cd870 100644
--- a/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
@@ -721,4 +721,15 @@ public List<QuestionnaireResponse> findEventsByJurisdictionIdAndPlan(String juri
 	public boolean checkEventExists(@NonNull String caseNumber, @NonNull String flag) {
 		return eventMapper.selectCaseTriggeredEventExists(caseNumber, flag);
 	}
+
+	@Override
+	public Event findByDbId(Long id) {
+		if (id == null) {
+			return null;
+		}
+		EventMetadataExample example = new EventMetadataExample();
+		example.createCriteria().andIdEqualTo(id);
+		List<Event> events = convert(eventMetadataMapper.selectMany(example));
+		return events != null && !events.isEmpty() ? events.get(0) : null;
+	}
 }

From 7c45475218b943d472e196bad29790fe4292cfa0 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 22 Sep 2021 06:54:11 +0300
Subject: [PATCH 09/47] Add service method for retrieving event by database id

---
 src/main/java/org/opensrp/repository/EventsRepository.java | 2 +-
 .../opensrp/repository/postgres/EventsRepositoryImpl.java  | 7 +++++--
 src/main/java/org/opensrp/service/EventService.java        | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/EventsRepository.java b/src/main/java/org/opensrp/repository/EventsRepository.java
index 423d6cbcb..8ede00588 100644
--- a/src/main/java/org/opensrp/repository/EventsRepository.java
+++ b/src/main/java/org/opensrp/repository/EventsRepository.java
@@ -105,6 +105,6 @@ Pair<List<String>, Long> findIdsByEventType(String eventType, boolean isDeleted,
 	 */
 	boolean checkEventExists(@NonNull String caseNumber, @NonNull String flag);
 
-	Event findByDbId(Long id);
+	Event findByDbId(Long id, boolean includeArchived);
 	
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
index e9e7cd870..34c88985a 100644
--- a/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
@@ -723,12 +723,15 @@ public boolean checkEventExists(@NonNull String caseNumber, @NonNull String flag
 	}
 
 	@Override
-	public Event findByDbId(Long id) {
+	public Event findByDbId(Long id, boolean includeArchived) {
 		if (id == null) {
 			return null;
 		}
 		EventMetadataExample example = new EventMetadataExample();
-		example.createCriteria().andIdEqualTo(id);
+		Criteria criteria = example.createCriteria().andIdEqualTo(id);
+		if (!includeArchived) {
+			criteria.andDateDeletedIsNull();
+		}
 		List<Event> events = convert(eventMetadataMapper.selectMany(example));
 		return events != null && !events.isEmpty() ? events.get(0) : null;
 	}
diff --git a/src/main/java/org/opensrp/service/EventService.java b/src/main/java/org/opensrp/service/EventService.java
index 31448fd8e..422d77974 100644
--- a/src/main/java/org/opensrp/service/EventService.java
+++ b/src/main/java/org/opensrp/service/EventService.java
@@ -702,4 +702,8 @@ public boolean checkIfCaseTriggeredEventExists(@NonNull Event event){
 		return false;
 	}
 
+	public Event findByDbId(Long id, boolean includeArchived) {
+		return allEvents.findByDbId(id, includeArchived);
+	}
+
 }

From ee8d3db6c8f77aaa22a65cd0927679630b965ff2 Mon Sep 17 00:00:00 2001
From: LZRS <12814349+LZRS@users.noreply.github.com>
Date: Tue, 5 Oct 2021 11:10:42 +0300
Subject: [PATCH 10/47] add template getAll with limit to get latest version

---
 .../repository/TemplateRepository.java        |  4 ++++
 .../postgres/TemplateRepositoryImpl.java      |  7 +++++++
 .../custom/xml/CustomTemplateMapper.xml       | 19 ++++++++++++-------
 .../org/opensrp/service/TemplateService.java  |  8 ++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/TemplateRepository.java b/src/main/java/org/opensrp/repository/TemplateRepository.java
index 3a69bf71b..189d4f12f 100644
--- a/src/main/java/org/opensrp/repository/TemplateRepository.java
+++ b/src/main/java/org/opensrp/repository/TemplateRepository.java
@@ -2,6 +2,8 @@
 
 import org.opensrp.domain.Template;
 
+import java.util.List;
+
 public interface TemplateRepository extends BaseRepository<Template> {
 
     Template getByPrimaryKey(Long id);
@@ -9,4 +11,6 @@ public interface TemplateRepository extends BaseRepository<Template> {
     org.opensrp.domain.postgres.Template  getTemplate(int templateId);
 
     Template getTemplateByTemplateId(int id);
+
+    List<Template> getAll(int limit);
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
index d3dbeb57e..2904f38ae 100644
--- a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -70,6 +70,13 @@ public List<Template> getAll() {
         return convert(pgTemplateList);
     }
 
+    @Override
+    public List<Template> getAll(int limit) {
+        TemplateExample templateExample = new TemplateExample();
+        List<org.opensrp.domain.postgres.Template> pgTemplateList = templateMapper.selectMany(templateExample, 0, limit);
+        return convert(pgTemplateList);
+    }
+
     @Override
     public void safeRemove(Template template) {
         if (template == null) {
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml
index 53c31140a..e76152741 100644
--- a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomTemplateMapper.xml
@@ -35,15 +35,20 @@
             resultMap="org.opensrp.repository.postgres.mapper.TemplateMapper.BaseResultMap">
         select
         <include
-                refid="org.opensrp.repository.postgres.mapper.TemplateMapper.Base_Column_List" />
-        from team.practitioner_role pr
+                refid="org.opensrp.repository.postgres.mapper.TemplateMapper.Base_Column_List"/>
+        from core.template ct
         <if test="_parameter != null">
-            <include refid="Example_Where_Clause" />
-        </if>
-        <if test="example.orderByClause != null">
-            order by pr.${example.orderByClause}
+            <include refid="Example_Where_Clause"/>
         </if>
+        <choose>
+            <when test="example.orderByClause != null">
+                order by ct.${example.orderByClause}
+            </when>
+            <otherwise>
+                ORDER BY ct.version DESC, ct.id DESC
+            </otherwise>
+        </choose>
         LIMIT #{limit} OFFSET #{offset}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/java/org/opensrp/service/TemplateService.java b/src/main/java/org/opensrp/service/TemplateService.java
index a7082c85c..5faf74265 100644
--- a/src/main/java/org/opensrp/service/TemplateService.java
+++ b/src/main/java/org/opensrp/service/TemplateService.java
@@ -5,6 +5,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class TemplateService {
 
@@ -19,6 +21,12 @@ public TemplateRepository getTemplateRepository() {
         return templateRepository;
     }
 
+    public List<Template> getAll(){
+        return templateRepository.getAll();
+    }
+
+    public List<Template> getAll(int limit) { return templateRepository.getAll(limit);}
+
     public Template getTemplateByTemplateId(int templateId) {
         return getTemplateRepository().getTemplateByTemplateId(templateId);
     }

From a7d6a76a15a47b9bb2a244112ab524f076e90e67 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 6 Oct 2021 10:54:47 +0300
Subject: [PATCH 11/47] Update custom plan processing status mapper

---
 .../custom/xml/CustomPlanProcessingStatusMapper.xml    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml
index a08b2f02e..9ce37e494 100644
--- a/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/custom/xml/CustomPlanProcessingStatusMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.opensrp.repository.postgres.mapper.custom.PlanProcessingStatus">
+<mapper namespace="org.opensrp.repository.postgres.mapper.custom.CustomPlanProcessingStatusMapper">
 
     <sql id="Example_Where_Clause">
         <where>
@@ -32,16 +32,16 @@
         </where>
     </sql>
     <select id="selectMany"
-            resultMap="org.opensrp.repository.postgres.mapper.PlanProcessingStatus.BaseResultMap">
+            resultMap="org.opensrp.repository.postgres.mapper.PlanProcessingStatusMapper.BaseResultMap">
         select
         <include
-                refid="org.opensrp.repository.postgres.mapper.PlanProcessingStatus.Base_Column_List" />
-        from team.practitioner_role pr
+                refid="org.opensrp.repository.postgres.mapper.PlanProcessingStatusMapper.Base_Column_List" />
+        from core.plan_processing_status pps
         <if test="_parameter != null">
             <include refid="Example_Where_Clause" />
         </if>
         <if test="example.orderByClause != null">
-            order by pr.${example.orderByClause}
+            order by pps.${example.orderByClause}
         </if>
         LIMIT #{limit} OFFSET #{offset}
     </select>

From af79ab2316737bdd048bc3c3258d54a258e656ae Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 6 Oct 2021 11:11:28 +0300
Subject: [PATCH 12/47] Add logic for getting plan template

---
 .../java/org/opensrp/service/PlanService.java | 48 +++++++++++++++++++
 .../opensrp/util/constants/PlanConstants.java | 15 ++++++
 2 files changed, 63 insertions(+)
 create mode 100644 src/main/java/org/opensrp/util/constants/PlanConstants.java

diff --git a/src/main/java/org/opensrp/service/PlanService.java b/src/main/java/org/opensrp/service/PlanService.java
index b588b7024..bc53f2632 100755
--- a/src/main/java/org/opensrp/service/PlanService.java
+++ b/src/main/java/org/opensrp/service/PlanService.java
@@ -1,6 +1,7 @@
 package org.opensrp.service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -11,6 +12,9 @@
 import org.opensrp.domain.postgres.PractitionerRole;
 import org.opensrp.repository.PlanRepository;
 import org.opensrp.search.PlanSearchBean;
+import org.opensrp.util.constants.PlanConstants;
+import org.smartregister.domain.Action;
+import org.smartregister.domain.Event;
 import org.smartregister.domain.PlanDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CachePut;
@@ -293,4 +297,48 @@ public Long countPlansByUsernameAndServerVersion(String username, long serverVer
 		}
 		return 0l;
 	}
+
+	public Integer getPlanTemplate(Event event) {
+		String historicalIntervention = getHistoricalIntervention(Collections.singletonList(event.getLocationId()));
+		Integer planTemplateId = null;
+		if (event == null || event.getDetails() == null) {
+			return null;
+		}
+		if (PlanConstants.A1.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))
+				|| PlanConstants.A2.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))) {
+			planTemplateId = 1;
+		} else if ((PlanConstants.B1.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))
+				|| PlanConstants.B2.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS)))
+				&& PlanConstants.LOCAL.equalsIgnoreCase(event.getDetails().get(PlanConstants.CASE_CLASSIFICATION))
+		) {
+			if (PlanConstants.BEDNET_DISTRIBUTION.equalsIgnoreCase(historicalIntervention)) {
+				planTemplateId = 1;
+			} else if (PlanConstants.IRS.equalsIgnoreCase(historicalIntervention)) {
+				planTemplateId = 1;
+			}
+		} else if (PlanConstants.B1.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))) {
+			planTemplateId = 2;
+		}
+		return planTemplateId;
+	}
+
+	public String getHistoricalIntervention(List<String> operationalAreaIds) {
+		String historicalIntervention = null;
+		List<PlanDefinition> planList = getPlansByServerVersionAndOperationalArea(0, operationalAreaIds, false);
+		for (PlanDefinition plan: planList ) {
+			for (Action action: plan.getActions() ) {
+				if (action.getCode() != null) {
+					if (PlanConstants.BEDNET_DISTRIBUTION.equalsIgnoreCase(action.getCode())) {
+						historicalIntervention = PlanConstants.BEDNET_DISTRIBUTION;
+						break;
+					} else if (PlanConstants.IRS.equalsIgnoreCase(action.getCode())) {
+						historicalIntervention = PlanConstants.IRS;
+						break;
+					}
+				}
+			}
+		}
+		return historicalIntervention != null ? historicalIntervention : PlanConstants.BEDNET_DISTRIBUTION;
+	}
+
 }
diff --git a/src/main/java/org/opensrp/util/constants/PlanConstants.java b/src/main/java/org/opensrp/util/constants/PlanConstants.java
new file mode 100644
index 000000000..b4f70616b
--- /dev/null
+++ b/src/main/java/org/opensrp/util/constants/PlanConstants.java
@@ -0,0 +1,15 @@
+package org.opensrp.util.constants;
+
+public interface PlanConstants {
+
+    String A1 = "A1";
+    String A2 = "A2";
+    String B1 = "B1";
+    String B2 = "B2";
+    String IRS = "IRS";
+    String LOCAL = "local";
+    String FOCUS_STATUS = "focus_status";
+    String CASE_CLASSIFICATION = "case_classification";
+    String BEDNET_DISTRIBUTION = "Bednet Distribution";
+
+}

From a381292e7c1fe61af7ebf124a569a157a77d8a36 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 6 Oct 2021 18:37:48 +0300
Subject: [PATCH 13/47] Add validation for case details event

---
 src/main/java/org/opensrp/service/PlanService.java     | 10 ++++++++++
 .../java/org/opensrp/util/constants/PlanConstants.java |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/org/opensrp/service/PlanService.java b/src/main/java/org/opensrp/service/PlanService.java
index bc53f2632..1ae64a324 100755
--- a/src/main/java/org/opensrp/service/PlanService.java
+++ b/src/main/java/org/opensrp/service/PlanService.java
@@ -341,4 +341,14 @@ public String getHistoricalIntervention(List<String> operationalAreaIds) {
 		return historicalIntervention != null ? historicalIntervention : PlanConstants.BEDNET_DISTRIBUTION;
 	}
 
+	public boolean validateCaseDetailsEvent (Event caseDetailsEvent) {
+		return caseDetailsEvent != null
+				&& StringUtils.isNotEmpty(caseDetailsEvent.getId())
+				&& caseDetailsEvent.getDetails() !=null
+				&& StringUtils.isNotEmpty(caseDetailsEvent.getDetails().get(PlanConstants.CASE_NUMBER))
+				&& StringUtils.isNotEmpty(caseDetailsEvent.getDetails().get(PlanConstants.FOCUS_ID))
+				&& StringUtils.isNotEmpty(caseDetailsEvent.getDetails().get(PlanConstants.FOCUS_STATUS))
+				&& StringUtils.isNotEmpty(caseDetailsEvent.getDetails().get(PlanConstants.FLAG));
+	}
+
 }
diff --git a/src/main/java/org/opensrp/util/constants/PlanConstants.java b/src/main/java/org/opensrp/util/constants/PlanConstants.java
index b4f70616b..1bb840afa 100644
--- a/src/main/java/org/opensrp/util/constants/PlanConstants.java
+++ b/src/main/java/org/opensrp/util/constants/PlanConstants.java
@@ -8,8 +8,11 @@ public interface PlanConstants {
     String B2 = "B2";
     String IRS = "IRS";
     String LOCAL = "local";
+    String FOCUS_ID = "focus_id";
+    String CASE_NUMBER = "case_number";
     String FOCUS_STATUS = "focus_status";
     String CASE_CLASSIFICATION = "case_classification";
     String BEDNET_DISTRIBUTION = "Bednet Distribution";
+    String FLAG = "flag";
 
 }

From af32ebeb276c8d50d2de88c8368e3a499cb62e5f Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 7 Oct 2021 07:45:34 +0300
Subject: [PATCH 14/47] Update constants

---
 src/main/java/org/opensrp/util/constants/PlanConstants.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opensrp/util/constants/PlanConstants.java b/src/main/java/org/opensrp/util/constants/PlanConstants.java
index 1bb840afa..c0eeb031f 100644
--- a/src/main/java/org/opensrp/util/constants/PlanConstants.java
+++ b/src/main/java/org/opensrp/util/constants/PlanConstants.java
@@ -9,8 +9,11 @@ public interface PlanConstants {
     String IRS = "IRS";
     String LOCAL = "local";
     String FOCUS_ID = "focus_id";
-    String CASE_NUMBER = "case_number";
+    String FOCUS_NAME = "focus_name";
     String FOCUS_STATUS = "focus_status";
+    String CASE_NUMBER = "case_number";
+    String PATIENT_NAME = "patient_name";
+    String PATIENT_SURNAME = "patient_surname";
     String CASE_CLASSIFICATION = "case_classification";
     String BEDNET_DISTRIBUTION = "Bednet Distribution";
     String FLAG = "flag";

From 92400e25f9ff357f87cbd11ede2b38943908a549 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 7 Oct 2021 07:45:59 +0300
Subject: [PATCH 15/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d9ef621fa..03e74f63e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.7-SNAPSHOT</version>
+	<version>2.12.8-ALPHA1-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 1c63cb076055fea1e1835ac4b1a183b2b2f2d530 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 7 Oct 2021 15:23:50 +0300
Subject: [PATCH 16/47] Add logic for updating plan rocessing status

---
 .../org/opensrp/repository/EventsRepository.java   |  2 ++
 .../repository/PlanProcessingStatusRepository.java |  2 ++
 .../repository/postgres/EventsRepositoryImpl.java  |  8 ++++++++
 .../PlanProcessingStatusRepositoryImpl.java        | 14 ++++++++++++++
 .../service/PlanProcessingStatusService.java       |  4 ++++
 .../constants/PlanProcessingStatusConstants.java   |  8 ++++++++
 6 files changed, 38 insertions(+)
 create mode 100644 src/main/java/org/opensrp/util/constants/PlanProcessingStatusConstants.java

diff --git a/src/main/java/org/opensrp/repository/EventsRepository.java b/src/main/java/org/opensrp/repository/EventsRepository.java
index 8ede00588..8ad0cdb6d 100644
--- a/src/main/java/org/opensrp/repository/EventsRepository.java
+++ b/src/main/java/org/opensrp/repository/EventsRepository.java
@@ -106,5 +106,7 @@ Pair<List<String>, Long> findIdsByEventType(String eventType, boolean isDeleted,
 	boolean checkEventExists(@NonNull String caseNumber, @NonNull String flag);
 
 	Event findByDbId(Long id, boolean includeArchived);
+
+	org.opensrp.domain.postgres.Event getDbEventByIdentifier(String identifier);
 	
 }
diff --git a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
index fdb851d89..e23e9fc64 100644
--- a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
+++ b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
@@ -11,4 +11,6 @@ public interface PlanProcessingStatusRepository extends BaseRepository<PlanProce
     PlanProcessingStatus getByEventId(Long eventId);
 
     List<PlanProcessingStatus> getByStatus(Integer status);
+
+    void updatePlanProcessingStatus(String eventIdentifier, int status);
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
index 34c88985a..c044fbc74 100644
--- a/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/EventsRepositoryImpl.java
@@ -735,4 +735,12 @@ public Event findByDbId(Long id, boolean includeArchived) {
 		List<Event> events = convert(eventMetadataMapper.selectMany(example));
 		return events != null && !events.isEmpty() ? events.get(0) : null;
 	}
+
+	@Override
+	public org.opensrp.domain.postgres.Event getDbEventByIdentifier(String identifier) {
+		if (StringUtils.isBlank(identifier)) {
+			return null;
+		}
+		return eventMetadataMapper.selectByDocumentId(identifier);
+	}
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
index 4a67d6542..ea392843a 100644
--- a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
@@ -1,7 +1,9 @@
 package org.opensrp.repository.postgres;
 
+import org.opensrp.domain.postgres.Event;
 import org.opensrp.domain.postgres.PlanProcessingStatus;
 import org.opensrp.domain.postgres.PlanProcessingStatusExample;
+import org.opensrp.repository.EventsRepository;
 import org.opensrp.repository.PlanProcessingStatusRepository;
 import org.opensrp.repository.postgres.mapper.custom.CustomPlanProcessingStatusMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,9 @@ public class PlanProcessingStatusRepositoryImpl extends  BaseRepositoryImpl<Plan
     @Autowired
     private CustomPlanProcessingStatusMapper planProcessingStatusMapper;
 
+    @Autowired
+    private EventsRepository allEvents;
+
     @Override
     public PlanProcessingStatus get(String id) {
         return null;
@@ -109,6 +114,15 @@ public List<PlanProcessingStatus>  getByStatus(Integer status) {
         return planProcessingStatusMapper.selectByExample(example);
     }
 
+    @Override
+    public void updatePlanProcessingStatus(String eventIdentifier, int status) {
+        Event pgEvent = allEvents.getDbEventByIdentifier(eventIdentifier);
+        PlanProcessingStatus processingStatus = new PlanProcessingStatus();
+        processingStatus.setStatus(status);
+        processingStatus.setEventId(pgEvent.getId());
+        add(processingStatus);
+    }
+
     @Override
     protected Long retrievePrimaryKey(PlanProcessingStatus planProcessingStatus) {
         Object uniqueId = getUniqueField(planProcessingStatus);
diff --git a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
index d2524d415..ef7de3221 100644
--- a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
+++ b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
@@ -42,4 +42,8 @@ public List<PlanProcessingStatus> getProcessingStatusByStatus(Integer status) {
         return getPlanProcessingStatusRepository().getByStatus(status);
     }
 
+    public void updatePlanProcessingStatus(String eventIdentifier, int status) {
+        getPlanProcessingStatusRepository().updatePlanProcessingStatus(eventIdentifier, status);
+    }
+
 }
diff --git a/src/main/java/org/opensrp/util/constants/PlanProcessingStatusConstants.java b/src/main/java/org/opensrp/util/constants/PlanProcessingStatusConstants.java
new file mode 100644
index 000000000..5571d4bd0
--- /dev/null
+++ b/src/main/java/org/opensrp/util/constants/PlanProcessingStatusConstants.java
@@ -0,0 +1,8 @@
+package org.opensrp.util.constants;
+
+public interface PlanProcessingStatusConstants {
+
+    int INITIAL = 0;
+    int PROCESSING = 1;
+    int COMPLETE = 2;
+}

From ea26d4760ca5edd1a31e7f7d03acfc9ffd1c417d Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 7 Oct 2021 18:21:42 +0300
Subject: [PATCH 17/47] Update method for updating plan processing status

---
 .../PlanProcessingStatusRepository.java         |  2 +-
 .../PlanProcessingStatusRepositoryImpl.java     | 17 ++++++++++++++---
 .../service/PlanProcessingStatusService.java    |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
index e23e9fc64..f266ee965 100644
--- a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
+++ b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
@@ -12,5 +12,5 @@ public interface PlanProcessingStatusRepository extends BaseRepository<PlanProce
 
     List<PlanProcessingStatus> getByStatus(Integer status);
 
-    void updatePlanProcessingStatus(String eventIdentifier, int status);
+    void updatePlanProcessingStatus(String eventIdentifier, String planIdentifier, int status);
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
index ea392843a..338707690 100644
--- a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
@@ -1,5 +1,6 @@
 package org.opensrp.repository.postgres;
 
+import org.apache.commons.lang.StringUtils;
 import org.opensrp.domain.postgres.Event;
 import org.opensrp.domain.postgres.PlanProcessingStatus;
 import org.opensrp.domain.postgres.PlanProcessingStatusExample;
@@ -20,6 +21,9 @@ public class PlanProcessingStatusRepositoryImpl extends  BaseRepositoryImpl<Plan
     @Autowired
     private EventsRepository allEvents;
 
+    @Autowired
+    private PlanRepositoryImpl planRepository;
+
     @Override
     public PlanProcessingStatus get(String id) {
         return null;
@@ -115,11 +119,18 @@ public List<PlanProcessingStatus>  getByStatus(Integer status) {
     }
 
     @Override
-    public void updatePlanProcessingStatus(String eventIdentifier, int status) {
-        Event pgEvent = allEvents.getDbEventByIdentifier(eventIdentifier);
+    public void updatePlanProcessingStatus(String eventIdentifier, String planIdentifier, int status) {
+
         PlanProcessingStatus processingStatus = new PlanProcessingStatus();
         processingStatus.setStatus(status);
-        processingStatus.setEventId(pgEvent.getId());
+        if (StringUtils.isNotBlank(eventIdentifier)) {
+            Event pgEvent = allEvents.getDbEventByIdentifier(eventIdentifier);
+            processingStatus.setEventId(pgEvent.getId());
+        }
+        if (StringUtils.isNotBlank(planIdentifier)){
+            Long planId = planRepository.retrievePrimaryKey(planIdentifier);
+            processingStatus.setPlanId(planId);
+        }
         add(processingStatus);
     }
 
diff --git a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
index ef7de3221..762af92fb 100644
--- a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
+++ b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
@@ -42,8 +42,8 @@ public List<PlanProcessingStatus> getProcessingStatusByStatus(Integer status) {
         return getPlanProcessingStatusRepository().getByStatus(status);
     }
 
-    public void updatePlanProcessingStatus(String eventIdentifier, int status) {
-        getPlanProcessingStatusRepository().updatePlanProcessingStatus(eventIdentifier, status);
+    public void updatePlanProcessingStatus(String eventIdentifier, String planIdentifier, int status) {
+        getPlanProcessingStatusRepository().updatePlanProcessingStatus(eventIdentifier, planIdentifier, status);
     }
 
 }

From 1ac8b31c377df2a7259d547b1549aa7ce805f4d9 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 7 Oct 2021 20:40:59 +0300
Subject: [PATCH 18/47] Refactor method for updating processing status

---
 .../PlanProcessingStatusRepository.java       |  4 +++-
 .../PlanProcessingStatusRepositoryImpl.java   | 20 ++++++++++++++-----
 .../service/PlanProcessingStatusService.java  |  9 +++++++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
index f266ee965..ef96abbd3 100644
--- a/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
+++ b/src/main/java/org/opensrp/repository/PlanProcessingStatusRepository.java
@@ -12,5 +12,7 @@ public interface PlanProcessingStatusRepository extends BaseRepository<PlanProce
 
     List<PlanProcessingStatus> getByStatus(Integer status);
 
-    void updatePlanProcessingStatus(String eventIdentifier, String planIdentifier, int status);
+    void addPlanProcessingStatus(String eventIdentifier, int status);
+
+    void updatePlanProcessingStatus(PlanProcessingStatus planProcessingStatus, String eventIdentifier, String planIdentifier, int status);
 }
diff --git a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
index 338707690..e07908512 100644
--- a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Repository
@@ -119,19 +120,28 @@ public List<PlanProcessingStatus>  getByStatus(Integer status) {
     }
 
     @Override
-    public void updatePlanProcessingStatus(String eventIdentifier, String planIdentifier, int status) {
-
+    public void addPlanProcessingStatus(String eventIdentifier, int status) {
+        Event pgEvent = allEvents.getDbEventByIdentifier(eventIdentifier);
         PlanProcessingStatus processingStatus = new PlanProcessingStatus();
         processingStatus.setStatus(status);
+        processingStatus.setEventId(pgEvent.getId());
+        add(processingStatus);
+    }
+
+    @Override
+    public void updatePlanProcessingStatus(PlanProcessingStatus planProcessingStatus, String eventIdentifier, String planIdentifier, int status) {
+
+        planProcessingStatus.setStatus(status);
+        planProcessingStatus.setDateEdited(new Date());
         if (StringUtils.isNotBlank(eventIdentifier)) {
             Event pgEvent = allEvents.getDbEventByIdentifier(eventIdentifier);
-            processingStatus.setEventId(pgEvent.getId());
+            planProcessingStatus.setEventId(pgEvent.getId());
         }
         if (StringUtils.isNotBlank(planIdentifier)){
             Long planId = planRepository.retrievePrimaryKey(planIdentifier);
-            processingStatus.setPlanId(planId);
+            planProcessingStatus.setPlanId(planId);
         }
-        add(processingStatus);
+        update(planProcessingStatus);
     }
 
     @Override
diff --git a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
index 762af92fb..12d265103 100644
--- a/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
+++ b/src/main/java/org/opensrp/service/PlanProcessingStatusService.java
@@ -42,8 +42,13 @@ public List<PlanProcessingStatus> getProcessingStatusByStatus(Integer status) {
         return getPlanProcessingStatusRepository().getByStatus(status);
     }
 
-    public void updatePlanProcessingStatus(String eventIdentifier, String planIdentifier, int status) {
-        getPlanProcessingStatusRepository().updatePlanProcessingStatus(eventIdentifier, planIdentifier, status);
+    public void addPlanProcessingStatus(String eventIdentifier, int status) {
+        getPlanProcessingStatusRepository().addPlanProcessingStatus(eventIdentifier, status);
+    }
+
+
+    public void updatePlanProcessingStatus(PlanProcessingStatus planProcessingStatus, String eventIdentifier, String planIdentifier, int status) {
+        getPlanProcessingStatusRepository().updatePlanProcessingStatus(planProcessingStatus, eventIdentifier, planIdentifier, status);
     }
 
 }

From 8b3225bb046b7a830d54a8b4bdefb6e7670b45a6 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Fri, 8 Oct 2021 08:29:20 +0300
Subject: [PATCH 19/47] Add plan template model Add type handler for template

---
 .../org/opensrp/domain/ActionTemplate.java    | 185 +++++++++++++++
 .../java/org/opensrp/domain/GoalTemplate.java |  51 ++++
 .../org/opensrp/domain/PeriodTemplate.java    |  26 ++
 .../java/org/opensrp/domain/PlanTemplate.java | 222 ++++++++++++++++++
 .../org/opensrp/domain/TargetTemplate.java    | 143 +++++++++++
 .../java/org/opensrp/domain/Template.java     |  19 +-
 .../org/opensrp/domain/postgres/Template.java |  42 ++--
 .../domain/postgres/TemplateExample.java      |  92 +++++---
 .../postgres/TemplateRepositoryImpl.java      |  10 +-
 .../postgres/handler/TemplateTypeHandler.java |  85 +++++++
 .../postgres/mapper/TemplateMapper.java       |  22 +-
 .../postgres/mapper/xml/TemplateMapper.xml    |  82 +++++--
 12 files changed, 886 insertions(+), 93 deletions(-)
 create mode 100644 src/main/java/org/opensrp/domain/ActionTemplate.java
 create mode 100644 src/main/java/org/opensrp/domain/GoalTemplate.java
 create mode 100644 src/main/java/org/opensrp/domain/PeriodTemplate.java
 create mode 100644 src/main/java/org/opensrp/domain/PlanTemplate.java
 create mode 100644 src/main/java/org/opensrp/domain/TargetTemplate.java
 create mode 100644 src/main/java/org/opensrp/repository/postgres/handler/TemplateTypeHandler.java

diff --git a/src/main/java/org/opensrp/domain/ActionTemplate.java b/src/main/java/org/opensrp/domain/ActionTemplate.java
new file mode 100644
index 000000000..c3bc5f329
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/ActionTemplate.java
@@ -0,0 +1,185 @@
+package org.opensrp.domain;
+
+import com.google.gson.annotations.SerializedName;
+import org.smartregister.domain.Condition;
+import org.smartregister.domain.DynamicValue;
+import org.smartregister.domain.Trigger;
+
+import java.io.Serializable;
+import java.util.Set;
+
+public class ActionTemplate  implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String identifier;
+    private int prefix;
+    private String title;
+    private String description;
+    private String code;
+    private PeriodTemplate timingPeriod;
+    private String reason;
+    private String goalId;
+    private ActionTemplate.SubjectConcept subjectCodableConcept;
+    private String taskTemplate;
+    private Set<Trigger> trigger;
+    private Set<Condition> condition;
+    private String definitionUri;
+    private Set<DynamicValue> dynamicValue;
+    private ActionTemplate.ActionType type;
+
+    public ActionTemplate() {
+        this.type = ActionTemplate.ActionType.CREATE;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public void setPrefix(int prefix) {
+        this.prefix = prefix;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public void setTimingPeriod(PeriodTemplate timingPeriod) {
+        this.timingPeriod = timingPeriod;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public void setGoalId(String goalId) {
+        this.goalId = goalId;
+    }
+
+    public void setSubjectCodableConcept(ActionTemplate.SubjectConcept subjectCodableConcept) {
+        this.subjectCodableConcept = subjectCodableConcept;
+    }
+
+    public void setTaskTemplate(String taskTemplate) {
+        this.taskTemplate = taskTemplate;
+    }
+
+    public void setTrigger(Set<Trigger> trigger) {
+        this.trigger = trigger;
+    }
+
+    public void setCondition(Set<Condition> condition) {
+        this.condition = condition;
+    }
+
+    public void setDefinitionUri(String definitionUri) {
+        this.definitionUri = definitionUri;
+    }
+
+    public void setDynamicValue(Set<DynamicValue> dynamicValue) {
+        this.dynamicValue = dynamicValue;
+    }
+
+    public void setType(ActionTemplate.ActionType type) {
+        this.type = type;
+    }
+
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    public int getPrefix() {
+        return this.prefix;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public PeriodTemplate getTimingPeriod() {
+        return this.timingPeriod;
+    }
+
+    public String getReason() {
+        return this.reason;
+    }
+
+    public String getGoalId() {
+        return this.goalId;
+    }
+
+    public ActionTemplate.SubjectConcept getSubjectCodableConcept() {
+        return this.subjectCodableConcept;
+    }
+
+    public String getTaskTemplate() {
+        return this.taskTemplate;
+    }
+
+    public Set<Trigger> getTrigger() {
+        return this.trigger;
+    }
+
+    public Set<Condition> getCondition() {
+        return this.condition;
+    }
+
+    public String getDefinitionUri() {
+        return this.definitionUri;
+    }
+
+    public Set<DynamicValue> getDynamicValue() {
+        return this.dynamicValue;
+    }
+
+    public ActionTemplate.ActionType getType() {
+        return this.type;
+    }
+
+    public static class SubjectConcept implements Serializable {
+        private String text;
+
+        public SubjectConcept(String text) {
+            this.text = text;
+        }
+
+        public SubjectConcept() {
+        }
+
+        public String getText() {
+            return this.text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+    }
+
+    public static enum ActionType {
+        @SerializedName("create")
+        CREATE,
+        @SerializedName("update")
+        UPDATE,
+        @SerializedName("remove")
+        REMOVE,
+        @SerializedName("fire-event")
+        FIRE_EVENT;
+
+        private ActionType() {
+        }
+    }
+}
diff --git a/src/main/java/org/opensrp/domain/GoalTemplate.java b/src/main/java/org/opensrp/domain/GoalTemplate.java
new file mode 100644
index 000000000..9bac354a3
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/GoalTemplate.java
@@ -0,0 +1,51 @@
+package org.opensrp.domain;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class GoalTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String id;
+    private String description;
+    private String priority;
+    @SerializedName("target")
+    private List<TargetTemplate> targets;
+
+    public GoalTemplate() {
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getPriority() {
+        return this.priority;
+    }
+
+    public void setPriority(String priority) {
+        this.priority = priority;
+    }
+
+    public List<TargetTemplate> getTargets() {
+        return this.targets;
+    }
+
+    public void setTargets(List<TargetTemplate> targets) {
+        this.targets = targets;
+    }
+}
diff --git a/src/main/java/org/opensrp/domain/PeriodTemplate.java b/src/main/java/org/opensrp/domain/PeriodTemplate.java
new file mode 100644
index 000000000..b48d81eb1
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/PeriodTemplate.java
@@ -0,0 +1,26 @@
+package org.opensrp.domain;
+
+import java.io.Serializable;
+
+public class PeriodTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String start;
+    private String end;
+
+    public String getStart() {
+        return start;
+    }
+
+    public void setStart(String start) {
+        this.start = start;
+    }
+
+    public String getEnd() {
+        return end;
+    }
+
+    public void setEnd(String end) {
+        this.end = end;
+    }
+}
diff --git a/src/main/java/org/opensrp/domain/PlanTemplate.java b/src/main/java/org/opensrp/domain/PlanTemplate.java
new file mode 100644
index 000000000..e0e6612c9
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/PlanTemplate.java
@@ -0,0 +1,222 @@
+package org.opensrp.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+import org.smartregister.domain.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class PlanTemplate  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @JsonProperty
+    private String identifier;
+    @JsonProperty
+    private String description;
+    @JsonProperty
+    private String version;
+    @JsonProperty
+    private String name;
+    @JsonProperty
+    private String title;
+    @JsonProperty
+    private String status;
+    @JsonProperty
+    private String date;
+    @JsonProperty
+    private PeriodTemplate effectivePeriod;
+    @JsonProperty
+    private List<PlanDefinition.UseContext> useContext;
+    @JsonProperty
+    private List<Jurisdiction> jurisdiction;
+    private Long serverVersion;
+    @JsonProperty
+    @SerializedName("goal")
+    private List<GoalTemplate> goals;
+    @JsonProperty
+    @SerializedName("action")
+    private List<ActionTemplate> actions;
+    @JsonProperty
+    private boolean experimental;
+
+    public PlanTemplate() {
+    }
+
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getVersion() {
+        return this.version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getDate() {
+        return this.date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public PeriodTemplate getEffectivePeriod() {
+        return this.effectivePeriod;
+    }
+
+    public void setEffectivePeriod(PeriodTemplate effectivePeriod) {
+        this.effectivePeriod = effectivePeriod;
+    }
+
+    public List<PlanDefinition.UseContext> getUseContext() {
+        return this.useContext;
+    }
+
+    public void setUseContext(List<PlanDefinition.UseContext> useContext) {
+        this.useContext = useContext;
+    }
+
+    public List<Jurisdiction> getJurisdiction() {
+        return this.jurisdiction;
+    }
+
+    public void setJurisdiction(List<Jurisdiction> jurisdiction) {
+        this.jurisdiction = jurisdiction;
+    }
+
+    public List<GoalTemplate> getGoals() {
+        return this.goals;
+    }
+
+    public void setGoals(List<GoalTemplate> goals) {
+        this.goals = goals;
+    }
+
+    public List<ActionTemplate> getActions() {
+        return this.actions;
+    }
+
+    public void setActions(List<ActionTemplate> actions) {
+        this.actions = actions;
+    }
+
+    public Long getServerVersion() {
+        return this.serverVersion;
+    }
+
+    public void setServerVersion(Long serverVersion) {
+        this.serverVersion = serverVersion;
+    }
+
+    public boolean isExperimental() {
+        return this.experimental;
+    }
+
+    public void setExperimental(boolean experimental) {
+        this.experimental = experimental;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int compareTo(PlanDefinition o) {
+        return this.getName().equals(o.getName()) ? this.getName().compareTo(o.getIdentifier()) : this.getName().compareTo(o.getName());
+    }
+
+    public static enum PlanStatus {
+        @SerializedName("draft")
+        DRAFT("draft"),
+        @SerializedName("active")
+        ACTIVE("active"),
+        @SerializedName("retired")
+        RETIRED("retired"),
+        @SerializedName("complete")
+        COMPLETED("complete"),
+        @SerializedName("unknown")
+        UNKNOWN("unknown");
+
+        private final String value;
+
+        private PlanStatus(String value) {
+            this.value = value;
+        }
+
+        public String value() {
+            return this.value;
+        }
+
+        public static PlanTemplate.PlanStatus from(String value) {
+            PlanTemplate.PlanStatus[] var1 = values();
+            int var2 = var1.length;
+
+            for(int var3 = 0; var3 < var2; ++var3) {
+                PlanTemplate.PlanStatus c = var1[var3];
+                if (c.value.equals(value)) {
+                    return c;
+                }
+            }
+
+            throw new IllegalArgumentException(value);
+        }
+    }
+
+    public static class UseContext implements Serializable {
+        private String code;
+        private String valueCodableConcept;
+
+        public UseContext() {
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getValueCodableConcept() {
+            return this.valueCodableConcept;
+        }
+
+        public void setValueCodableConcept(String valueCodableConcept) {
+            this.valueCodableConcept = valueCodableConcept;
+        }
+    }
+}
diff --git a/src/main/java/org/opensrp/domain/TargetTemplate.java b/src/main/java/org/opensrp/domain/TargetTemplate.java
new file mode 100644
index 000000000..4c5298427
--- /dev/null
+++ b/src/main/java/org/opensrp/domain/TargetTemplate.java
@@ -0,0 +1,143 @@
+package org.opensrp.domain;
+
+import java.io.Serializable;
+import java.util.AbstractMap;
+
+public class TargetTemplate implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String measure;
+    private TargetTemplate.Detail detail;
+    private String due;
+
+    public TargetTemplate() {
+    }
+
+    public String getMeasure() {
+        return this.measure;
+    }
+
+    public void setMeasure(String measure) {
+        this.measure = measure;
+    }
+
+    public String getDue() {
+        return this.due;
+    }
+
+    public void setDue(String due) {
+        this.due = due;
+    }
+
+    public TargetTemplate.Detail getDetail() {
+        return this.detail;
+    }
+
+    public void setDetail(TargetTemplate.Detail detail) {
+        this.detail = detail;
+    }
+
+    static class DetailCodableConcept {
+        private String text;
+
+        DetailCodableConcept() {
+        }
+
+        public String getText() {
+            return this.text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+    }
+
+    static class MeasureRange implements Serializable {
+        private TargetTemplate.Measure high;
+        private TargetTemplate.Measure low;
+
+        MeasureRange() {
+        }
+
+        public TargetTemplate.Measure getHigh() {
+            return this.high;
+        }
+
+        public void setHigh(TargetTemplate.Measure high) {
+            this.high = high;
+        }
+
+        public TargetTemplate.Measure getLow() {
+            return this.low;
+        }
+
+        public void setLow(TargetTemplate.Measure low) {
+            this.low = low;
+        }
+    }
+
+    static class Measure implements Serializable {
+        private float value;
+        private String comparator;
+        private String unit;
+
+        Measure() {
+        }
+
+        public float getValue() {
+            return this.value;
+        }
+
+        public void setValue(float value) {
+            this.value = value;
+        }
+
+        public String getComparator() {
+            return this.comparator;
+        }
+
+        public void setComparator(String comparator) {
+            this.comparator = comparator;
+        }
+
+        public String getUnit() {
+            return this.unit;
+        }
+
+        public void setUnit(String unit) {
+            this.unit = unit;
+        }
+    }
+
+    static class Detail implements Serializable {
+        private TargetTemplate.Measure detailQuantity;
+        private TargetTemplate.MeasureRange detailRange;
+        private AbstractMap.SimpleEntry<String, String> detailCodableConcept;
+
+        Detail() {
+        }
+
+        public TargetTemplate.Measure getDetailQuantity() {
+            return this.detailQuantity;
+        }
+
+        public void setDetailQuantity(TargetTemplate.Measure detailQuantity) {
+            this.detailQuantity = detailQuantity;
+        }
+
+        public TargetTemplate.MeasureRange getDetailRange() {
+            return this.detailRange;
+        }
+
+        public void setDetailRange(TargetTemplate.MeasureRange detailRange) {
+            this.detailRange = detailRange;
+        }
+
+        public AbstractMap.SimpleEntry<String, String> getDetailCodableConcept() {
+            return this.detailCodableConcept;
+        }
+
+        public void setDetailCodableConcept(AbstractMap.SimpleEntry<String, String> detailCodableConcept) {
+            this.detailCodableConcept = detailCodableConcept;
+        }
+    }
+}
diff --git a/src/main/java/org/opensrp/domain/Template.java b/src/main/java/org/opensrp/domain/Template.java
index f729e7ffa..a9b0ee265 100644
--- a/src/main/java/org/opensrp/domain/Template.java
+++ b/src/main/java/org/opensrp/domain/Template.java
@@ -1,11 +1,18 @@
 package org.opensrp.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.io.Serializable;
 
 public class Template implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @JsonProperty
     private Integer templateId;
-    private String template;
-    private String Type;
+    @JsonProperty
+    private PlanTemplate template;
+    @JsonProperty
+    private String type;
+    @JsonProperty
     private int version;
 
     public Integer getTemplateId() {
@@ -16,20 +23,20 @@ public void setTemplateId(Integer templateId) {
         this.templateId = templateId;
     }
 
-    public String getTemplate() {
+    public PlanTemplate getTemplate() {
         return template;
     }
 
-    public void setTemplate(String template) {
+    public void setTemplate(PlanTemplate template) {
         this.template = template;
     }
 
     public String getType() {
-        return Type;
+        return type;
     }
 
     public void setType(String type) {
-        Type = type;
+        type = type;
     }
 
     public int getVersion() {
diff --git a/src/main/java/org/opensrp/domain/postgres/Template.java b/src/main/java/org/opensrp/domain/postgres/Template.java
index 2b3a3558d..ab5dc0de7 100644
--- a/src/main/java/org/opensrp/domain/postgres/Template.java
+++ b/src/main/java/org/opensrp/domain/postgres/Template.java
@@ -8,7 +8,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.id
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private Long id;
 
@@ -17,7 +17,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.template_id
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private Integer templateId;
 
@@ -26,7 +26,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private Object template;
 
@@ -35,7 +35,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.type
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private String type;
 
@@ -44,7 +44,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.version
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private Integer version;
 
@@ -53,7 +53,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.date_created
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private Date dateCreated;
 
@@ -62,7 +62,7 @@ public class Template {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column core.template.date_edited
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     private Date dateEdited;
 
@@ -72,7 +72,7 @@ public class Template {
      *
      * @return the value of core.template.id
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Long getId() {
         return id;
@@ -84,7 +84,7 @@ public Long getId() {
      *
      * @param id the value for core.template.id
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setId(Long id) {
         this.id = id;
@@ -96,7 +96,7 @@ public void setId(Long id) {
      *
      * @return the value of core.template.template_id
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Integer getTemplateId() {
         return templateId;
@@ -108,7 +108,7 @@ public Integer getTemplateId() {
      *
      * @param templateId the value for core.template.template_id
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setTemplateId(Integer templateId) {
         this.templateId = templateId;
@@ -120,7 +120,7 @@ public void setTemplateId(Integer templateId) {
      *
      * @return the value of core.template.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Object getTemplate() {
         return template;
@@ -132,7 +132,7 @@ public Object getTemplate() {
      *
      * @param template the value for core.template.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setTemplate(Object template) {
         this.template = template;
@@ -144,7 +144,7 @@ public void setTemplate(Object template) {
      *
      * @return the value of core.template.type
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public String getType() {
         return type;
@@ -156,7 +156,7 @@ public String getType() {
      *
      * @param type the value for core.template.type
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setType(String type) {
         this.type = type;
@@ -168,7 +168,7 @@ public void setType(String type) {
      *
      * @return the value of core.template.version
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Integer getVersion() {
         return version;
@@ -180,7 +180,7 @@ public Integer getVersion() {
      *
      * @param version the value for core.template.version
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setVersion(Integer version) {
         this.version = version;
@@ -192,7 +192,7 @@ public void setVersion(Integer version) {
      *
      * @return the value of core.template.date_created
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Date getDateCreated() {
         return dateCreated;
@@ -204,7 +204,7 @@ public Date getDateCreated() {
      *
      * @param dateCreated the value for core.template.date_created
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setDateCreated(Date dateCreated) {
         this.dateCreated = dateCreated;
@@ -216,7 +216,7 @@ public void setDateCreated(Date dateCreated) {
      *
      * @return the value of core.template.date_edited
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Date getDateEdited() {
         return dateEdited;
@@ -228,7 +228,7 @@ public Date getDateEdited() {
      *
      * @param dateEdited the value for core.template.date_edited
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setDateEdited(Date dateEdited) {
         this.dateEdited = dateEdited;
diff --git a/src/main/java/org/opensrp/domain/postgres/TemplateExample.java b/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
index 7ae778ce1..54532081f 100644
--- a/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
+++ b/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
@@ -9,7 +9,7 @@ public class TemplateExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     protected String orderByClause;
 
@@ -17,7 +17,7 @@ public class TemplateExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     protected boolean distinct;
 
@@ -25,7 +25,7 @@ public class TemplateExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     protected List<Criteria> oredCriteria;
 
@@ -33,7 +33,7 @@ public class TemplateExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public TemplateExample() {
         oredCriteria = new ArrayList<>();
@@ -43,7 +43,7 @@ public TemplateExample() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -53,7 +53,7 @@ public void setOrderByClause(String orderByClause) {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -63,7 +63,7 @@ public String getOrderByClause() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -73,7 +73,7 @@ public void setDistinct(boolean distinct) {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public boolean isDistinct() {
         return distinct;
@@ -83,7 +83,7 @@ public boolean isDistinct() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -93,7 +93,7 @@ public List<Criteria> getOredCriteria() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -103,7 +103,7 @@ public void or(Criteria criteria) {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -115,7 +115,7 @@ public Criteria or() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -129,7 +129,7 @@ public Criteria createCriteria() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -140,7 +140,7 @@ protected Criteria createCriteriaInternal() {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public void clear() {
         oredCriteria.clear();
@@ -152,22 +152,53 @@ public void clear() {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     protected abstract static class GeneratedCriteria {
+        protected List<Criterion> templateCriteria;
+
+        protected List<Criterion> allCriteria;
+
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
             super();
             criteria = new ArrayList<>();
+            templateCriteria = new ArrayList<>();
+        }
+
+        public List<Criterion> getTemplateCriteria() {
+            return templateCriteria;
+        }
+
+        protected void addTemplateCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            templateCriteria.add(new Criterion(condition, value, "org.opensrp.repository.postgres.handler.TemplateTypeHandler"));
+            allCriteria = null;
+        }
+
+        protected void addTemplateCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            templateCriteria.add(new Criterion(condition, value1, value2, "org.opensrp.repository.postgres.handler.TemplateTypeHandler"));
+            allCriteria = null;
         }
 
         public boolean isValid() {
-            return criteria.size() > 0;
+            return criteria.size() > 0
+                || templateCriteria.size() > 0;
         }
 
         public List<Criterion> getAllCriteria() {
-            return criteria;
+            if (allCriteria == null) {
+                allCriteria = new ArrayList<>();
+                allCriteria.addAll(criteria);
+                allCriteria.addAll(templateCriteria);
+            }
+            return allCriteria;
         }
 
         public List<Criterion> getCriteria() {
@@ -179,6 +210,7 @@ protected void addCriterion(String condition) {
                 throw new RuntimeException("Value for condition cannot be null");
             }
             criteria.add(new Criterion(condition));
+            allCriteria = null;
         }
 
         protected void addCriterion(String condition, Object value, String property) {
@@ -186,6 +218,7 @@ protected void addCriterion(String condition, Object value, String property) {
                 throw new RuntimeException("Value for " + property + " cannot be null");
             }
             criteria.add(new Criterion(condition, value));
+            allCriteria = null;
         }
 
         protected void addCriterion(String condition, Object value1, Object value2, String property) {
@@ -193,6 +226,7 @@ protected void addCriterion(String condition, Object value1, Object value2, Stri
                 throw new RuntimeException("Between values for " + property + " cannot be null");
             }
             criteria.add(new Criterion(condition, value1, value2));
+            allCriteria = null;
         }
 
         public Criteria andIdIsNull() {
@@ -326,52 +360,52 @@ public Criteria andTemplateIsNotNull() {
         }
 
         public Criteria andTemplateEqualTo(Object value) {
-            addCriterion("template =", value, "template");
+            addTemplateCriterion("template =", value, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateNotEqualTo(Object value) {
-            addCriterion("template <>", value, "template");
+            addTemplateCriterion("template <>", value, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateGreaterThan(Object value) {
-            addCriterion("template >", value, "template");
+            addTemplateCriterion("template >", value, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateGreaterThanOrEqualTo(Object value) {
-            addCriterion("template >=", value, "template");
+            addTemplateCriterion("template >=", value, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateLessThan(Object value) {
-            addCriterion("template <", value, "template");
+            addTemplateCriterion("template <", value, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateLessThanOrEqualTo(Object value) {
-            addCriterion("template <=", value, "template");
+            addTemplateCriterion("template <=", value, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateIn(List<Object> values) {
-            addCriterion("template in", values, "template");
+            addTemplateCriterion("template in", values, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateNotIn(List<Object> values) {
-            addCriterion("template not in", values, "template");
+            addTemplateCriterion("template not in", values, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateBetween(Object value1, Object value2) {
-            addCriterion("template between", value1, value2, "template");
+            addTemplateCriterion("template between", value1, value2, "template");
             return (Criteria) this;
         }
 
         public Criteria andTemplateNotBetween(Object value1, Object value2) {
-            addCriterion("template not between", value1, value2, "template");
+            addTemplateCriterion("template not between", value1, value2, "template");
             return (Criteria) this;
         }
 
@@ -630,7 +664,7 @@ public Criteria andDateEditedNotBetween(Date value1, Date value2) {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table core.template
      *
-     * @mbg.generated do_not_delete_during_merge Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated do_not_delete_during_merge Fri Oct 08 06:04:03 EAT 2021
      */
     public static class Criteria extends GeneratedCriteria {
         protected Criteria() {
@@ -642,7 +676,7 @@ protected Criteria() {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     public static class Criterion {
         private String condition;
diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
index 2904f38ae..2f66534b9 100644
--- a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -1,6 +1,8 @@
 package org.opensrp.repository.postgres;
 
 import org.apache.commons.lang.NotImplementedException;
+import org.json.JSONObject;
+import org.opensrp.domain.PlanTemplate;
 import org.opensrp.domain.Template;
 import org.opensrp.domain.postgres.TemplateExample;
 import org.opensrp.repository.TemplateRepository;
@@ -57,8 +59,8 @@ public void update(Template template) {
 
         org.opensrp.domain.postgres.Template pgTemplate = convert(template);
 
-        pgTemplate.setId(id);
-        templateMapper.updateByPrimaryKey(pgTemplate);
+        pgTemplate.setId(id);templateMapper.updateByPrimaryKeySelective(pgTemplate);
+        //templateMapper.updateByPrimaryKey(pgTemplate);
     }
 
     @Override
@@ -143,7 +145,7 @@ private Template convert(org.opensrp.domain.postgres.Template pgTemplate) {
             return null;
         }
         Template template = new Template();
-        template.setTemplate(pgTemplate.getTemplate().toString());
+        template.setTemplate((PlanTemplate) pgTemplate.getTemplate());
         template.setTemplateId(pgTemplate.getTemplateId());
         template.setVersion(pgTemplate.getVersion());
         template.setType(pgTemplate.getType());
@@ -156,7 +158,7 @@ private org.opensrp.domain.postgres.Template convert(Template template) {
             return null;
         }
         org.opensrp.domain.postgres.Template pgTemplate = new org.opensrp.domain.postgres.Template();
-        pgTemplate.setTemplate(template.getTemplate());
+        pgTemplate.setTemplate(new JSONObject(template.getTemplate()));
         pgTemplate.setTemplateId(template.getTemplateId());
         pgTemplate.setVersion(template.getVersion());
         pgTemplate.setType(template.getType());
diff --git a/src/main/java/org/opensrp/repository/postgres/handler/TemplateTypeHandler.java b/src/main/java/org/opensrp/repository/postgres/handler/TemplateTypeHandler.java
new file mode 100644
index 000000000..da68aa156
--- /dev/null
+++ b/src/main/java/org/opensrp/repository/postgres/handler/TemplateTypeHandler.java
@@ -0,0 +1,85 @@
+package org.opensrp.repository.postgres.handler;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.opensrp.domain.PlanTemplate;
+import org.opensrp.util.DateTypeConverter;
+import org.postgresql.util.PGobject;
+import org.smartregister.utils.TaskDateTimeTypeConverter;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class TemplateTypeHandler extends BaseTypeHandler implements TypeHandler<PlanTemplate> {
+
+    public Gson gson = new GsonBuilder().registerTypeAdapter(DateTime.class, new TaskDateTimeTypeConverter())
+            .registerTypeAdapter(LocalDate.class, new DateTypeConverter()).create();
+
+    @Override
+    public void setParameter(PreparedStatement ps, int i, PlanTemplate parameter, JdbcType jdbcType) throws SQLException {
+        try {
+            if (parameter != null) {
+                String jsonString = gson.toJson(parameter);
+                PGobject jsonObject = new PGobject();
+                jsonObject.setType("jsonb");
+                jsonObject.setValue(jsonString);
+                ps.setObject(i, jsonObject);
+            }
+        }
+        catch (Exception e) {
+            throw new SQLException(e);
+        }
+    }
+
+    @Override
+    public PlanTemplate getResult(ResultSet rs, String columnName) throws SQLException {
+        try {
+            String jsonString = rs.getString(columnName);
+            if (StringUtils.isBlank(jsonString)) {
+                return null;
+            }
+            PlanTemplate result =  gson.fromJson(jsonString, PlanTemplate.class);
+            return result;
+        }
+        catch (Exception e) {
+            throw new SQLException(e);
+        }
+    }
+
+    @Override
+    public PlanTemplate getResult(ResultSet rs, int columnIndex) throws SQLException {
+        try {
+            String jsonString = rs.getString(columnIndex);
+            if (StringUtils.isBlank(jsonString)) {
+                return null;
+            }
+            PlanTemplate result = gson.fromJson(jsonString, PlanTemplate.class);
+            return result;
+        }
+        catch (Exception e) {
+            throw new SQLException(e);
+        }
+    }
+
+    @Override
+    public PlanTemplate getResult(CallableStatement cs, int columnIndex) throws SQLException {
+        try {
+            String jsonString = cs.getString(columnIndex);
+            if (StringUtils.isBlank(jsonString)) {
+                return null;
+            }
+            PlanTemplate result = gson.fromJson(jsonString, PlanTemplate.class);
+            return result;
+        }
+        catch (Exception e) {
+            throw new SQLException(e);
+        }
+    }
+}
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java b/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java
index 68147990a..5e1d96489 100644
--- a/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/TemplateMapper.java
@@ -10,7 +10,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     long countByExample(TemplateExample example);
 
@@ -18,7 +18,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int deleteByExample(TemplateExample example);
 
@@ -26,7 +26,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int deleteByPrimaryKey(Long id);
 
@@ -34,7 +34,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int insert(Template record);
 
@@ -42,7 +42,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int insertSelective(Template record);
 
@@ -50,7 +50,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     List<Template> selectByExample(TemplateExample example);
 
@@ -58,7 +58,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     Template selectByPrimaryKey(Long id);
 
@@ -66,7 +66,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int updateByExampleSelective(@Param("record") Template record, @Param("example") TemplateExample example);
 
@@ -74,7 +74,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int updateByExample(@Param("record") Template record, @Param("example") TemplateExample example);
 
@@ -82,7 +82,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int updateByPrimaryKeySelective(Template record);
 
@@ -90,7 +90,7 @@ public interface TemplateMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table core.template
      *
-     * @mbg.generated Mon Sep 06 08:33:43 EAT 2021
+     * @mbg.generated Fri Oct 08 06:04:03 EAT 2021
      */
     int updateByPrimaryKey(Template record);
 }
\ No newline at end of file
diff --git a/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml b/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml
index 28d73bf45..05af60832 100644
--- a/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml
+++ b/src/main/java/org/opensrp/repository/postgres/mapper/xml/TemplateMapper.xml
@@ -5,11 +5,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="template_id" jdbcType="INTEGER" property="templateId" />
-    <result column="template" jdbcType="OTHER" property="template" />
+    <result column="template" jdbcType="OTHER" property="template" typeHandler="org.opensrp.repository.postgres.handler.TemplateTypeHandler" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="version" jdbcType="INTEGER" property="version" />
     <result column="date_created" jdbcType="TIMESTAMP" property="dateCreated" />
@@ -19,7 +19,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -44,6 +44,25 @@
                 </when>
               </choose>
             </foreach>
+            <foreach collection="criteria.templateCriteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler} and #{criterion.secondValue,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
           </trim>
         </if>
       </foreach>
@@ -53,7 +72,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -78,6 +97,25 @@
                 </when>
               </choose>
             </foreach>
+            <foreach collection="criteria.templateCriteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler} and #{criterion.secondValue,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
           </trim>
         </if>
       </foreach>
@@ -87,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     id, template_id, template, type, version, date_created, date_edited
   </sql>
@@ -95,7 +133,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     select
     <if test="distinct">
@@ -114,7 +152,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -125,7 +163,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     delete from core.template
     where id = #{id,jdbcType=BIGINT}
@@ -134,7 +172,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     delete from core.template
     <if test="_parameter != null">
@@ -145,12 +183,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     insert into core.template (id, template_id, template, 
       type, version, date_created, 
       date_edited)
-    values (#{id,jdbcType=BIGINT}, #{templateId,jdbcType=INTEGER}, #{template,jdbcType=OTHER}, 
+    values (#{id,jdbcType=BIGINT}, #{templateId,jdbcType=INTEGER}, #{template,jdbcType=OTHER,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler}, 
       #{type,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{dateCreated,jdbcType=TIMESTAMP}, 
       #{dateEdited,jdbcType=TIMESTAMP})
   </insert>
@@ -158,7 +196,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     insert into core.template
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -192,7 +230,7 @@
         #{templateId,jdbcType=INTEGER},
       </if>
       <if test="template != null">
-        #{template,jdbcType=OTHER},
+        #{template,jdbcType=OTHER,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler},
       </if>
       <if test="type != null">
         #{type,jdbcType=VARCHAR},
@@ -212,7 +250,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     select count(*) from core.template
     <if test="_parameter != null">
@@ -223,7 +261,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     update core.template
     <set>
@@ -234,7 +272,7 @@
         template_id = #{record.templateId,jdbcType=INTEGER},
       </if>
       <if test="record.template != null">
-        template = #{record.template,jdbcType=OTHER},
+        template = #{record.template,jdbcType=OTHER,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler},
       </if>
       <if test="record.type != null">
         type = #{record.type,jdbcType=VARCHAR},
@@ -257,12 +295,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     update core.template
     set id = #{record.id,jdbcType=BIGINT},
       template_id = #{record.templateId,jdbcType=INTEGER},
-      template = #{record.template,jdbcType=OTHER},
+      template = #{record.template,jdbcType=OTHER,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler},
       type = #{record.type,jdbcType=VARCHAR},
       version = #{record.version,jdbcType=INTEGER},
       date_created = #{record.dateCreated,jdbcType=TIMESTAMP},
@@ -275,7 +313,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     update core.template
     <set>
@@ -283,7 +321,7 @@
         template_id = #{templateId,jdbcType=INTEGER},
       </if>
       <if test="template != null">
-        template = #{template,jdbcType=OTHER},
+        template = #{template,jdbcType=OTHER,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler},
       </if>
       <if test="type != null">
         type = #{type,jdbcType=VARCHAR},
@@ -304,11 +342,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Sep 06 08:33:43 EAT 2021.
+      This element was generated on Fri Oct 08 06:04:03 EAT 2021.
     -->
     update core.template
     set template_id = #{templateId,jdbcType=INTEGER},
-      template = #{template,jdbcType=OTHER},
+      template = #{template,jdbcType=OTHER,typeHandler=org.opensrp.repository.postgres.handler.TemplateTypeHandler},
       type = #{type,jdbcType=VARCHAR},
       version = #{version,jdbcType=INTEGER},
       date_created = #{dateCreated,jdbcType=TIMESTAMP},

From b072c2d3ba8342724179764d43c969a86fa036e4 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Fri, 8 Oct 2021 08:30:40 +0300
Subject: [PATCH 20/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6b3c76f84..4e3760253 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.9-SNAPSHOT</version>
+	<version>2.12.9-ALPHA2-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 4ba727fc80b9866cae9c675cf31e095424f93c9f Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 12 Oct 2021 14:23:49 +0300
Subject: [PATCH 21/47] Add test

---
 .../postgres/TemplateRepositoryImpl.java      |  2 +-
 .../postgres/TemplateRepositoryTest.java      | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java

diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
index 2f66534b9..57aca22ef 100644
--- a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -158,7 +158,7 @@ private org.opensrp.domain.postgres.Template convert(Template template) {
             return null;
         }
         org.opensrp.domain.postgres.Template pgTemplate = new org.opensrp.domain.postgres.Template();
-        pgTemplate.setTemplate(new JSONObject(template.getTemplate()));
+        pgTemplate.setTemplate(template.getTemplate());
         pgTemplate.setTemplateId(template.getTemplateId());
         pgTemplate.setVersion(template.getVersion());
         pgTemplate.setType(template.getType());
diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
new file mode 100644
index 000000000..7e860e606
--- /dev/null
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -0,0 +1,50 @@
+package org.opensrp.repository.postgres;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.opensrp.domain.PlanTemplate;
+import org.opensrp.domain.Template;
+import org.opensrp.repository.TemplateRepository;
+import org.smartregister.domain.Jurisdiction;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
+
+public class TemplateRepositoryTest extends BaseRepositoryTest{
+
+    @Autowired
+    private TemplateRepository templateRepository;
+
+    @BeforeClass
+    public static void bootStrap() {
+        tableNames= Arrays.asList("core.template");
+    }
+
+    @Override
+    protected Set<String> getDatabaseScripts() {
+        Set<String> scripts = new HashSet<>();
+        return scripts;
+    }
+
+    @Test
+    public void testAddShouldAddnewTemplate() {
+        PlanTemplate planTemplate = new PlanTemplate();
+
+        List<Jurisdiction> jurisdictions = new ArrayList<>();
+        Jurisdiction jurisdiction = new Jurisdiction();
+        jurisdiction.setCode("operation_area_1");
+        jurisdictions.add(jurisdiction);
+        planTemplate.setJurisdiction(jurisdictions);
+
+        Template template = new Template();
+        template.setTemplate(planTemplate);
+        template.setTemplateId(1);
+        template.setType("1");
+        templateRepository.add(template);
+
+        List<Template> actualTemplates = templateRepository.getAll();
+        Assert.assertNotNull(actualTemplates);
+    }
+
+}

From 24f3191868a6d6cf5bf27b78eeb6f24dcfca8218 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 9 Nov 2021 08:52:59 +0300
Subject: [PATCH 22/47] Throw illegal argument exceptions instead of runtime
 exceptions

---
 .../domain/postgres/PlanProcessingStatusExample.java   |  6 +++---
 .../org/opensrp/domain/postgres/TemplateExample.java   | 10 +++++-----
 .../repository/postgres/TemplateRepositoryImpl.java    |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java b/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java
index fe5c90980..6ea3f7039 100644
--- a/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java
+++ b/src/main/java/org/opensrp/domain/postgres/PlanProcessingStatusExample.java
@@ -176,21 +176,21 @@ public List<Criterion> getCriteria() {
 
         protected void addCriterion(String condition) {
             if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
+                throw new IllegalArgumentException("Value for condition cannot be null");
             }
             criteria.add(new Criterion(condition));
         }
 
         protected void addCriterion(String condition, Object value, String property) {
             if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
+                throw new IllegalArgumentException("Value for " + property + " cannot be null");
             }
             criteria.add(new Criterion(condition, value));
         }
 
         protected void addCriterion(String condition, Object value1, Object value2, String property) {
             if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
+                throw new IllegalArgumentException("Between values for " + property + " cannot be null");
             }
             criteria.add(new Criterion(condition, value1, value2));
         }
diff --git a/src/main/java/org/opensrp/domain/postgres/TemplateExample.java b/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
index 54532081f..6f0f3b519 100644
--- a/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
+++ b/src/main/java/org/opensrp/domain/postgres/TemplateExample.java
@@ -173,7 +173,7 @@ public List<Criterion> getTemplateCriteria() {
 
         protected void addTemplateCriterion(String condition, Object value, String property) {
             if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
+                throw new IllegalArgumentException("Value for " + property + " cannot be null");
             }
             templateCriteria.add(new Criterion(condition, value, "org.opensrp.repository.postgres.handler.TemplateTypeHandler"));
             allCriteria = null;
@@ -181,7 +181,7 @@ protected void addTemplateCriterion(String condition, Object value, String prope
 
         protected void addTemplateCriterion(String condition, Object value1, Object value2, String property) {
             if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
+                throw new IllegalArgumentException("Between values for " + property + " cannot be null");
             }
             templateCriteria.add(new Criterion(condition, value1, value2, "org.opensrp.repository.postgres.handler.TemplateTypeHandler"));
             allCriteria = null;
@@ -207,7 +207,7 @@ public List<Criterion> getCriteria() {
 
         protected void addCriterion(String condition) {
             if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
+                throw new IllegalArgumentException("Value for condition cannot be null");
             }
             criteria.add(new Criterion(condition));
             allCriteria = null;
@@ -215,7 +215,7 @@ protected void addCriterion(String condition) {
 
         protected void addCriterion(String condition, Object value, String property) {
             if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
+                throw new IllegalArgumentException("Value for " + property + " cannot be null");
             }
             criteria.add(new Criterion(condition, value));
             allCriteria = null;
@@ -223,7 +223,7 @@ protected void addCriterion(String condition, Object value, String property) {
 
         protected void addCriterion(String condition, Object value1, Object value2, String property) {
             if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
+                throw new IllegalArgumentException("Between values for " + property + " cannot be null");
             }
             criteria.add(new Criterion(condition, value1, value2));
             allCriteria = null;
diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
index 57aca22ef..5994b9482 100644
--- a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -1,7 +1,6 @@
 package org.opensrp.repository.postgres;
 
 import org.apache.commons.lang.NotImplementedException;
-import org.json.JSONObject;
 import org.opensrp.domain.PlanTemplate;
 import org.opensrp.domain.Template;
 import org.opensrp.domain.postgres.TemplateExample;

From 8620550b9b91adbe6a763775f893ea655c8d72e3 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 9 Nov 2021 09:00:27 +0300
Subject: [PATCH 23/47] Update unit test

---
 .../opensrp/repository/postgres/TemplateRepositoryTest.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
index 7e860e606..549dc83de 100644
--- a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -28,7 +28,7 @@ protected Set<String> getDatabaseScripts() {
     }
 
     @Test
-    public void testAddShouldAddnewTemplate() {
+    public void testAddShouldAddNewTemplate() {
         PlanTemplate planTemplate = new PlanTemplate();
 
         List<Jurisdiction> jurisdictions = new ArrayList<>();
@@ -45,6 +45,8 @@ public void testAddShouldAddnewTemplate() {
 
         List<Template> actualTemplates = templateRepository.getAll();
         Assert.assertNotNull(actualTemplates);
+        Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
+        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
     }
 
 }

From 879cafca8072a87697aa651173342f172b36f558 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 10 Nov 2021 13:46:53 +0300
Subject: [PATCH 24/47] Add json property annotation

---
 src/main/java/org/opensrp/domain/ActionTemplate.java | 5 +++++
 src/main/java/org/opensrp/domain/GoalTemplate.java   | 2 ++
 src/main/java/org/opensrp/domain/PlanTemplate.java   | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opensrp/domain/ActionTemplate.java b/src/main/java/org/opensrp/domain/ActionTemplate.java
index c3bc5f329..4f545e963 100644
--- a/src/main/java/org/opensrp/domain/ActionTemplate.java
+++ b/src/main/java/org/opensrp/domain/ActionTemplate.java
@@ -1,5 +1,6 @@
 package org.opensrp.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
 import org.smartregister.domain.Condition;
 import org.smartregister.domain.DynamicValue;
@@ -170,12 +171,16 @@ public void setText(String text) {
     }
 
     public static enum ActionType {
+        @JsonProperty("create")
         @SerializedName("create")
         CREATE,
+        @JsonProperty("update")
         @SerializedName("update")
         UPDATE,
+        @JsonProperty("remove")
         @SerializedName("remove")
         REMOVE,
+        @JsonProperty("fire-event")
         @SerializedName("fire-event")
         FIRE_EVENT;
 
diff --git a/src/main/java/org/opensrp/domain/GoalTemplate.java b/src/main/java/org/opensrp/domain/GoalTemplate.java
index 9bac354a3..895c9d574 100644
--- a/src/main/java/org/opensrp/domain/GoalTemplate.java
+++ b/src/main/java/org/opensrp/domain/GoalTemplate.java
@@ -1,5 +1,6 @@
 package org.opensrp.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;
@@ -11,6 +12,7 @@ public class GoalTemplate implements Serializable {
     private String id;
     private String description;
     private String priority;
+    @JsonProperty("target")
     @SerializedName("target")
     private List<TargetTemplate> targets;
 
diff --git a/src/main/java/org/opensrp/domain/PlanTemplate.java b/src/main/java/org/opensrp/domain/PlanTemplate.java
index e0e6612c9..061aaffd6 100644
--- a/src/main/java/org/opensrp/domain/PlanTemplate.java
+++ b/src/main/java/org/opensrp/domain/PlanTemplate.java
@@ -31,10 +31,10 @@ public class PlanTemplate  implements Serializable {
     @JsonProperty
     private List<Jurisdiction> jurisdiction;
     private Long serverVersion;
-    @JsonProperty
+    @JsonProperty("goal")
     @SerializedName("goal")
     private List<GoalTemplate> goals;
-    @JsonProperty
+    @JsonProperty("action")
     @SerializedName("action")
     private List<ActionTemplate> actions;
     @JsonProperty

From e4f19b0297453e06e49aac986fc84cf42a22f369 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 10 Nov 2021 13:49:39 +0300
Subject: [PATCH 25/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a85461ec4..67722ffa8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.13-ALPHA1-SNAPSHOT</version>
+	<version>2.12.13-ALPHA2-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 660c914a22e1ba5dcd135efb62297ab520a3f01e Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 10 Nov 2021 19:48:14 +0300
Subject: [PATCH 26/47] Retrieve record by primary key

---
 .../postgres/PlanProcessingStatusRepositoryImpl.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
index e07908512..2891016b4 100644
--- a/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryImpl.java
@@ -35,9 +35,6 @@ public void add(PlanProcessingStatus planProcessingStatus) {
         if (planProcessingStatus == null) {
             return;
         }
-        if (getUniqueField(planProcessingStatus) == null) {
-            return;
-        }
 
         if (retrievePrimaryKey(planProcessingStatus) != null) {
             return; // planProcessingStatus already added
@@ -151,7 +148,11 @@ protected Long retrievePrimaryKey(PlanProcessingStatus planProcessingStatus) {
             return null;
         }
 
-        return (Long) uniqueId;
+        PlanProcessingStatus processingStatus = getByPrimaryKey((Long) uniqueId);
+        if (processingStatus == null) {
+            return null;
+        }
+        return processingStatus.getId();
     }
 
     @Override

From 35c9d844141f36bab0e3bf7f3dc4882f44653eaf Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 10 Nov 2021 19:49:43 +0300
Subject: [PATCH 27/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67722ffa8..d251940a4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.13-ALPHA2-SNAPSHOT</version>
+	<version>2.12.13-ALPHA3-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 9f3df349526f709f528cce12b8eef3e39771ef31 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Fri, 12 Nov 2021 15:38:39 +0300
Subject: [PATCH 28/47] Add null check for plan actions

---
 src/main/java/org/opensrp/service/PlanService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/opensrp/service/PlanService.java b/src/main/java/org/opensrp/service/PlanService.java
index 1ae64a324..efad2c5a3 100755
--- a/src/main/java/org/opensrp/service/PlanService.java
+++ b/src/main/java/org/opensrp/service/PlanService.java
@@ -326,6 +326,9 @@ public String getHistoricalIntervention(List<String> operationalAreaIds) {
 		String historicalIntervention = null;
 		List<PlanDefinition> planList = getPlansByServerVersionAndOperationalArea(0, operationalAreaIds, false);
 		for (PlanDefinition plan: planList ) {
+			if(plan.getActions() == null || plan.getActions().isEmpty()){
+				continue;
+			}
 			for (Action action: plan.getActions() ) {
 				if (action.getCode() != null) {
 					if (PlanConstants.BEDNET_DISTRIBUTION.equalsIgnoreCase(action.getCode())) {

From 0dc093fb0ca8f10487281308aa5299f5f6a5ccfa Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Fri, 12 Nov 2021 15:39:10 +0300
Subject: [PATCH 29/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d251940a4..273284685 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.13-ALPHA3-SNAPSHOT</version>
+	<version>2.12.13-ALPHA4-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From bd83526a361655966f5a311c5fc211dd04b09f4a Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Fri, 12 Nov 2021 17:02:02 +0300
Subject: [PATCH 30/47] Add plan constants

---
 src/main/java/org/opensrp/util/constants/PlanConstants.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/opensrp/util/constants/PlanConstants.java b/src/main/java/org/opensrp/util/constants/PlanConstants.java
index c0eeb031f..bf123213e 100644
--- a/src/main/java/org/opensrp/util/constants/PlanConstants.java
+++ b/src/main/java/org/opensrp/util/constants/PlanConstants.java
@@ -17,5 +17,8 @@ public interface PlanConstants {
     String CASE_CLASSIFICATION = "case_classification";
     String BEDNET_DISTRIBUTION = "Bednet Distribution";
     String FLAG = "flag";
+    String FIRST_NAME = "first_name";
+    String SURNAME = "surname";
+    String FAMILY_NAME = "family_name";
 
 }

From 3e9cc6431cd104891a85c52cdc25f7ab42670bc4 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Fri, 12 Nov 2021 17:02:31 +0300
Subject: [PATCH 31/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 273284685..de7f74e35 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.13-ALPHA4-SNAPSHOT</version>
+	<version>2.12.13-ALPHA5-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

From 953fac97550ea4ef6ae61feb46252df0ef9664cf Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 07:16:21 +0300
Subject: [PATCH 32/47] Update configs

---
 configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs b/configs
index 940b8339b..14eb3d5ff 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 940b8339b74c296bb48992643e83be28f084d952
+Subproject commit 14eb3d5ffab421208f131d98edbd05de135fe1a7

From 5e22c6db90b958f271fcf7154ba074a7d8b2444c Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 14:26:30 +0300
Subject: [PATCH 33/47] Add plan processing repository tests

---
 .../postgres/EventsRepositoryTest.java        |   7 ++
 .../PlanProcessingStatusRepositoryTest.java   | 100 ++++++++++++++++++
 .../test-scripts/plan_processing_status.sql   |  34 ++++++
 3 files changed, 141 insertions(+)
 create mode 100644 src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
 create mode 100644 src/test/resources/test-scripts/plan_processing_status.sql

diff --git a/src/test/java/org/opensrp/repository/postgres/EventsRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/EventsRepositoryTest.java
index 8e29936dc..386e3a509 100644
--- a/src/test/java/org/opensrp/repository/postgres/EventsRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/EventsRepositoryTest.java
@@ -776,4 +776,11 @@ public void testFindEventsByJurisdictionIdAndPlan() {
 		assertTrue(eventsRepository.findEventsByJurisdictionIdAndPlan("test-location-id1","plan-id-12345").isEmpty());
 	}
 
+	@Test
+	public void testFindByDbId() {
+		Event event = eventsRepository.findByDbId(25l, false);
+		assertNotNull(event);
+		assertEquals("d945f800-eeca-415e-b737-e5611e19f706", event.getId());
+	}
+
 }
diff --git a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
new file mode 100644
index 000000000..487d1826a
--- /dev/null
+++ b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
@@ -0,0 +1,100 @@
+package org.opensrp.repository.postgres;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+import org.opensrp.repository.PlanProcessingStatusRepository;
+import org.opensrp.util.constants.PlanProcessingStatusConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class PlanProcessingStatusRepositoryTest extends BaseRepositoryTest{
+
+    @Autowired
+    private PlanProcessingStatusRepository planProcessingStatusRepository;
+
+    @BeforeClass
+    public static void bootStrap() {
+        tableNames= Arrays.asList("core.plan_processing_status","core.plan","core.template","core.event");
+    }
+
+    @Override
+    protected Set<String> getDatabaseScripts() {
+        Set<String> scripts = new HashSet<>();
+        scripts.add("plan_processing_status.sql");
+        return scripts;
+    }
+
+    @Test
+    public void testGetAllFetchesAllRecords() {
+        List<PlanProcessingStatus> statusList = planProcessingStatusRepository.getAll();
+        assertNotNull(statusList);
+        assertEquals(1, statusList.size());
+        PlanProcessingStatus actualStatus = statusList.get(0);
+        assertEquals(PlanProcessingStatusConstants.INITIAL, actualStatus.getStatus().intValue());
+        assertEquals(1l, actualStatus.getPlanId().longValue());
+        assertEquals(1l, actualStatus.getTemplateId().longValue());
+        assertEquals(1l, actualStatus.getEventId().longValue());
+    }
+
+    @Test
+    public void testUpdateShouldUpdateExistingPlanProcessingStatus() {
+
+        PlanProcessingStatus addedStatus = planProcessingStatusRepository.getByPrimaryKey(1l);
+        assertEquals(PlanProcessingStatusConstants.INITIAL, addedStatus.getStatus().intValue());
+        assertEquals(1l, addedStatus.getPlanId().longValue());
+        assertEquals(1l, addedStatus.getTemplateId().longValue());
+        assertEquals(1l, addedStatus.getEventId().longValue());
+
+        addedStatus.setStatus(PlanProcessingStatusConstants.PROCESSING);
+        planProcessingStatusRepository.update(addedStatus);
+
+        PlanProcessingStatus updatedStatus = planProcessingStatusRepository.getByPrimaryKey(1l);
+        assertEquals(PlanProcessingStatusConstants.PROCESSING, updatedStatus.getStatus().intValue());
+    }
+
+    @Test
+    public void testSafeRemoveDeletesPlanProcessingStatus() {
+        PlanProcessingStatus status = planProcessingStatusRepository.getByPrimaryKey(1l);
+        assertNotNull(status);
+
+        planProcessingStatusRepository.safeRemove(status);
+        PlanProcessingStatus existingStatus = planProcessingStatusRepository.getByPrimaryKey(1l);
+        assertNull(existingStatus);
+    }
+
+    @Test
+    public void testGetByEventIdReturnsCorrectValue() {
+
+        PlanProcessingStatus status = planProcessingStatusRepository.getByEventId(1l);
+        assertEquals(PlanProcessingStatusConstants.INITIAL, status.getStatus().intValue());
+        assertEquals(1l, status.getPlanId().longValue());
+        assertEquals(1l, status.getTemplateId().longValue());
+        assertEquals(1l, status.getEventId().longValue());
+    }
+
+    @Test
+    public void testGetByStatusReturnsCorrectValue() {
+
+        PlanProcessingStatus status = planProcessingStatusRepository.getByEventId(1l);
+        assertEquals(PlanProcessingStatusConstants.INITIAL, status.getStatus().intValue());
+        assertEquals(1l, status.getPlanId().longValue());
+        assertEquals(1l, status.getTemplateId().longValue());
+        assertEquals(1l, status.getEventId().longValue());
+    }
+
+    private PlanProcessingStatus initTestProcessingStatus() {
+        PlanProcessingStatus planProcessingStatus = new PlanProcessingStatus();
+        planProcessingStatus.setStatus(PlanProcessingStatusConstants.COMPLETE);
+        planProcessingStatus.setPlanId(1l);
+        planProcessingStatus.setTemplateId(1l);
+        planProcessingStatus.setEventId(1l);
+        return planProcessingStatus;
+    }
+}
diff --git a/src/test/resources/test-scripts/plan_processing_status.sql b/src/test/resources/test-scripts/plan_processing_status.sql
new file mode 100644
index 000000000..b3b487d97
--- /dev/null
+++ b/src/test/resources/test-scripts/plan_processing_status.sql
@@ -0,0 +1,34 @@
+-- noinspection SqlDialectInspectionForFile
+
+--clear data
+TRUNCATE TABLE core.event CASCADE;
+
+TRUNCATE TABLE core.event_metadata CASCADE;
+
+TRUNCATE TABLE core.plan CASCADE;
+
+TRUNCATE TABLE core.template CASCADE;
+
+TRUNCATE TABLE core.plan_metadata CASCADE;
+
+TRUNCATE TABLE core.plan_processing_status CASCADE;
+
+--insert data
+INSERT INTO core.event (id, json, date_deleted) VALUES
+(1, '{"_id": "fa2242d1-cf34-454a-8c06-7bd55e408044", "obs": [{"values": ["2018-03-14"], "fieldCode": "1410AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "date", "formSubmissionField": "measles_1", "humanReadableValues": []}, {"values": ["1"], "fieldCode": "1418AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "calculate", "formSubmissionField": "measles_1_dose", "humanReadableValues": []}], "type": "Event", "version": 1521033238310, "duration": 0, "_rev": "1-dff06b7575a5177c7200b08570d14f4b", "eventDate": "2018-03-14T19:09:51.379+03:00", "eventType": "Vaccination", "entityType": "vaccination", "locationId": "42b88545-7ebb-4e11-8d1a-3d3a924c8af4", "providerId": "biddemo", "dateCreated": "2018-03-19T17:27:28.750+03:00", "identifiers": {}, "baseEntityId": "ea1f9439-a663-4073-93b9-6ef2b8bca3c1", "serverVersion": 1521033533700, "formSubmissionId": "bfbfabe8-d4ae-4db2-940f-a6f126ef7829"}', null);
+
+INSERT INTO core.event_metadata (id, event_id, document_id, base_entity_id, form_submission_id, server_version, openmrs_uuid, event_type, event_date, entity_type ,provider_id, location_id, team, team_id, date_created, date_edited, date_deleted) VALUES
+(1, 1, 'fa2242d1-cf34-454a-8c06-7bd55e408044', 'ea1f9439-a663-4073-93b9-6ef2b8bca3c1', 'bfbfabe8-d4ae-4db2-940f-a6f126ef7829', 1521033533700, null, 'Vaccination', '2018-03-14 19:09:51.379000', 'vaccination', 'biddemo', '42b88545-7ebb-4e11-8d1a-3d3a924c8af4', null, null, '2018-03-19 17:27:28.750000', null, null);
+
+INSERT INTO core.plan (id, identifier, json, date_deleted,server_version)
+VALUES (1, '362565f0-573b-11ec-bf63-0242ac130002','{"date": "2019-11-01", "goal": [{"id": "Case_Confirmation", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "case(s)", "value": 1.0, "comparator": ">="}}, "measure": "Number of cases confirmed"}], "priority": "medium-priority", "description": "Confirm the index case"}, {"id": "RACD_register_families", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures with full family registration"}], "priority": "medium-priority", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area"}, {"id": "RACD_Blood_Screening", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Person(s)", "value": 100.0, "comparator": ">="}}, "measure": "Number of registered people tested"}], "priority": "medium-priority", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person"}, {"id": "RACD_bednet_distribution", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures received nets"}], "priority": "medium-priority", "description": "Visit 100% of residential structures in the operational area and provide nets"}, {"id": "Larval_Dipping", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of larval dipping activities completed"}], "priority": "medium-priority", "description": "Perform a minimum of three larval dipping activities in the operational area"}, {"id": "Mosquito_Collection", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of mosquito collection activities completed"}], "priority": "medium-priority", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process"}, {"id": "BCC_Focus", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 1.0, "comparator": ">="}}, "measure": "Number of BCC Activities Completed"}], "priority": "medium-priority", "description": "Complete at least 1 BCC activity for the operational area"}], "name": "A1-Akros_1-2019-11-01", "title": "local A1 Akros_1 2019-11-01 test", "action": [{"code": "Case Confirmation", "title": "Case Confirmation", "goalId": "Case_Confirmation", "prefix": 1, "reason": "Investigation", "identifier": "ae158ee0-dbd1-5eb9-ae4b-cc3f1f7805fc", "description": "Confirm the index case", "taskTemplate": "Case_Confirmation", "timingPeriod": {"end": "2020-02-29", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}, {"code": "RACD Register Family", "title": "Family Registration", "goalId": "RACD_register_families", "prefix": 2, "reason": "Investigation", "identifier": "44e76d66-66a8-5d85-9ac9-53eae86888be", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area", "taskTemplate": "RACD_register_families", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Blood Screening", "title": "Blood screening", "goalId": "RACD_Blood_Screening", "prefix": 3, "reason": "Investigation", "identifier": "4ae8c881-cbda-5a48-b168-2b2bb44d018a", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person", "taskTemplate": "RACD_Blood_Screening", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Person"}}, {"code": "Bednet Distribution", "title": "Bednet Distribution", "goalId": "RACD_bednet_distribution", "prefix": 4, "reason": "Investigation", "identifier": "af35739d-c24c-509d-b102-8eece714980d", "description": "Visit 100% of residential structures in the operational area and provide nets", "taskTemplate": "Bednet_Distribution", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Larval Dipping", "title": "Larval Dipping", "goalId": "Larval_Dipping", "prefix": 5, "reason": "Investigation", "identifier": "2dacc2db-66c4-50e4-a2a9-0f65a03ed0e1", "description": "Perform a minimum of three larval dipping activities in the operational area", "taskTemplate": "Larval_Dipping", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Breeding_Site"}}, {"code": "Mosquito Collection", "title": "Mosquito Collection", "goalId": "Mosquito_Collection", "prefix": 6, "reason": "Investigation", "identifier": "a1757995-4911-54f5-8086-e8d0d133d3e2", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process", "taskTemplate": "Mosquito_Collection_Point", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Mosquito_Collection_Point"}}, {"code": "BCC", "title": "Behaviour Change Communication", "goalId": "BCC_Focus", "prefix": 7, "reason": "Investigation", "identifier": "ac04a71e-7a11-552f-91f0-4e8509e75db2", "description": "Conduct BCC activity", "taskTemplate": "BCC_Focus", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}], "status": "active", "version": "3", "identifier": "a8b3010c-1ba5-556d-8b16-71266397b8b9", "useContext": [{"code": "interventionType", "valueCodableConcept": "FI"}, {"code": "fiStatus", "valueCodableConcept": "A1"}, {"code": "fiReason", "valueCodableConcept": "Routine"}, {"code": "taskGenerationStatus", "valueCodableConcept": "True"}], "jurisdiction": [{"code": "3951"}, {"code": "3952"}], "serverVersion": 1582200627471, "effectivePeriod": {"end": "2020-04-21", "start": "2019-11-01"}}', null,0);
+
+INSERT INTO core.plan_metadata (operational_area_id,identifier, plan_id)
+VALUES ('3735','d8b81146-5740-11ec-bf63-0242ac130002',1);
+
+INSERT INTO core.template (id,template_id, template, type)
+VALUES (1, 1, '{"date": "${currentDate}", "goal": [{"id": "Case_Confirmation", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "case(s)", "value": 1.0, "comparator": "&amp;gt;="}}, "measure": "จำนวนผู้ป่วยที่ได้รับการยืนยัน"}], "priority": "medium-priority", "description": "ยืนยันบ้านผู้ป่วย"}, {"id": "RACD_register_families", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "%", "value": 100.0, "comparator": "&gt;="}}, "measure": "ร้อยละของบ้าน สิ่งปลูกสร้างที่ได้ลงทะเบียนข้อมูลครัวเรือน"}], "priority": "medium-priority", "description": "ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน"}, {"id": "RACD_Blood_Screening", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "คน", "value": 50.0, "comparator": "&gt;="}}, "measure": "จำนวนผู้ที่ได้รับการเจาะโลหิต"}], "priority": "medium-priority", "description": "เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)"}, {"id": "BCC_Focus", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "แห่ง", "value": 1.0, "comparator": "&gt;="}}, "measure": "จำนวนกิจกรรมการให้สุขศึกษา"}], "priority": "medium-priority", "description": "ให้สุขศึกษาในพื้นที่ปฏิบัติงานอย่างน้อย 1 ครั้ง"}, {"id": "RACD_bednet_distribution", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "%", "value": 90.0, "comparator": "&gt;="}}, "measure": "จำนวนบ้าน/สิ่งปลูกสร้างที่ได้รับมุ้ง"}], "priority": "medium-priority", "description": "แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)"}, {"id": "Larval_Dipping", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "แห่ง", "value": 3.0, "comparator": "&gt;="}}, "measure": "จำนวนกิจกรรมการตักลูกน้ำ"}], "priority": "medium-priority", "description": "ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน"}, {"id": "Mosquito_Collection", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "แห่ง", "value": 3.0, "comparator": "&gt;="}}, "measure": "จำนวนกิจกรรมการจับยุง"}], "priority": "medium-priority", "description": "กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง"}], "name": "${focus_status}-${focus_name}-${patient_name}_${patient_surname}-${currentDate}-${flag}", "title": "${focus_status} - ${focus_name} - ${patient_name} ${patient_surname} - ${currentDate} - ${flag}", "action": [{"code": "Case Confirmation", "type": "create", "title": "การยืนยันบ้านผู้ป่วย", "goalId": "Case_Confirmation", "prefix": 1, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}], "condition": [{"kind": "applicability", "expression": {"expression": "questionnaire = Case_Details", "description": "Event is case details event"}}], "identifier": "662d4bff-43cc-4f50-af1e-3bc86f8af253", "description": "ยืนยันบ้านผู้ป่วย", "timingPeriod": {"end": "2021-09-23", "start": "2021-09-13"}, "definitionUri": "case_confirmation.json", "subjectCodableConcept": {"text": "Jurisdiction"}}, {"code": "RACD Register Family", "type": "create", "title": "ลงทะเบียนครัวเรือน", "goalId": "RACD_register_families", "prefix": 2, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Register_Structure or questionnaire = Archive_Family", "description": "Trigger when a Register_Structure event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.Location) or (questionnaire = Register_Structure and $this.item.where(linkId=structureType).answer.value =Residential Structure)", "description": "Apply to residential structures in Register_Structure questionnaires"}}, {"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or (($this.type.where(id=locationType).exists().not() or $this.type.where(id=locationType).text = Residential Structure) and $this.contained.exists().not())", "description": "Structure is residential or type does not exist", "subjectCodableConcept": {"text": "Family"}}}], "identifier": "${registerFamilyActionId}", "description": "ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "family_register.json", "subjectCodableConcept": {"text": "Location"}}, {"code": "Blood Screening", "type": "create", "title": "กิจกรรมการเจาะโลหิต", "goalId": "RACD_Blood_Screening", "prefix": 3, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Family_Registration or questionnaire = Family_Member_Registration", "description": "Trigger when a Family Registration or Family Member Registration event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "($this.is(FHIR.Patient) and $this.birthDate &lt;= today() - 5 years) or ($this.contained.where(Patient.birthDate &lt;= today() - 5 years).exists())", "description": "Person is older than 5 years or person associated with questionnaire response if older than 5 years"}}], "identifier": "${bloodScreeningActionId}", "description": "เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "blood_screening.json", "subjectCodableConcept": {"text": "Person"}}, {"code": "BCC", "type": "create", "title": "กิจกรรมการให้สุขศึกษา", "goalId": "BCC_Focus", "prefix": 4, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}], "condition": [{"kind": "applicability", "expression": {"expression": "Location.physicalType.coding.exists(code=jdn)", "description": "Jurisdiction type location"}}], "identifier": "${bccActionId}", "description": "ดำเนินกิจกรรมให้สุขศึกษา", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "behaviour_change_communication.json", "subjectCodableConcept": {"text": "Jurisdiction"}}, {"code": "Bednet Distribution", "type": "create", "title": "กิจกรรมสำรวจ/ชุบ/แจกมุ้ง", "goalId": "RACD_bednet_distribution", "prefix": 5, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Family_Registration", "description": "Trigger when a Family Registration event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or (($this.type.where(id=locationType).exists().not() or $this.type.where(id=locationType).text = Residential Structure) and $this.contained.exists())", "description": "Structure is residential or type does not exist", "subjectCodableConcept": {"text": "Family"}}}], "identifier": "${bednetDistributionActionId}", "description": "แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "bednet_distribution.json", "subjectCodableConcept": {"text": "Location"}}, {"code": "Larval Dipping", "type": "create", "title": "กิจกรรมการตักลูกน้ำ", "goalId": "Larval_Dipping", "prefix": 6, "reason": "Investigation", "trigger": [{"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Register_Structure", "description": "Trigger when a Register_Structure event is submitted"}}, {"name": "plan-activation", "type": "named-event"}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.Location) or (questionnaire = Register_Structure and $this.item.where(linkId=structureType).answer.value =Larval Breeding Site)", "description": "Apply to larval breeding sites in Register_Structure questionnaires"}}, {"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or $this.type.where(id=locationType).text = Larval Breeding Site", "description": "Structure is a larval breeding site"}}], "identifier": "${larvalDippingActionId}", "description": "ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "larval_dipping_form.json", "subjectCodableConcept": {"text": "Location"}}, {"code": "Mosquito Collection", "type": "create", "title": "กิจกรรมการจับยุง", "goalId": "Mosquito_Collection", "prefix": 7, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Register_Structure", "description": "Trigger when a Register_Structure event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or $this.type.where(id=locationType).text = Mosquito Collection Point", "description": "Structure is a mosquito collection point"}}, {"kind": "applicability", "expression": {"expression": "$this.is(FHIR.Location) or (questionnaire = Register_Structure and $this.item.where(linkId=structureType).answer.value =Mosquito Collection Point)", "description": "Apply to mosquito collection point in Register_Structure questionnaires"}}], "identifier": "${mosquitoCollectionActionId}", "description": "กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "mosquito_collection_form.json", "subjectCodableConcept": {"text": "Location"}}], "status": "draft", "version": "1", "identifier": "${planIdentifier}", "useContext": [{"code": "interventionType", "valueCodableConcept": "Dynamic-FI"}, {"code": "fiStatus", "valueCodableConcept": "${focus_status}"}, {"code": "fiReason", "valueCodableConcept": "Case Triggered"}, {"code": "opensrpEventId", "valueCodableConcept": "${opensrpCaseClassificationEventId}"}, {"code": "caseNum", "valueCodableConcept": "${case_number}"}, {"code": "taskGenerationStatus", "valueCodableConcept": "internal"}], "experimental": false, "jurisdiction": [{"code": "${focus_id}"}], "serverVersion": 0, "effectivePeriod": {"end": "${endDate}", "start": "${currentDate}"}}' , 'plan');
+
+
+INSERT INTO core.plan_processing_status (id,plan_id, event_id, template_id, status)
+VALUES (1,1,1,1,0);

From 92c681d55aebf5e6b4950a6fd0f431d82c218da5 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 15:20:43 +0300
Subject: [PATCH 34/47]  Add unit plan processing status unit tests

---
 .../PlanProcessingStatusRepositoryTest.java   | 54 +++++++++++++++++--
 .../test-scripts/plan_processing_status.sql   | 18 ++++---
 2 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
index 487d1826a..71a308c46 100644
--- a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
@@ -82,19 +82,67 @@ public void testGetByEventIdReturnsCorrectValue() {
     @Test
     public void testGetByStatusReturnsCorrectValue() {
 
-        PlanProcessingStatus status = planProcessingStatusRepository.getByEventId(1l);
+        List<PlanProcessingStatus> statusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.INITIAL);
+        assertEquals(PlanProcessingStatusConstants.INITIAL, statusList.get(0).getStatus().intValue());
+        assertEquals(1l, statusList.get(0).getPlanId().longValue());
+        assertEquals(1l, statusList.get(0).getTemplateId().longValue());
+        assertEquals(1l, statusList.get(0).getEventId().longValue());
+    }
+
+    @Test
+    public void testAddPlanProcessingStatus() {
+        List<PlanProcessingStatus> statusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.COMPLETE);
+        assertTrue(statusList.isEmpty());
+        planProcessingStatusRepository.addPlanProcessingStatus("1c3f6eac-a765-4423-bbda-c01ed6430ae8",PlanProcessingStatusConstants.COMPLETE);
+
+        List<PlanProcessingStatus> addedStatusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.COMPLETE);
+        assertEquals(1, addedStatusList.size());
+        assertEquals(PlanProcessingStatusConstants.COMPLETE, addedStatusList.get(0).getStatus().intValue());
+        assertEquals(2l, addedStatusList.get(0).getEventId().longValue());
+    }
+
+    @Test
+    public void testUpdatePlanProcessingStatus() {
+
+        PlanProcessingStatus status = planProcessingStatusRepository.getByPrimaryKey(1l);
         assertEquals(PlanProcessingStatusConstants.INITIAL, status.getStatus().intValue());
         assertEquals(1l, status.getPlanId().longValue());
         assertEquals(1l, status.getTemplateId().longValue());
         assertEquals(1l, status.getEventId().longValue());
+
+        planProcessingStatusRepository.updatePlanProcessingStatus(status, "1c3f6eac-a765-4423-bbda-c01ed6430ae8",
+                "3450034c-1ba5-556d-8b16-71266397b8b9", PlanProcessingStatusConstants.PROCESSING);
+
+        PlanProcessingStatus updatedStatus = planProcessingStatusRepository.getByPrimaryKey(1l);
+        assertEquals(PlanProcessingStatusConstants.PROCESSING, updatedStatus.getStatus().intValue());
+        assertEquals(2l, updatedStatus.getPlanId().longValue());
+        assertEquals(1l, updatedStatus.getTemplateId().longValue());
+        assertEquals(2l, updatedStatus.getEventId().longValue());
+    }
+
+    @Test
+    public void testAddShouldCreateNewPlanProcessingStatus() {
+
+        List<PlanProcessingStatus> statusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.COMPLETE);
+        assertTrue(statusList.isEmpty());
+        PlanProcessingStatus status = initTestProcessingStatus();
+        planProcessingStatusRepository.add(status);
+
+        List<PlanProcessingStatus> addedStatusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.COMPLETE);
+        assertEquals(1, addedStatusList.size());
+        assertEquals(PlanProcessingStatusConstants.COMPLETE, addedStatusList.get(0).getStatus().intValue());
+        assertEquals(2l, addedStatusList.get(0).getEventId().longValue());
+        assertEquals(2l, addedStatusList.get(0).getPlanId().longValue());
+        assertEquals(1l, addedStatusList.get(0).getTemplateId().longValue());
+
     }
 
     private PlanProcessingStatus initTestProcessingStatus() {
         PlanProcessingStatus planProcessingStatus = new PlanProcessingStatus();
         planProcessingStatus.setStatus(PlanProcessingStatusConstants.COMPLETE);
-        planProcessingStatus.setPlanId(1l);
+        planProcessingStatus.setPlanId(2l);
         planProcessingStatus.setTemplateId(1l);
-        planProcessingStatus.setEventId(1l);
+        planProcessingStatus.setEventId(2l);
         return planProcessingStatus;
     }
 }
diff --git a/src/test/resources/test-scripts/plan_processing_status.sql b/src/test/resources/test-scripts/plan_processing_status.sql
index b3b487d97..e96ecaee2 100644
--- a/src/test/resources/test-scripts/plan_processing_status.sql
+++ b/src/test/resources/test-scripts/plan_processing_status.sql
@@ -15,16 +15,22 @@ TRUNCATE TABLE core.plan_processing_status CASCADE;
 
 --insert data
 INSERT INTO core.event (id, json, date_deleted) VALUES
-(1, '{"_id": "fa2242d1-cf34-454a-8c06-7bd55e408044", "obs": [{"values": ["2018-03-14"], "fieldCode": "1410AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "date", "formSubmissionField": "measles_1", "humanReadableValues": []}, {"values": ["1"], "fieldCode": "1418AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "calculate", "formSubmissionField": "measles_1_dose", "humanReadableValues": []}], "type": "Event", "version": 1521033238310, "duration": 0, "_rev": "1-dff06b7575a5177c7200b08570d14f4b", "eventDate": "2018-03-14T19:09:51.379+03:00", "eventType": "Vaccination", "entityType": "vaccination", "locationId": "42b88545-7ebb-4e11-8d1a-3d3a924c8af4", "providerId": "biddemo", "dateCreated": "2018-03-19T17:27:28.750+03:00", "identifiers": {}, "baseEntityId": "ea1f9439-a663-4073-93b9-6ef2b8bca3c1", "serverVersion": 1521033533700, "formSubmissionId": "bfbfabe8-d4ae-4db2-940f-a6f126ef7829"}', null);
+(1, '{"_id": "fa2242d1-cf34-454a-8c06-7bd55e408044", "obs": [{"values": ["2018-03-14"], "fieldCode": "1410AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "date", "formSubmissionField": "measles_1", "humanReadableValues": []}, {"values": ["1"], "fieldCode": "1418AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "calculate", "formSubmissionField": "measles_1_dose", "humanReadableValues": []}], "type": "Event", "version": 1521033238310, "duration": 0, "_rev": "1-dff06b7575a5177c7200b08570d14f4b", "eventDate": "2018-03-14T19:09:51.379+03:00", "eventType": "Vaccination", "entityType": "vaccination", "locationId": "42b88545-7ebb-4e11-8d1a-3d3a924c8af4", "providerId": "biddemo", "dateCreated": "2018-03-19T17:27:28.750+03:00", "identifiers": {}, "baseEntityId": "ea1f9439-a663-4073-93b9-6ef2b8bca3c1", "serverVersion": 1521033533700, "formSubmissionId": "bfbfabe8-d4ae-4db2-940f-a6f126ef7829"}', null),
+(2, '{"_id": "1c3f6eac-a765-4423-bbda-c01ed6430ae8", "obs": [], "_rev": "v1", "type": "Event", "teamId": " ", "details": {"id": "3761", "age": "69", "bfid": "1206030008", "flag": "Source", "species": "M", "surname": "QA Test", "focus_id": "95cf7e39-fd03-41f9-be02-a33e9a738f78", "first_name": "Madrine", "focus_name": "เมืองทอง(Source)-4", "case_number": "2401224081141261323", "family_name": "Madrine", "focus_reason": "Investigation", "focus_status": "A2", "house_number": "H321", "planIdentifier": "508f25e6-ad9c-40a7-8147-a5315499e9ab", "ep1_create_date": "2021-12-07T00:00:00.000+0000", "ep3_create_date": "2021-12-07T00:00:00.000+0000", "investigtion_date": "2021-12-07T00:00:00.000+0000", "case_classification": "Bz"}, "version": 1557860282617, "duration": 0, "eventDate": "2021-12-07T00:00:00.000Z", "eventType": "Case_Details", "entityType": "Case_Details", "locationId": "95cf7e39-fd03-41f9-be02-a33e9a738f78", "providerId": "nifi-user", "dateCreated": "2021-12-07T10:14:19.154Z", "identifiers": {}, "baseEntityId": "95cf7e39-fd03-41f9-be02-a33e9a738f78", "serverVersion": 1607066372487, "formSubmissionId": "c95dfcfb-63bf-485e-b623-c711f38dc15b"}' ,null);
+
 
 INSERT INTO core.event_metadata (id, event_id, document_id, base_entity_id, form_submission_id, server_version, openmrs_uuid, event_type, event_date, entity_type ,provider_id, location_id, team, team_id, date_created, date_edited, date_deleted) VALUES
-(1, 1, 'fa2242d1-cf34-454a-8c06-7bd55e408044', 'ea1f9439-a663-4073-93b9-6ef2b8bca3c1', 'bfbfabe8-d4ae-4db2-940f-a6f126ef7829', 1521033533700, null, 'Vaccination', '2018-03-14 19:09:51.379000', 'vaccination', 'biddemo', '42b88545-7ebb-4e11-8d1a-3d3a924c8af4', null, null, '2018-03-19 17:27:28.750000', null, null);
+(1, 1, 'fa2242d1-cf34-454a-8c06-7bd55e408044', 'ea1f9439-a663-4073-93b9-6ef2b8bca3c1', 'bfbfabe8-d4ae-4db2-940f-a6f126ef7829', 1521033533700, null, 'Vaccination', '2018-03-14 19:09:51.379000', 'vaccination', 'biddemo', '42b88545-7ebb-4e11-8d1a-3d3a924c8af4', null, null, '2018-03-19 17:27:28.750000', null, null),
+(2, 2, '1c3f6eac-a765-4423-bbda-c01ed6430ae8', '95cf7e39-fd03-41f9-be02-a33e9a738f78', '95cf7e39-fd03-41f9-be02-a33e9a738f78', 1521033533701, null, 'Case_Details', '2018-03-14 19:09:51.379000', 'location', 'biddemo', '42b88545-7ebb-4e11-8d1a-3d3a924c8af4', null, null, '2018-03-19 17:27:28.750000', null, null);
+
+INSERT INTO core.plan (id, identifier, json, date_deleted,server_version) VALUES
+(1, '362565f0-573b-11ec-bf63-0242ac130002','{"date": "2019-11-01", "goal": [{"id": "Case_Confirmation", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "case(s)", "value": 1.0, "comparator": ">="}}, "measure": "Number of cases confirmed"}], "priority": "medium-priority", "description": "Confirm the index case"}, {"id": "RACD_register_families", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures with full family registration"}], "priority": "medium-priority", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area"}, {"id": "RACD_Blood_Screening", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Person(s)", "value": 100.0, "comparator": ">="}}, "measure": "Number of registered people tested"}], "priority": "medium-priority", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person"}, {"id": "RACD_bednet_distribution", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures received nets"}], "priority": "medium-priority", "description": "Visit 100% of residential structures in the operational area and provide nets"}, {"id": "Larval_Dipping", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of larval dipping activities completed"}], "priority": "medium-priority", "description": "Perform a minimum of three larval dipping activities in the operational area"}, {"id": "Mosquito_Collection", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of mosquito collection activities completed"}], "priority": "medium-priority", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process"}, {"id": "BCC_Focus", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 1.0, "comparator": ">="}}, "measure": "Number of BCC Activities Completed"}], "priority": "medium-priority", "description": "Complete at least 1 BCC activity for the operational area"}], "name": "A1-Akros_1-2019-11-01", "title": "local A1 Akros_1 2019-11-01 test", "action": [{"code": "Case Confirmation", "title": "Case Confirmation", "goalId": "Case_Confirmation", "prefix": 1, "reason": "Investigation", "identifier": "ae158ee0-dbd1-5eb9-ae4b-cc3f1f7805fc", "description": "Confirm the index case", "taskTemplate": "Case_Confirmation", "timingPeriod": {"end": "2020-02-29", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}, {"code": "RACD Register Family", "title": "Family Registration", "goalId": "RACD_register_families", "prefix": 2, "reason": "Investigation", "identifier": "44e76d66-66a8-5d85-9ac9-53eae86888be", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area", "taskTemplate": "RACD_register_families", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Blood Screening", "title": "Blood screening", "goalId": "RACD_Blood_Screening", "prefix": 3, "reason": "Investigation", "identifier": "4ae8c881-cbda-5a48-b168-2b2bb44d018a", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person", "taskTemplate": "RACD_Blood_Screening", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Person"}}, {"code": "Bednet Distribution", "title": "Bednet Distribution", "goalId": "RACD_bednet_distribution", "prefix": 4, "reason": "Investigation", "identifier": "af35739d-c24c-509d-b102-8eece714980d", "description": "Visit 100% of residential structures in the operational area and provide nets", "taskTemplate": "Bednet_Distribution", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Larval Dipping", "title": "Larval Dipping", "goalId": "Larval_Dipping", "prefix": 5, "reason": "Investigation", "identifier": "2dacc2db-66c4-50e4-a2a9-0f65a03ed0e1", "description": "Perform a minimum of three larval dipping activities in the operational area", "taskTemplate": "Larval_Dipping", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Breeding_Site"}}, {"code": "Mosquito Collection", "title": "Mosquito Collection", "goalId": "Mosquito_Collection", "prefix": 6, "reason": "Investigation", "identifier": "a1757995-4911-54f5-8086-e8d0d133d3e2", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process", "taskTemplate": "Mosquito_Collection_Point", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Mosquito_Collection_Point"}}, {"code": "BCC", "title": "Behaviour Change Communication", "goalId": "BCC_Focus", "prefix": 7, "reason": "Investigation", "identifier": "ac04a71e-7a11-552f-91f0-4e8509e75db2", "description": "Conduct BCC activity", "taskTemplate": "BCC_Focus", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}], "status": "active", "version": "3", "identifier": "a8b3010c-1ba5-556d-8b16-71266397b8b9", "useContext": [{"code": "interventionType", "valueCodableConcept": "FI"}, {"code": "fiStatus", "valueCodableConcept": "A1"}, {"code": "fiReason", "valueCodableConcept": "Routine"}, {"code": "taskGenerationStatus", "valueCodableConcept": "True"}], "jurisdiction": [{"code": "3951"}, {"code": "3952"}], "serverVersion": 1582200627471, "effectivePeriod": {"end": "2020-04-21", "start": "2019-11-01"}}', null,0),
+(2, '3450034c-1ba5-556d-8b16-71266397b8b9','{"date": "2019-11-01", "goal": [{"id": "Case_Confirmation", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "case(s)", "value": 1.0, "comparator": ">="}}, "measure": "Number of cases confirmed"}], "priority": "medium-priority", "description": "Confirm the index case"}, {"id": "RACD_register_families", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures with full family registration"}], "priority": "medium-priority", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area"}, {"id": "RACD_Blood_Screening", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Person(s)", "value": 100.0, "comparator": ">="}}, "measure": "Number of registered people tested"}], "priority": "medium-priority", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person"}, {"id": "RACD_bednet_distribution", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures received nets"}], "priority": "medium-priority", "description": "Visit 100% of residential structures in the operational area and provide nets"}, {"id": "Larval_Dipping", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of larval dipping activities completed"}], "priority": "medium-priority", "description": "Perform a minimum of three larval dipping activities in the operational area"}, {"id": "Mosquito_Collection", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of mosquito collection activities completed"}], "priority": "medium-priority", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process"}, {"id": "BCC_Focus", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 1.0, "comparator": ">="}}, "measure": "Number of BCC Activities Completed"}], "priority": "medium-priority", "description": "Complete at least 1 BCC activity for the operational area"}], "name": "A1-Akros_1-2019-11-01", "title": "local A1 Akros_1 2019-11-01 test", "action": [{"code": "Case Confirmation", "title": "Case Confirmation", "goalId": "Case_Confirmation", "prefix": 1, "reason": "Investigation", "identifier": "ae158ee0-dbd1-5eb9-ae4b-cc3f1f7805fc", "description": "Confirm the index case", "taskTemplate": "Case_Confirmation", "timingPeriod": {"end": "2020-02-29", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}, {"code": "RACD Register Family", "title": "Family Registration", "goalId": "RACD_register_families", "prefix": 2, "reason": "Investigation", "identifier": "44e76d66-66a8-5d85-9ac9-53eae86888be", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area", "taskTemplate": "RACD_register_families", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Blood Screening", "title": "Blood screening", "goalId": "RACD_Blood_Screening", "prefix": 3, "reason": "Investigation", "identifier": "4ae8c881-cbda-5a48-b168-2b2bb44d018a", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person", "taskTemplate": "RACD_Blood_Screening", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Person"}}, {"code": "Bednet Distribution", "title": "Bednet Distribution", "goalId": "RACD_bednet_distribution", "prefix": 4, "reason": "Investigation", "identifier": "af35739d-c24c-509d-b102-8eece714980d", "description": "Visit 100% of residential structures in the operational area and provide nets", "taskTemplate": "Bednet_Distribution", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Larval Dipping", "title": "Larval Dipping", "goalId": "Larval_Dipping", "prefix": 5, "reason": "Investigation", "identifier": "2dacc2db-66c4-50e4-a2a9-0f65a03ed0e1", "description": "Perform a minimum of three larval dipping activities in the operational area", "taskTemplate": "Larval_Dipping", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Breeding_Site"}}, {"code": "Mosquito Collection", "title": "Mosquito Collection", "goalId": "Mosquito_Collection", "prefix": 6, "reason": "Investigation", "identifier": "a1757995-4911-54f5-8086-e8d0d133d3e2", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process", "taskTemplate": "Mosquito_Collection_Point", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Mosquito_Collection_Point"}}, {"code": "BCC", "title": "Behaviour Change Communication", "goalId": "BCC_Focus", "prefix": 7, "reason": "Investigation", "identifier": "ac04a71e-7a11-552f-91f0-4e8509e75db2", "description": "Conduct BCC activity", "taskTemplate": "BCC_Focus", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}], "status": "active", "version": "3", "identifier": "a8b3010c-1ba5-556d-8b16-71266397b8b9", "useContext": [{"code": "interventionType", "valueCodableConcept": "FI"}, {"code": "fiStatus", "valueCodableConcept": "A1"}, {"code": "fiReason", "valueCodableConcept": "Routine"}, {"code": "taskGenerationStatus", "valueCodableConcept": "True"}], "jurisdiction": [{"code": "3951"}, {"code": "3952"}], "serverVersion": 1582200627471, "effectivePeriod": {"end": "2020-04-21", "start": "2019-11-01"}}', null,1);
 
-INSERT INTO core.plan (id, identifier, json, date_deleted,server_version)
-VALUES (1, '362565f0-573b-11ec-bf63-0242ac130002','{"date": "2019-11-01", "goal": [{"id": "Case_Confirmation", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "case(s)", "value": 1.0, "comparator": ">="}}, "measure": "Number of cases confirmed"}], "priority": "medium-priority", "description": "Confirm the index case"}, {"id": "RACD_register_families", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures with full family registration"}], "priority": "medium-priority", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area"}, {"id": "RACD_Blood_Screening", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Person(s)", "value": 100.0, "comparator": ">="}}, "measure": "Number of registered people tested"}], "priority": "medium-priority", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person"}, {"id": "RACD_bednet_distribution", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "Percent", "value": 100.0, "comparator": ">="}}, "measure": "Percent of residential structures received nets"}], "priority": "medium-priority", "description": "Visit 100% of residential structures in the operational area and provide nets"}, {"id": "Larval_Dipping", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of larval dipping activities completed"}], "priority": "medium-priority", "description": "Perform a minimum of three larval dipping activities in the operational area"}, {"id": "Mosquito_Collection", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 3.0, "comparator": ">="}}, "measure": "Number of mosquito collection activities completed"}], "priority": "medium-priority", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process"}, {"id": "BCC_Focus", "target": [{"due": "2019-11-08", "detail": {"detailQuantity": {"unit": "activit(y|ies)", "value": 1.0, "comparator": ">="}}, "measure": "Number of BCC Activities Completed"}], "priority": "medium-priority", "description": "Complete at least 1 BCC activity for the operational area"}], "name": "A1-Akros_1-2019-11-01", "title": "local A1 Akros_1 2019-11-01 test", "action": [{"code": "Case Confirmation", "title": "Case Confirmation", "goalId": "Case_Confirmation", "prefix": 1, "reason": "Investigation", "identifier": "ae158ee0-dbd1-5eb9-ae4b-cc3f1f7805fc", "description": "Confirm the index case", "taskTemplate": "Case_Confirmation", "timingPeriod": {"end": "2020-02-29", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}, {"code": "RACD Register Family", "title": "Family Registration", "goalId": "RACD_register_families", "prefix": 2, "reason": "Investigation", "identifier": "44e76d66-66a8-5d85-9ac9-53eae86888be", "description": "Register all families & family members in all residential structures enumerated (100%) within the operational area", "taskTemplate": "RACD_register_families", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Blood Screening", "title": "Blood screening", "goalId": "RACD_Blood_Screening", "prefix": 3, "reason": "Investigation", "identifier": "4ae8c881-cbda-5a48-b168-2b2bb44d018a", "description": "Visit all residential structures (100%) within a 1 km radius of a confirmed index case and test each registered person", "taskTemplate": "RACD_Blood_Screening", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Person"}}, {"code": "Bednet Distribution", "title": "Bednet Distribution", "goalId": "RACD_bednet_distribution", "prefix": 4, "reason": "Investigation", "identifier": "af35739d-c24c-509d-b102-8eece714980d", "description": "Visit 100% of residential structures in the operational area and provide nets", "taskTemplate": "Bednet_Distribution", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Residential_Structure"}}, {"code": "Larval Dipping", "title": "Larval Dipping", "goalId": "Larval_Dipping", "prefix": 5, "reason": "Investigation", "identifier": "2dacc2db-66c4-50e4-a2a9-0f65a03ed0e1", "description": "Perform a minimum of three larval dipping activities in the operational area", "taskTemplate": "Larval_Dipping", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Breeding_Site"}}, {"code": "Mosquito Collection", "title": "Mosquito Collection", "goalId": "Mosquito_Collection", "prefix": 6, "reason": "Investigation", "identifier": "a1757995-4911-54f5-8086-e8d0d133d3e2", "description": "Set a minimum of three mosquito collection traps and complete the mosquito collection process", "taskTemplate": "Mosquito_Collection_Point", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Mosquito_Collection_Point"}}, {"code": "BCC", "title": "Behaviour Change Communication", "goalId": "BCC_Focus", "prefix": 7, "reason": "Investigation", "identifier": "ac04a71e-7a11-552f-91f0-4e8509e75db2", "description": "Conduct BCC activity", "taskTemplate": "BCC_Focus", "timingPeriod": {"end": "2019-11-08", "start": "2019-11-01"}, "subjectCodableConcept": {"text": "Operational_Area"}}], "status": "active", "version": "3", "identifier": "a8b3010c-1ba5-556d-8b16-71266397b8b9", "useContext": [{"code": "interventionType", "valueCodableConcept": "FI"}, {"code": "fiStatus", "valueCodableConcept": "A1"}, {"code": "fiReason", "valueCodableConcept": "Routine"}, {"code": "taskGenerationStatus", "valueCodableConcept": "True"}], "jurisdiction": [{"code": "3951"}, {"code": "3952"}], "serverVersion": 1582200627471, "effectivePeriod": {"end": "2020-04-21", "start": "2019-11-01"}}', null,0);
 
-INSERT INTO core.plan_metadata (operational_area_id,identifier, plan_id)
-VALUES ('3735','d8b81146-5740-11ec-bf63-0242ac130002',1);
+INSERT INTO core.plan_metadata (operational_area_id,identifier, plan_id) VALUES
+('3735','d8b81146-5740-11ec-bf63-0242ac130002',1),
+('3735','3450034c-1ba5-556d-8b16-71266397b8b9',2);
 
 INSERT INTO core.template (id,template_id, template, type)
 VALUES (1, 1, '{"date": "${currentDate}", "goal": [{"id": "Case_Confirmation", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "case(s)", "value": 1.0, "comparator": "&amp;gt;="}}, "measure": "จำนวนผู้ป่วยที่ได้รับการยืนยัน"}], "priority": "medium-priority", "description": "ยืนยันบ้านผู้ป่วย"}, {"id": "RACD_register_families", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "%", "value": 100.0, "comparator": "&gt;="}}, "measure": "ร้อยละของบ้าน สิ่งปลูกสร้างที่ได้ลงทะเบียนข้อมูลครัวเรือน"}], "priority": "medium-priority", "description": "ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน"}, {"id": "RACD_Blood_Screening", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "คน", "value": 50.0, "comparator": "&gt;="}}, "measure": "จำนวนผู้ที่ได้รับการเจาะโลหิต"}], "priority": "medium-priority", "description": "เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)"}, {"id": "BCC_Focus", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "แห่ง", "value": 1.0, "comparator": "&gt;="}}, "measure": "จำนวนกิจกรรมการให้สุขศึกษา"}], "priority": "medium-priority", "description": "ให้สุขศึกษาในพื้นที่ปฏิบัติงานอย่างน้อย 1 ครั้ง"}, {"id": "RACD_bednet_distribution", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "%", "value": 90.0, "comparator": "&gt;="}}, "measure": "จำนวนบ้าน/สิ่งปลูกสร้างที่ได้รับมุ้ง"}], "priority": "medium-priority", "description": "แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)"}, {"id": "Larval_Dipping", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "แห่ง", "value": 3.0, "comparator": "&gt;="}}, "measure": "จำนวนกิจกรรมการตักลูกน้ำ"}], "priority": "medium-priority", "description": "ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน"}, {"id": "Mosquito_Collection", "target": [{"due": "${endDate}", "detail": {"detailQuantity": {"unit": "แห่ง", "value": 3.0, "comparator": "&gt;="}}, "measure": "จำนวนกิจกรรมการจับยุง"}], "priority": "medium-priority", "description": "กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง"}], "name": "${focus_status}-${focus_name}-${patient_name}_${patient_surname}-${currentDate}-${flag}", "title": "${focus_status} - ${focus_name} - ${patient_name} ${patient_surname} - ${currentDate} - ${flag}", "action": [{"code": "Case Confirmation", "type": "create", "title": "การยืนยันบ้านผู้ป่วย", "goalId": "Case_Confirmation", "prefix": 1, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}], "condition": [{"kind": "applicability", "expression": {"expression": "questionnaire = Case_Details", "description": "Event is case details event"}}], "identifier": "662d4bff-43cc-4f50-af1e-3bc86f8af253", "description": "ยืนยันบ้านผู้ป่วย", "timingPeriod": {"end": "2021-09-23", "start": "2021-09-13"}, "definitionUri": "case_confirmation.json", "subjectCodableConcept": {"text": "Jurisdiction"}}, {"code": "RACD Register Family", "type": "create", "title": "ลงทะเบียนครัวเรือน", "goalId": "RACD_register_families", "prefix": 2, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Register_Structure or questionnaire = Archive_Family", "description": "Trigger when a Register_Structure event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.Location) or (questionnaire = Register_Structure and $this.item.where(linkId=structureType).answer.value =Residential Structure)", "description": "Apply to residential structures in Register_Structure questionnaires"}}, {"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or (($this.type.where(id=locationType).exists().not() or $this.type.where(id=locationType).text = Residential Structure) and $this.contained.exists().not())", "description": "Structure is residential or type does not exist", "subjectCodableConcept": {"text": "Family"}}}], "identifier": "${registerFamilyActionId}", "description": "ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "family_register.json", "subjectCodableConcept": {"text": "Location"}}, {"code": "Blood Screening", "type": "create", "title": "กิจกรรมการเจาะโลหิต", "goalId": "RACD_Blood_Screening", "prefix": 3, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Family_Registration or questionnaire = Family_Member_Registration", "description": "Trigger when a Family Registration or Family Member Registration event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "($this.is(FHIR.Patient) and $this.birthDate &lt;= today() - 5 years) or ($this.contained.where(Patient.birthDate &lt;= today() - 5 years).exists())", "description": "Person is older than 5 years or person associated with questionnaire response if older than 5 years"}}], "identifier": "${bloodScreeningActionId}", "description": "เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "blood_screening.json", "subjectCodableConcept": {"text": "Person"}}, {"code": "BCC", "type": "create", "title": "กิจกรรมการให้สุขศึกษา", "goalId": "BCC_Focus", "prefix": 4, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}], "condition": [{"kind": "applicability", "expression": {"expression": "Location.physicalType.coding.exists(code=jdn)", "description": "Jurisdiction type location"}}], "identifier": "${bccActionId}", "description": "ดำเนินกิจกรรมให้สุขศึกษา", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "behaviour_change_communication.json", "subjectCodableConcept": {"text": "Jurisdiction"}}, {"code": "Bednet Distribution", "type": "create", "title": "กิจกรรมสำรวจ/ชุบ/แจกมุ้ง", "goalId": "RACD_bednet_distribution", "prefix": 5, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Family_Registration", "description": "Trigger when a Family Registration event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or (($this.type.where(id=locationType).exists().not() or $this.type.where(id=locationType).text = Residential Structure) and $this.contained.exists())", "description": "Structure is residential or type does not exist", "subjectCodableConcept": {"text": "Family"}}}], "identifier": "${bednetDistributionActionId}", "description": "แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "bednet_distribution.json", "subjectCodableConcept": {"text": "Location"}}, {"code": "Larval Dipping", "type": "create", "title": "กิจกรรมการตักลูกน้ำ", "goalId": "Larval_Dipping", "prefix": 6, "reason": "Investigation", "trigger": [{"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Register_Structure", "description": "Trigger when a Register_Structure event is submitted"}}, {"name": "plan-activation", "type": "named-event"}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.Location) or (questionnaire = Register_Structure and $this.item.where(linkId=structureType).answer.value =Larval Breeding Site)", "description": "Apply to larval breeding sites in Register_Structure questionnaires"}}, {"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or $this.type.where(id=locationType).text = Larval Breeding Site", "description": "Structure is a larval breeding site"}}], "identifier": "${larvalDippingActionId}", "description": "ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "larval_dipping_form.json", "subjectCodableConcept": {"text": "Location"}}, {"code": "Mosquito Collection", "type": "create", "title": "กิจกรรมการจับยุง", "goalId": "Mosquito_Collection", "prefix": 7, "reason": "Investigation", "trigger": [{"name": "plan-activation", "type": "named-event"}, {"name": "event-submission", "type": "named-event", "expression": {"expression": "questionnaire = Register_Structure", "description": "Trigger when a Register_Structure event is submitted"}}], "condition": [{"kind": "applicability", "expression": {"expression": "$this.is(FHIR.QuestionnaireResponse) or $this.type.where(id=locationType).text = Mosquito Collection Point", "description": "Structure is a mosquito collection point"}}, {"kind": "applicability", "expression": {"expression": "$this.is(FHIR.Location) or (questionnaire = Register_Structure and $this.item.where(linkId=structureType).answer.value =Mosquito Collection Point)", "description": "Apply to mosquito collection point in Register_Structure questionnaires"}}], "identifier": "${mosquitoCollectionActionId}", "description": "กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง", "timingPeriod": {"end": "${endDate}", "start": "${currentDate}"}, "definitionUri": "mosquito_collection_form.json", "subjectCodableConcept": {"text": "Location"}}], "status": "draft", "version": "1", "identifier": "${planIdentifier}", "useContext": [{"code": "interventionType", "valueCodableConcept": "Dynamic-FI"}, {"code": "fiStatus", "valueCodableConcept": "${focus_status}"}, {"code": "fiReason", "valueCodableConcept": "Case Triggered"}, {"code": "opensrpEventId", "valueCodableConcept": "${opensrpCaseClassificationEventId}"}, {"code": "caseNum", "valueCodableConcept": "${case_number}"}, {"code": "taskGenerationStatus", "valueCodableConcept": "internal"}], "experimental": false, "jurisdiction": [{"code": "${focus_id}"}], "serverVersion": 0, "effectivePeriod": {"end": "${endDate}", "start": "${currentDate}"}}' , 'plan');

From 66abae4ad0a1064bea54a880ad226f5b8d693d90 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 16:27:21 +0300
Subject: [PATCH 35/47] Add template unit tests

---
 .../java/org/opensrp/domain/Template.java     |   2 +-
 .../postgres/TemplateRepositoryImpl.java      |   4 +-
 .../PlanProcessingStatusRepositoryTest.java   |   2 +
 .../postgres/TemplateRepositoryTest.java      | 105 +++++++++++++++++-
 4 files changed, 104 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/opensrp/domain/Template.java b/src/main/java/org/opensrp/domain/Template.java
index a9b0ee265..ece96fddd 100644
--- a/src/main/java/org/opensrp/domain/Template.java
+++ b/src/main/java/org/opensrp/domain/Template.java
@@ -36,7 +36,7 @@ public String getType() {
     }
 
     public void setType(String type) {
-        type = type;
+        this.type = type;
     }
 
     public int getVersion() {
diff --git a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
index 5994b9482..fe9e092b9 100644
--- a/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/TemplateRepositoryImpl.java
@@ -58,8 +58,8 @@ public void update(Template template) {
 
         org.opensrp.domain.postgres.Template pgTemplate = convert(template);
 
-        pgTemplate.setId(id);templateMapper.updateByPrimaryKeySelective(pgTemplate);
-        //templateMapper.updateByPrimaryKey(pgTemplate);
+        pgTemplate.setId(id);
+        templateMapper.updateByPrimaryKey(pgTemplate);
     }
 
     @Override
diff --git a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
index 71a308c46..df27b9dee 100644
--- a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
@@ -1,6 +1,7 @@
 package org.opensrp.repository.postgres;
 
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.opensrp.domain.postgres.PlanProcessingStatus;
 import org.opensrp.repository.PlanProcessingStatusRepository;
@@ -90,6 +91,7 @@ public void testGetByStatusReturnsCorrectValue() {
     }
 
     @Test
+    @Ignore
     public void testAddPlanProcessingStatus() {
         List<PlanProcessingStatus> statusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.COMPLETE);
         assertTrue(statusList.isEmpty());
diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
index 549dc83de..463d79339 100644
--- a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -29,6 +29,104 @@ protected Set<String> getDatabaseScripts() {
 
     @Test
     public void testAddShouldAddNewTemplate() {
+        Template template = initTestTemplate();
+        templateRepository.add(template);
+
+        List<Template> actualTemplates = templateRepository.getAll();
+        Assert.assertNotNull(actualTemplates);
+        Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
+        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+    }
+
+    @Test
+    public void testUpdateShouldUpdateExistingTemplate() {
+        Template template = initTestTemplate();
+        templateRepository.add(template);
+
+        List<Template> actualTemplates = templateRepository.getAll();
+        Assert.assertNotNull(actualTemplates);
+        Assert.assertEquals(1, actualTemplates.size());
+        Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
+        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+
+        template.setType("event");
+        templateRepository.update(template);
+
+        List<Template> updatedTemplates = templateRepository.getAll();
+        Assert.assertNotNull(updatedTemplates);
+        Assert.assertEquals(1, updatedTemplates.size());
+        Template updatedTemplate = updatedTemplates.get(0);
+        Assert.assertEquals("event", updatedTemplate.getType());
+        Assert.assertEquals("operation_area_1", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
+
+    }
+
+    @Test
+    public void testGetAll() {
+        Template template = initTestTemplate();
+        templateRepository.add(template);
+
+        Template template2 = initTestTemplate();
+        template2.setTemplateId(2);
+        template2.setType("event");
+        templateRepository.add(template2);
+
+        List<Template> actualTemplates = templateRepository.getAll();
+        Assert.assertNotNull(actualTemplates);
+        Assert.assertEquals(2, actualTemplates.size());
+
+    }
+
+    @Test
+    public void testGetAllWithLimit() {
+        Template template = initTestTemplate();
+        templateRepository.add(template);
+
+        Template template2 = initTestTemplate();
+        template2.setTemplateId(2);
+        template2.setType("event");
+        templateRepository.add(template2);
+
+        List<Template> actualTemplates = templateRepository.getAll(1);
+        Assert.assertNotNull(actualTemplates);
+        Assert.assertEquals(1, actualTemplates.size());
+
+    }
+
+    @Test
+    public void testGetTemplateByTemplateIdShouldReturnCorrectTemplate() {
+        Template template = initTestTemplate();
+        templateRepository.add(template);
+
+        Template template2 = initTestTemplate();
+        template2.setTemplateId(2);
+        template2.setType("event");
+        templateRepository.add(template2);
+
+        Template actualTemplate = templateRepository.getTemplateByTemplateId(2);
+        Assert.assertNotNull(actualTemplate);
+        Assert.assertEquals(2, actualTemplate.getTemplateId().intValue());
+        Assert.assertEquals("event", actualTemplate.getType());
+        Assert.assertEquals("operation_area_1", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
+    }
+
+    @Test
+    public void testGetTemplateShouldReturnCorrectPgTemplate() {
+        Template template = initTestTemplate();
+        templateRepository.add(template);
+
+        Template template2 = initTestTemplate();
+        template2.setTemplateId(2);
+        template2.setType("event");
+        templateRepository.add(template2);
+
+        org.opensrp.domain.postgres.Template actualTemplate = templateRepository.getTemplate(2);
+        Assert.assertNotNull(actualTemplate);
+        Assert.assertEquals(2, actualTemplate.getTemplateId().intValue());
+        Assert.assertEquals("event", actualTemplate.getType());
+    }
+
+    private Template initTestTemplate() {
         PlanTemplate planTemplate = new PlanTemplate();
 
         List<Jurisdiction> jurisdictions = new ArrayList<>();
@@ -41,12 +139,7 @@ public void testAddShouldAddNewTemplate() {
         template.setTemplate(planTemplate);
         template.setTemplateId(1);
         template.setType("1");
-        templateRepository.add(template);
-
-        List<Template> actualTemplates = templateRepository.getAll();
-        Assert.assertNotNull(actualTemplates);
-        Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        return template;
     }
 
 }

From 98e6ea8833afe787f8f3caf1ff0ba9e3be392ed0 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 16:36:45 +0300
Subject: [PATCH 36/47] Fix codacy issues

---
 src/main/java/org/opensrp/domain/ActionTemplate.java | 2 --
 src/main/java/org/opensrp/domain/GoalTemplate.java   | 3 ---
 src/main/java/org/opensrp/domain/PlanTemplate.java   | 3 ---
 src/main/java/org/opensrp/domain/TargetTemplate.java | 9 ---------
 4 files changed, 17 deletions(-)

diff --git a/src/main/java/org/opensrp/domain/ActionTemplate.java b/src/main/java/org/opensrp/domain/ActionTemplate.java
index 4f545e963..20165a363 100644
--- a/src/main/java/org/opensrp/domain/ActionTemplate.java
+++ b/src/main/java/org/opensrp/domain/ActionTemplate.java
@@ -184,7 +184,5 @@ public static enum ActionType {
         @SerializedName("fire-event")
         FIRE_EVENT;
 
-        private ActionType() {
-        }
     }
 }
diff --git a/src/main/java/org/opensrp/domain/GoalTemplate.java b/src/main/java/org/opensrp/domain/GoalTemplate.java
index 895c9d574..30facc66a 100644
--- a/src/main/java/org/opensrp/domain/GoalTemplate.java
+++ b/src/main/java/org/opensrp/domain/GoalTemplate.java
@@ -16,9 +16,6 @@ public class GoalTemplate implements Serializable {
     @SerializedName("target")
     private List<TargetTemplate> targets;
 
-    public GoalTemplate() {
-    }
-
     public String getId() {
         return this.id;
     }
diff --git a/src/main/java/org/opensrp/domain/PlanTemplate.java b/src/main/java/org/opensrp/domain/PlanTemplate.java
index 061aaffd6..5f26afcb9 100644
--- a/src/main/java/org/opensrp/domain/PlanTemplate.java
+++ b/src/main/java/org/opensrp/domain/PlanTemplate.java
@@ -40,9 +40,6 @@ public class PlanTemplate  implements Serializable {
     @JsonProperty
     private boolean experimental;
 
-    public PlanTemplate() {
-    }
-
     public String getIdentifier() {
         return this.identifier;
     }
diff --git a/src/main/java/org/opensrp/domain/TargetTemplate.java b/src/main/java/org/opensrp/domain/TargetTemplate.java
index 4c5298427..54b79d29f 100644
--- a/src/main/java/org/opensrp/domain/TargetTemplate.java
+++ b/src/main/java/org/opensrp/domain/TargetTemplate.java
@@ -9,9 +9,6 @@ public class TargetTemplate implements Serializable {
     private TargetTemplate.Detail detail;
     private String due;
 
-    public TargetTemplate() {
-    }
-
     public String getMeasure() {
         return this.measure;
     }
@@ -39,9 +36,6 @@ public void setDetail(TargetTemplate.Detail detail) {
     static class DetailCodableConcept {
         private String text;
 
-        DetailCodableConcept() {
-        }
-
         public String getText() {
             return this.text;
         }
@@ -113,9 +107,6 @@ static class Detail implements Serializable {
         private TargetTemplate.MeasureRange detailRange;
         private AbstractMap.SimpleEntry<String, String> detailCodableConcept;
 
-        Detail() {
-        }
-
         public TargetTemplate.Measure getDetailQuantity() {
             return this.detailQuantity;
         }

From d435f11ce9dfcf512eeb04632657d12a3f1efba0 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 16:41:29 +0300
Subject: [PATCH 37/47] Reset plan processing status ud sequence

---
 src/test/resources/test-scripts/plan_processing_status.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/resources/test-scripts/plan_processing_status.sql b/src/test/resources/test-scripts/plan_processing_status.sql
index e96ecaee2..caa3d1706 100644
--- a/src/test/resources/test-scripts/plan_processing_status.sql
+++ b/src/test/resources/test-scripts/plan_processing_status.sql
@@ -13,6 +13,8 @@ TRUNCATE TABLE core.plan_metadata CASCADE;
 
 TRUNCATE TABLE core.plan_processing_status CASCADE;
 
+ALTER SEQUENCE core.plan_processing_status_id_seq RESTART WITH 6;
+
 --insert data
 INSERT INTO core.event (id, json, date_deleted) VALUES
 (1, '{"_id": "fa2242d1-cf34-454a-8c06-7bd55e408044", "obs": [{"values": ["2018-03-14"], "fieldCode": "1410AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "date", "formSubmissionField": "measles_1", "humanReadableValues": []}, {"values": ["1"], "fieldCode": "1418AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldType": "concept", "parentCode": "36AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "fieldDataType": "calculate", "formSubmissionField": "measles_1_dose", "humanReadableValues": []}], "type": "Event", "version": 1521033238310, "duration": 0, "_rev": "1-dff06b7575a5177c7200b08570d14f4b", "eventDate": "2018-03-14T19:09:51.379+03:00", "eventType": "Vaccination", "entityType": "vaccination", "locationId": "42b88545-7ebb-4e11-8d1a-3d3a924c8af4", "providerId": "biddemo", "dateCreated": "2018-03-19T17:27:28.750+03:00", "identifiers": {}, "baseEntityId": "ea1f9439-a663-4073-93b9-6ef2b8bca3c1", "serverVersion": 1521033533700, "formSubmissionId": "bfbfabe8-d4ae-4db2-940f-a6f126ef7829"}', null),

From ceb35b420e135d69404814ccaac6e48766af947c Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 16:52:50 +0300
Subject: [PATCH 38/47] Code cleanup

---
 src/main/java/org/opensrp/domain/PlanTemplate.java          | 3 ---
 src/main/java/org/opensrp/domain/TargetTemplate.java        | 6 ------
 .../postgres/PlanProcessingStatusRepositoryTest.java        | 1 -
 3 files changed, 10 deletions(-)

diff --git a/src/main/java/org/opensrp/domain/PlanTemplate.java b/src/main/java/org/opensrp/domain/PlanTemplate.java
index 5f26afcb9..23b490a32 100644
--- a/src/main/java/org/opensrp/domain/PlanTemplate.java
+++ b/src/main/java/org/opensrp/domain/PlanTemplate.java
@@ -197,9 +197,6 @@ public static class UseContext implements Serializable {
         private String code;
         private String valueCodableConcept;
 
-        public UseContext() {
-        }
-
         public String getCode() {
             return this.code;
         }
diff --git a/src/main/java/org/opensrp/domain/TargetTemplate.java b/src/main/java/org/opensrp/domain/TargetTemplate.java
index 54b79d29f..41660216b 100644
--- a/src/main/java/org/opensrp/domain/TargetTemplate.java
+++ b/src/main/java/org/opensrp/domain/TargetTemplate.java
@@ -49,9 +49,6 @@ static class MeasureRange implements Serializable {
         private TargetTemplate.Measure high;
         private TargetTemplate.Measure low;
 
-        MeasureRange() {
-        }
-
         public TargetTemplate.Measure getHigh() {
             return this.high;
         }
@@ -74,9 +71,6 @@ static class Measure implements Serializable {
         private String comparator;
         private String unit;
 
-        Measure() {
-        }
-
         public float getValue() {
             return this.value;
         }
diff --git a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
index df27b9dee..59d965383 100644
--- a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
@@ -91,7 +91,6 @@ public void testGetByStatusReturnsCorrectValue() {
     }
 
     @Test
-    @Ignore
     public void testAddPlanProcessingStatus() {
         List<PlanProcessingStatus> statusList = planProcessingStatusRepository.getByStatus(PlanProcessingStatusConstants.COMPLETE);
         assertTrue(statusList.isEmpty());

From b12430ecc2e167c8a71f5e7a9c63bc20824dae43 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Tue, 7 Dec 2021 16:59:37 +0300
Subject: [PATCH 39/47] Remove unused import

---
 .../repository/postgres/PlanProcessingStatusRepositoryTest.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
index 59d965383..71a308c46 100644
--- a/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/PlanProcessingStatusRepositoryTest.java
@@ -1,7 +1,6 @@
 package org.opensrp.repository.postgres;
 
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.opensrp.domain.postgres.PlanProcessingStatus;
 import org.opensrp.repository.PlanProcessingStatusRepository;

From 4b9f54f86c2f28a211c1938948767b69cf4360ac Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Wed, 8 Dec 2021 19:11:04 +0300
Subject: [PATCH 40/47] Add plan service tests

---
 .../java/org/opensrp/service/PlanService.java |   2 +-
 .../org/opensrp/service/PlanServiceTest.java  | 119 ++++++++++++++++++
 2 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opensrp/service/PlanService.java b/src/main/java/org/opensrp/service/PlanService.java
index eeac3a208..ffcb81424 100755
--- a/src/main/java/org/opensrp/service/PlanService.java
+++ b/src/main/java/org/opensrp/service/PlanService.java
@@ -467,7 +467,7 @@ private boolean populateBedNetDistributionCounts(PlanDefinition plan, List<TaskC
 		Map<String, String> properties = new HashMap<>();
 		properties.put(PlanConstants.TYPE, PlanConstants.RESIDENTIAL_STRUCTURE);
 		residentialStructureIds = locationService.findStructureIdsByProperties(planJurisdictionIds, properties, Integer.MAX_VALUE);
-		otherPlanFamRegCount = taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.RACD_REGISTER_FAMILY, residentialStructureIds, true);
+		otherPlanFamRegCount = taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.BEDNET_DISTRIBUTION, residentialStructureIds, true);
 
 		long expectedTaskCount = residentialStructureIds.size() - otherPlanFamRegCount;
 		long missingTaskCount = expectedTaskCount - actualTaskCount;
diff --git a/src/test/java/org/opensrp/service/PlanServiceTest.java b/src/test/java/org/opensrp/service/PlanServiceTest.java
index 62e54c15a..5b4497acd 100755
--- a/src/test/java/org/opensrp/service/PlanServiceTest.java
+++ b/src/test/java/org/opensrp/service/PlanServiceTest.java
@@ -465,4 +465,123 @@ public void testPopulateTaskCountForFamilyRegistration() {
 
 	}
 
+	@Test
+	public void testPopulateTaskCountForBedNetDistribution() {
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("bednet-distribution-plan");
+		Action action = new Action();
+		action.setIdentifier("bednet-distribution-action");
+		action.setCode(PlanConstants.BEDNET_DISTRIBUTION);
+		plan.setActions(Collections.singletonList(action));
+		plan.setJurisdiction(Collections.singletonList(new Jurisdiction("location-id1")));
+		when(taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.BEDNET_DISTRIBUTION,
+				null, false)).thenReturn(2l);
+		Map<String, String> properties = new HashMap<>();
+		properties.put(PlanConstants.TYPE, PlanConstants.RESIDENTIAL_STRUCTURE);
+		List<String> structureIds = new ArrayList<>();
+		structureIds.add("structure-id-1");
+		structureIds.add("structure-id-2");
+		structureIds.add("structure-id-3");
+		when(locationService.findStructureIdsByProperties(Collections.singletonList("location-id1"),
+				properties, Integer.MAX_VALUE)).thenReturn(structureIds);
+		when(taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.BEDNET_DISTRIBUTION,
+				null,false)).thenReturn(1l);
+		when(taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.BEDNET_DISTRIBUTION,
+				structureIds,true)).thenReturn(1l);
+
+		PlanTaskCount planTaskCount = planService.populatePlanTaskCount(plan);
+		assertNotNull(planTaskCount);
+		TaskCount actualTaskCount = planTaskCount.getTaskCounts().get(0);
+		assertEquals("bednet-distribution-plan", planTaskCount.getPlanIdentifier());
+		assertEquals(2l, actualTaskCount.getExpectedCount());
+		assertEquals(1l,  actualTaskCount.getActualCount());
+		assertEquals(1l, actualTaskCount.getMissingCount());
+
+	}
+
+	@Test
+	public void testPopulateTaskCountForLarvalDipping() {
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("larval-dipping-plan");
+		Action action = new Action();
+		action.setIdentifier("larval-dipping-action");
+		action.setCode(PlanConstants.LARVAL_DIPPING);
+		plan.setActions(Collections.singletonList(action));
+		plan.setJurisdiction(Collections.singletonList(new Jurisdiction("location-id1")));
+		when(taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.LARVAL_DIPPING,
+				null, false)).thenReturn(1l);
+		Map<String, String> properties = new HashMap<>();
+		properties.put(PlanConstants.TYPE, PlanConstants.LARVAL_DIPPING_SITE);
+		List<String> structureIds = new ArrayList<>();
+		structureIds.add("structure-id-1");
+		structureIds.add("structure-id-2");
+		structureIds.add("structure-id-3");
+		when(locationService.countStructuresByProperties(Collections.singletonList("location-id1"),
+				properties)).thenReturn(3l);
+
+		PlanTaskCount planTaskCount = planService.populatePlanTaskCount(plan);
+		assertNotNull(planTaskCount);
+		TaskCount actualTaskCount = planTaskCount.getTaskCounts().get(0);
+		assertEquals("larval-dipping-plan", planTaskCount.getPlanIdentifier());
+		assertEquals(3l, actualTaskCount.getExpectedCount());
+		assertEquals(1l,  actualTaskCount.getActualCount());
+		assertEquals(2l, actualTaskCount.getMissingCount());
+
+	}
+
+	@Test
+	public void testPopulateTaskCountForMosquitoCollection() {
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("mosquito-collection-plan");
+		Action action = new Action();
+		action.setIdentifier("mosquito-collection-action");
+		action.setCode(PlanConstants.MOSQUITO_COLLECTION);
+		plan.setActions(Collections.singletonList(action));
+		plan.setJurisdiction(Collections.singletonList(new Jurisdiction("location-id1")));
+		when(taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.MOSQUITO_COLLECTION,
+				null, false)).thenReturn(1l);
+		Map<String, String> properties = new HashMap<>();
+		properties.put(PlanConstants.TYPE, PlanConstants.MOSQUITO_COLLECTION_POINT);
+		List<String> structureIds = new ArrayList<>();
+		structureIds.add("structure-id-1");
+		structureIds.add("structure-id-2");
+		structureIds.add("structure-id-3");
+		when(locationService.countStructuresByProperties(Collections.singletonList("location-id1"),
+				properties)).thenReturn(3l);
+
+		PlanTaskCount planTaskCount = planService.populatePlanTaskCount(plan);
+		assertNotNull(planTaskCount);
+		TaskCount actualTaskCount = planTaskCount.getTaskCounts().get(0);
+		assertEquals("mosquito-collection-plan", planTaskCount.getPlanIdentifier());
+		assertEquals(3l, actualTaskCount.getExpectedCount());
+		assertEquals(1l,  actualTaskCount.getActualCount());
+		assertEquals(2l, actualTaskCount.getMissingCount());
+
+	}
+
+	@Test
+	public void testPopulateTaskCountForBloodScreening() {
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("blood-screening-plan");
+		Action action = new Action();
+		action.setIdentifier("blood-screening-action");
+		action.setCode(PlanConstants.BLOOD_SCREENING);
+		plan.setActions(Collections.singletonList(action));
+		plan.setJurisdiction(Collections.singletonList(new Jurisdiction("location-id1")));
+		when(taskService.countTasksByPlanAndCode(plan.getIdentifier(), PlanConstants.BLOOD_SCREENING,
+				null, false)).thenReturn(1l);
+
+		when(clientService.countFamilyMembersByLocation(Collections.singletonList("location-id1"),
+				5)).thenReturn(3l);
+
+		PlanTaskCount planTaskCount = planService.populatePlanTaskCount(plan);
+		assertNotNull(planTaskCount);
+		TaskCount actualTaskCount = planTaskCount.getTaskCounts().get(0);
+		assertEquals("blood-screening-plan", planTaskCount.getPlanIdentifier());
+		assertEquals(3l, actualTaskCount.getExpectedCount());
+		assertEquals(1l,  actualTaskCount.getActualCount());
+		assertEquals(2l, actualTaskCount.getMissingCount());
+
+	}
+
 }

From 0b455c32766b9c5c249fa8e639b07884cc7df0f0 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 06:11:45 +0300
Subject: [PATCH 41/47] Add get plan template tests

---
 .../postgres/PlanRepositoryImpl.java          |   2 +-
 .../java/org/opensrp/service/PlanService.java |  13 +-
 .../opensrp/util/constants/PlanConstants.java |   2 +
 .../org/opensrp/service/PlanServiceTest.java  | 138 ++++++++++++++++++
 4 files changed, 148 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opensrp/repository/postgres/PlanRepositoryImpl.java b/src/main/java/org/opensrp/repository/postgres/PlanRepositoryImpl.java
index 6a29ea5e9..b0190f6ff 100644
--- a/src/main/java/org/opensrp/repository/postgres/PlanRepositoryImpl.java
+++ b/src/main/java/org/opensrp/repository/postgres/PlanRepositoryImpl.java
@@ -408,7 +408,7 @@ public List<PlanDefinition> getPlansByIdentifiersAndStatusAndDateEdited(List<Str
             if (toDate == null && fromDate == null){
                 Calendar calendar = Calendar.getInstance();
                 Date localToDate = calendar.getTime();
-                calendar.add(Calendar.DATE, -1);
+                calendar.add(Calendar.DATE, -7);
                 Date localFromDate = calendar.getTime();
                 criteria.andDateEditedBetween( localFromDate, localToDate);
             } else if (fromDate == null) {
diff --git a/src/main/java/org/opensrp/service/PlanService.java b/src/main/java/org/opensrp/service/PlanService.java
index ffcb81424..5adb1e340 100755
--- a/src/main/java/org/opensrp/service/PlanService.java
+++ b/src/main/java/org/opensrp/service/PlanService.java
@@ -19,8 +19,6 @@
 import org.opensrp.util.constants.PlanConstants;
 import org.smartregister.domain.Action;
 import org.smartregister.domain.Event;
-import org.opensrp.util.constants.PlanConstants;
-import org.smartregister.domain.Action;
 import org.smartregister.domain.Jurisdiction;
 import org.smartregister.domain.PlanDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +26,9 @@
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import static org.opensrp.util.constants.PlanConstants.PLAN_TEMPLATE_1;
+import static org.opensrp.util.constants.PlanConstants.PLAN_TEMPLATE_2;
+
 @Service
 public class PlanService {
 
@@ -542,18 +543,18 @@ public Integer getPlanTemplate(Event event) {
 		}
 		if (PlanConstants.A1.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))
 				|| PlanConstants.A2.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))) {
-			planTemplateId = 1;
+			planTemplateId = PLAN_TEMPLATE_1;
 		} else if ((PlanConstants.B1.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))
 				|| PlanConstants.B2.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS)))
 				&& PlanConstants.LOCAL.equalsIgnoreCase(event.getDetails().get(PlanConstants.CASE_CLASSIFICATION))
 		) {
 			if (PlanConstants.BEDNET_DISTRIBUTION.equalsIgnoreCase(historicalIntervention)) {
-				planTemplateId = 1;
+				planTemplateId = PLAN_TEMPLATE_1;
 			} else if (PlanConstants.IRS.equalsIgnoreCase(historicalIntervention)) {
-				planTemplateId = 1;
+				planTemplateId = PLAN_TEMPLATE_1;
 			}
 		} else if (PlanConstants.B1.equalsIgnoreCase(event.getDetails().get(PlanConstants.FOCUS_STATUS))) {
-			planTemplateId = 2;
+			planTemplateId = PLAN_TEMPLATE_2;
 		}
 		return planTemplateId;
 	}
diff --git a/src/main/java/org/opensrp/util/constants/PlanConstants.java b/src/main/java/org/opensrp/util/constants/PlanConstants.java
index 4fa811e0f..65d42f1d2 100644
--- a/src/main/java/org/opensrp/util/constants/PlanConstants.java
+++ b/src/main/java/org/opensrp/util/constants/PlanConstants.java
@@ -19,6 +19,8 @@ public interface PlanConstants {
     String FIRST_NAME = "first_name";
     String SURNAME = "surname";
     String FAMILY_NAME = "family_name";
+    int PLAN_TEMPLATE_1 = 1;
+    int PLAN_TEMPLATE_2 = 2;
 
     String CASE_CONFIRMATION = "Case Confirmation";
     String BCC = "BCC";
diff --git a/src/test/java/org/opensrp/service/PlanServiceTest.java b/src/test/java/org/opensrp/service/PlanServiceTest.java
index 5b4497acd..27e38b148 100755
--- a/src/test/java/org/opensrp/service/PlanServiceTest.java
+++ b/src/test/java/org/opensrp/service/PlanServiceTest.java
@@ -1,5 +1,7 @@
 package org.opensrp.service;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
@@ -35,6 +37,7 @@
 import org.opensrp.search.PlanSearchBean;
 import org.opensrp.util.constants.PlanConstants;
 import org.smartregister.domain.Action;
+import org.smartregister.domain.Event;
 import org.smartregister.domain.Jurisdiction;
 import org.smartregister.domain.PlanDefinition;
 import org.opensrp.domain.postgres.PractitionerRole;
@@ -584,4 +587,139 @@ public void testPopulateTaskCountForBloodScreening() {
 
 	}
 
+	@Test
+	public void testValidateCaseDetailsEvent() {
+		Event event = initTestCaseDetailsEvent();
+		assertTrue(planService.validateCaseDetailsEvent(event));
+
+		event.setDetails(null);
+		assertFalse(planService.validateCaseDetailsEvent(event));
+
+		event = initTestCaseDetailsEvent();
+		event.getDetails().remove(PlanConstants.CASE_NUMBER);
+		assertFalse(planService.validateCaseDetailsEvent(event));
+
+		event = initTestCaseDetailsEvent();
+		event.getDetails().remove(PlanConstants.FOCUS_ID);
+		assertFalse(planService.validateCaseDetailsEvent(event));
+
+		event = initTestCaseDetailsEvent();
+		event.getDetails().remove(PlanConstants.FOCUS_STATUS);
+		assertFalse(planService.validateCaseDetailsEvent(event));
+
+		event = initTestCaseDetailsEvent();
+		event.getDetails().remove(PlanConstants.FLAG);
+		assertFalse(planService.validateCaseDetailsEvent(event));
+	}
+
+	@Test
+	public void testGetPlanTemplateWhenFocusStateIsA1() {
+		Event event = initTestCaseDetailsEvent();
+		event.getDetails().put(PlanConstants.FOCUS_STATUS, PlanConstants.A1);
+		int planTemplate = planService.getPlanTemplate(event);
+		assertEquals(1, planTemplate);
+	}
+
+	@Test
+	public void testGetPlanTemplateWhenFocusStateIsB1AndCaseClassificationIsLocal() {
+		Event event = initTestCaseDetailsEvent();
+		event.getDetails().put(PlanConstants.FOCUS_STATUS, PlanConstants.B1);
+		event.getDetails().put(PlanConstants.CASE_CLASSIFICATION, PlanConstants.LOCAL);
+		planService = spy(planService);
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("bednet-distribution-plan");
+		Action action = new Action();
+		action.setIdentifier("bednet-distribution-action");
+		action.setCode(PlanConstants.BEDNET_DISTRIBUTION);
+		plan.setActions(Collections.singletonList(action));
+		List<String> operationalAreaIds = Collections.singletonList("location-id-1");
+		planService = spy(planService);
+		when(planService.getPlansByServerVersionAndOperationalArea(0,
+				operationalAreaIds,false))
+				.thenReturn(Collections.singletonList(plan));
+		int planTemplate = planService.getPlanTemplate(event);
+		assertEquals(1, planTemplate);
+	}
+
+	@Test
+	public void testGetPlanTemplateWhenFocusStateIsB1AndCaseClassificationIsLocalAndIRSHistoricalEvent() {
+		Event event = initTestCaseDetailsEvent();
+		event.getDetails().put(PlanConstants.FOCUS_STATUS, PlanConstants.B1);
+		event.getDetails().put(PlanConstants.CASE_CLASSIFICATION, PlanConstants.LOCAL);
+		planService = spy(planService);
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("irs-plan");
+		Action action = new Action();
+		action.setIdentifier("irs-action");
+		action.setCode(PlanConstants.IRS);
+		plan.setActions(Collections.singletonList(action));
+		List<String> operationalAreaIds = Collections.singletonList("location-id-1");
+		planService = spy(planService);
+		when(planService.getPlansByServerVersionAndOperationalArea(0,
+				operationalAreaIds,false))
+				.thenReturn(Collections.singletonList(plan));
+		int planTemplate = planService.getPlanTemplate(event);
+		assertEquals(1, planTemplate);
+	}
+
+	@Test
+	public void testGetPlanTemplateWhenFocusStateIsB1AndCaseClassificationIsBF() {
+		Event event = initTestCaseDetailsEvent();
+		event.getDetails().put(PlanConstants.FOCUS_STATUS, PlanConstants.B1);
+		event.getDetails().put(PlanConstants.CASE_CLASSIFICATION, "BF");
+		int planTemplate = planService.getPlanTemplate(event);
+		assertEquals(2, planTemplate);
+	}
+
+	@Test
+	public void testGetHistoricalInterventionForBedNetDistribution() {
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("bednet-distribution-plan");
+		Action action = new Action();
+		action.setIdentifier("bednet-distribution-action");
+		action.setCode(PlanConstants.BEDNET_DISTRIBUTION);
+		plan.setActions(Collections.singletonList(action));
+		List<String> operationalAreaIds = Collections.singletonList("location-id-1");
+		planService = spy(planService);
+		when(planService.getPlansByServerVersionAndOperationalArea(0,
+				operationalAreaIds,false))
+				.thenReturn(Collections.singletonList(plan));
+
+		String historicalIntervention = planService.getHistoricalIntervention(operationalAreaIds);
+		assertEquals(PlanConstants.BEDNET_DISTRIBUTION, historicalIntervention);
+
+	}
+
+	@Test
+	public void testGetHistoricalInterventionForIRS() {
+		PlanDefinition plan = new PlanDefinition();
+		plan.setIdentifier("irs-plan");
+		Action action = new Action();
+		action.setIdentifier("irs-action");
+		action.setCode(PlanConstants.IRS);
+		plan.setActions(Collections.singletonList(action));
+		List<String> operationalAreaIds = Collections.singletonList("location-id-1");
+		planService = spy(planService);
+		when(planService.getPlansByServerVersionAndOperationalArea(0,
+				operationalAreaIds,false))
+				.thenReturn(Collections.singletonList(plan));
+
+		String historicalIntervention = planService.getHistoricalIntervention(operationalAreaIds);
+		assertEquals(PlanConstants.IRS, historicalIntervention);
+
+	}
+
+	private Event initTestCaseDetailsEvent() {
+		Event event = new Event();
+		event.setId("case-details-event-id");
+		event.setLocationId("location-id");
+		Map<String,String> details = new HashMap<>();
+		details.put(PlanConstants.CASE_NUMBER, "case-number");
+		details.put(PlanConstants.FOCUS_ID, "focus-id");
+		details.put(PlanConstants.FOCUS_STATUS, "focus-status");
+		details.put(PlanConstants.FLAG, "flag");
+		event.setDetails(details);
+		return event;
+	}
+
 }

From 35653a0ff80724df06594a4033757ccda385ac20 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 07:01:33 +0300
Subject: [PATCH 42/47] Add template and processing status service tests

---
 .../PlanProcessingStatusServiceTest.java      | 92 +++++++++++++++++++
 .../opensrp/service/TemplateServiceTest.java  | 85 +++++++++++++++++
 2 files changed, 177 insertions(+)
 create mode 100644 src/test/java/org/opensrp/service/PlanProcessingStatusServiceTest.java
 create mode 100644 src/test/java/org/opensrp/service/TemplateServiceTest.java

diff --git a/src/test/java/org/opensrp/service/PlanProcessingStatusServiceTest.java b/src/test/java/org/opensrp/service/PlanProcessingStatusServiceTest.java
new file mode 100644
index 000000000..96d330f7f
--- /dev/null
+++ b/src/test/java/org/opensrp/service/PlanProcessingStatusServiceTest.java
@@ -0,0 +1,92 @@
+package org.opensrp.service;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.opensrp.domain.postgres.PlanProcessingStatus;
+import org.opensrp.repository.PlanProcessingStatusRepository;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class PlanProcessingStatusServiceTest {
+
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+
+    private PlanProcessingStatusService planProcessingStatusService;
+
+    @Mock
+    PlanProcessingStatusRepository planProcessingStatusRepository;
+
+    @Before
+    public void setUp() {
+        planProcessingStatusService = new PlanProcessingStatusService();
+        planProcessingStatusService.setPlanProcessingStatusRepository(planProcessingStatusRepository);
+    }
+
+    @Test
+    public void testGetPlanProcessingStatusRepositoryReturnsCorrectRepository() {
+        assertEquals(planProcessingStatusRepository, planProcessingStatusService.getPlanProcessingStatusRepository());
+    }
+
+    @Test
+    public void testGetProcessingStatusByEventIdCallsRepositoryMethod() {
+        planProcessingStatusService.getProcessingStatusByEventId(1l);
+        verify(planProcessingStatusRepository).getByEventId(1l);
+    }
+
+    @Test
+    public void testAddOrUpdatePlanProcessingStatusCallsUpdateMethod() {
+        PlanProcessingStatus planProcessingStatus = initTestPlanProcessingStatus();
+        when(planProcessingStatusRepository.getByEventId(4l)).thenReturn(planProcessingStatus);
+        planProcessingStatusService.addOrUpdatePlanProcessingStatus(planProcessingStatus);
+
+        verify(planProcessingStatusRepository).getByEventId(4l);
+        verify(planProcessingStatusRepository).update(planProcessingStatus);
+    }
+
+    @Test
+    public void testAddOrUpdatePlanProcessingStatusCallsAddMethod() {
+        PlanProcessingStatus planProcessingStatus = initTestPlanProcessingStatus();
+        when(planProcessingStatusRepository.getByEventId(4l)).thenReturn(null);
+        planProcessingStatusService.addOrUpdatePlanProcessingStatus(planProcessingStatus);
+
+        verify(planProcessingStatusRepository).getByEventId(4l);
+        verify(planProcessingStatusRepository).add(planProcessingStatus);
+    }
+
+    @Test
+    public void testGetProcessingStatusByStatusCallsRepositoryMethod() {
+        planProcessingStatusService.getProcessingStatusByStatus(3);
+        verify(planProcessingStatusRepository).getByStatus(3);
+    }
+
+    @Test
+    public void testAddPlanProcessingStatusCallsRepositoryMethod() {
+        planProcessingStatusService.addPlanProcessingStatus("event-identifier",0);
+        verify(planProcessingStatusRepository).addPlanProcessingStatus("event-identifier",0);
+    }
+
+    @Test
+    public void testUpdatePlanProcessingStatusCallsRepositoryMethod() {
+        PlanProcessingStatus status = initTestPlanProcessingStatus();
+        planProcessingStatusService.updatePlanProcessingStatus(
+                status,"event-identifier","plan-identifier",1);
+        verify(planProcessingStatusRepository).updatePlanProcessingStatus(
+                status,"event-identifier","plan-identifier",1);
+    }
+
+    private PlanProcessingStatus initTestPlanProcessingStatus() {
+        PlanProcessingStatus planProcessingStatus = new PlanProcessingStatus();
+        planProcessingStatus.setPlanId(1l);
+        planProcessingStatus.setStatus(0);
+        planProcessingStatus.setTemplateId(2l);
+        planProcessingStatus.setEventId(4l);
+        return planProcessingStatus;
+    }
+}
diff --git a/src/test/java/org/opensrp/service/TemplateServiceTest.java b/src/test/java/org/opensrp/service/TemplateServiceTest.java
new file mode 100644
index 000000000..f0fbf37ff
--- /dev/null
+++ b/src/test/java/org/opensrp/service/TemplateServiceTest.java
@@ -0,0 +1,85 @@
+package org.opensrp.service;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.opensrp.domain.PlanTemplate;
+import org.opensrp.domain.Template;
+import org.opensrp.repository.TemplateRepository;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class TemplateServiceTest {
+
+    @Rule
+    public MockitoRule rule = MockitoJUnit.rule();
+
+    private TemplateService templateService;
+
+    @Mock
+    private TemplateRepository templateRepository;
+
+    @Before
+    public void setUp() {
+        templateService = new TemplateService();
+        templateService.setTemplateRepository(templateRepository);
+    }
+
+    @Test
+    public void testGetTemplateRepositoryShouldReturnTemplaterepository() {
+        assertEquals(templateRepository, templateService.getTemplateRepository());
+    }
+
+    @Test
+    public void testGetAllCallsRepositoryMethod() {
+        templateService.getAll();
+        verify(templateRepository).getAll();
+    }
+
+    @Test
+    public void testGetAllWithLimitCallsRepositoryMethod() {
+        templateService.getAll(10);
+        verify(templateRepository).getAll(10);
+    }
+
+    @Test
+    public void testGetTemplateByTemplateIdCallsRepositoryMethod() {
+        templateService.getTemplateByTemplateId(1);
+        verify(templateRepository).getTemplateByTemplateId(1);
+    }
+
+    @Test
+    public void testAddOrUpdateTemplateCallsRepositoryUpdateMethod() {
+        Template template = new Template();
+        template.setTemplateId(1);
+        template.setTemplate(new PlanTemplate());
+        template.setType("plan");
+        template.setVersion(0);
+        when(templateRepository.getTemplateByTemplateId(1)).thenReturn(template);
+
+        templateService.addOrUpdateTemplate(template);
+        verify(templateRepository).getTemplateByTemplateId(1);
+        verify(templateRepository).update(template);
+
+    }
+
+    @Test
+    public void testAddOrUpdateTemplateCallsRepositoryAddMethod() {
+        Template template = new Template();
+        template.setTemplateId(1);
+        template.setTemplate(new PlanTemplate());
+        template.setType("plan");
+        template.setVersion(0);
+        when(templateRepository.getTemplateByTemplateId(1)).thenReturn(null);
+
+        templateService.addOrUpdateTemplate(template);
+        verify(templateRepository).getTemplateByTemplateId(1);
+        verify(templateRepository).add(template);
+
+    }
+}

From d1619b47a3eb875861ba62dfce6913447669f9a3 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 08:37:42 +0300
Subject: [PATCH 43/47] Update template tests

---
 .../postgres/TemplateRepositoryTest.java      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
index 463d79339..b4fc9fe94 100644
--- a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -3,9 +3,15 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensrp.domain.ActionTemplate;
+import org.opensrp.domain.GoalTemplate;
+import org.opensrp.domain.PeriodTemplate;
+import org.opensrp.domain.TargetTemplate;
 import org.opensrp.domain.PlanTemplate;
 import org.opensrp.domain.Template;
 import org.opensrp.repository.TemplateRepository;
+import org.smartregister.domain.Condition;
+import org.smartregister.domain.Expression;
 import org.smartregister.domain.Jurisdiction;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -135,6 +141,28 @@ private Template initTestTemplate() {
         jurisdictions.add(jurisdiction);
         planTemplate.setJurisdiction(jurisdictions);
 
+        ActionTemplate action = new ActionTemplate();
+        action.setCode("Blood Screening");
+        action.setIdentifier("id-1");
+        Condition condition = new Condition();
+        condition.setExpression(new Expression());
+        action.setCondition(Collections.singleton(condition));
+        action.setGoalId("goal");
+        planTemplate.setActions(Collections.singletonList(action));
+
+        GoalTemplate goalTemplate = new GoalTemplate();
+        goalTemplate.setId("goal-id");
+        goalTemplate.setDescription("Blood screening goal");
+        goalTemplate.setPriority("Routine");
+        TargetTemplate target = new TargetTemplate();
+        target.setDue("Now");
+        target.setMeasure("90");
+        goalTemplate.setTargets(Collections.singletonList(target));
+        planTemplate.setGoals(Collections.singletonList(goalTemplate));
+        PeriodTemplate period = new PeriodTemplate();
+        period.setEnd("2026-12-12");
+        period.setStart("2022-12-12");
+        planTemplate.setEffectivePeriod(period);
         Template template = new Template();
         template.setTemplate(planTemplate);
         template.setTemplateId(1);

From 65a753757a896fefb1851c4d01025c5ccd9f0ccd Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 16:04:38 +0300
Subject: [PATCH 44/47] Use sample plan json for test

---
 .../postgres/TemplateRepositoryTest.java      | 63 +++++++------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
index b4fc9fe94..e96acc447 100644
--- a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -1,27 +1,32 @@
 package org.opensrp.repository.postgres;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opensrp.domain.ActionTemplate;
-import org.opensrp.domain.GoalTemplate;
-import org.opensrp.domain.PeriodTemplate;
-import org.opensrp.domain.TargetTemplate;
 import org.opensrp.domain.PlanTemplate;
 import org.opensrp.domain.Template;
 import org.opensrp.repository.TemplateRepository;
-import org.smartregister.domain.Condition;
-import org.smartregister.domain.Expression;
-import org.smartregister.domain.Jurisdiction;
+import org.opensrp.util.DateTypeConverter;
+import org.smartregister.utils.TaskDateTimeTypeConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 public class TemplateRepositoryTest extends BaseRepositoryTest{
 
     @Autowired
     private TemplateRepository templateRepository;
 
+    public Gson gson = new GsonBuilder().registerTypeAdapter(DateTime.class, new TaskDateTimeTypeConverter())
+            .registerTypeAdapter(LocalDate.class, new DateTypeConverter()).create();
+
     @BeforeClass
     public static void bootStrap() {
         tableNames= Arrays.asList("core.template");
@@ -33,6 +38,8 @@ protected Set<String> getDatabaseScripts() {
         return scripts;
     }
 
+    String planJson = "{\"identifier\":\"f375baef-ba6c-4ce3-bdf2-b2c9323db34f\",\"version\":\"3\",\"name\":\"A1-ป่าละอู (7707060301)-จารุวัฒน์_จันทร์อุปถัมภ์-2021-09-13-Site\",\"title\":\"A1 - ป่าละอู (7707060301) - จารุวัฒน์ จันทร์อุปถัมภ์ - 2021-09-13 - Site\",\"status\":\"retired\",\"date\":\"2021-09-13\",\"effectivePeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"useContext\":[{\"code\":\"interventionType\",\"valueCodableConcept\":\"FI\"},{\"code\":\"fiStatus\",\"valueCodableConcept\":\"A1\"},{\"code\":\"fiReason\",\"valueCodableConcept\":\"Case Triggered\"},{\"code\":\"caseNum\",\"valueCodableConcept\":\"141311000000055210913110043058\"},{\"code\":\"opensrpEventId\",\"valueCodableConcept\":\"83b59fae-1727-4371-8e0e-71e52451d83a\"},{\"code\":\"taskGenerationStatus\",\"valueCodableConcept\":\"True\"},{\"code\":\"teamAssignmentStatus\",\"valueCodableConcept\":\"True\"}],\"jurisdiction\":[{\"code\":\"1fd869c8-f511-4322-a45f-88a52fcfa4de\"}],\"serverVersion\":1601948174008,\"goal\":[{\"id\":\"Case_Confirmation\",\"description\":\"ยืนยันบ้านผู้ป่วย\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนผู้ป่วยที่ได้รับการยืนยัน\",\"detail\":{\"detailQuantity\":{\"value\":1.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"case(s)\"}},\"due\":\"2021-09-23\"}]},{\"id\":\"RACD_register_families\",\"description\":\"ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"ร้อยละของบ้าน/สิ่งปลูกสร้างที่ได้ลงทะเบียนข้อมูลครัวเรือน\",\"detail\":{\"detailQuantity\":{\"value\":100.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"Percent\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"RACD_Blood_Screening\",\"description\":\"เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนผู้ที่ได้รับการเจาะโลหิต\",\"detail\":{\"detailQuantity\":{\"value\":50.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"Person(s)\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"BCC_Focus\",\"description\":\"ให้สุขศึกษาในพื้นที่ปฏิบัติงานอย่างน้อย 1 ครั้ง\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการให้สุขศึกษา\",\"detail\":{\"detailQuantity\":{\"value\":1.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"RACD_bednet_distribution\",\"description\":\"แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนบ้าน/สิ่งปลูกสร้างที่ได้รับมุ้ง\",\"detail\":{\"detailQuantity\":{\"value\":90.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"Percent\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"Larval_Dipping\",\"description\":\"ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการตักลูกน้ำ\",\"detail\":{\"detailQuantity\":{\"value\":3.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"Mosquito_Collection\",\"description\":\"กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการจับยุง\",\"detail\":{\"detailQuantity\":{\"value\":3.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2021-10-03\"}]}],\"action\":[{\"identifier\":\"662d4bff-43cc-4f50-af1e-3bc86f8af253\",\"prefix\":1,\"title\":\"การยืนยันบ้านผู้ป่วย\",\"description\":\"ยืนยันบ้านผู้ป่วย\",\"code\":\"Case Confirmation\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-09-23\"},\"reason\":\"Investigation\",\"goalId\":\"Case_Confirmation\",\"subjectCodableConcept\":{\"text\":\"Jurisdiction\"},\"taskTemplate\":\"Case_Confirmation\",\"type\":\"create\"},{\"identifier\":\"04415dc9-6493-4b41-9bab-35f5b7400dc4\",\"prefix\":2,\"title\":\"ลงทะเบียนครัวเรือน\",\"description\":\"ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน\",\"code\":\"RACD Register Family\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_register_families\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"RACD_register_families\",\"type\":\"create\"},{\"identifier\":\"c269f0a3-7dcc-4663-ac97-56ae5f3219f2\",\"prefix\":3,\"title\":\"กิจกรรมการเจาะโลหิต\",\"description\":\"เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)\",\"code\":\"Blood Screening\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_Blood_Screening\",\"subjectCodableConcept\":{\"text\":\"Person\"},\"taskTemplate\":\"RACD_Blood_Screening\",\"type\":\"create\"},{\"identifier\":\"b7e23f43-6769-4e20-85ac-c38bfaf7888f\",\"prefix\":4,\"title\":\"กิจกรรมการให้สุขศึกษา\",\"description\":\"ดำเนินกิจกรรมให้สุขศึกษา\",\"code\":\"BCC\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"BCC_Focus\",\"subjectCodableConcept\":{\"text\":\"Jurisdiction\"},\"taskTemplate\":\"BCC_Focus\",\"type\":\"create\"},{\"identifier\":\"b13d4ee2-7362-4cab-9653-c50bf0db3bfd\",\"prefix\":5,\"title\":\"กิจกรรมสำรวจ/ชุบ/แจกมุ้ง\",\"description\":\"แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)\",\"code\":\"Bednet Distribution\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_bednet_distribution\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"Bednet_Distribution\",\"type\":\"create\"},{\"identifier\":\"247679b8-e52b-48c4-b8b9-483651dbb934\",\"prefix\":6,\"title\":\"กิจกรรมการตักลูกน้ำ\",\"description\":\"ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน\",\"code\":\"Larval Dipping\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"Larval_Dipping\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"Larval_Dipping\",\"type\":\"create\"},{\"identifier\":\"e82e1207-657f-4f29-bef1-adb3ae42a794\",\"prefix\":7,\"title\":\"กิจกรรมการจับยุง\",\"description\":\"กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง\",\"code\":\"Mosquito Collection\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"Mosquito_Collection\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"Mosquito_Collection_Point\",\"type\":\"create\"}],\"experimental\":false}";
+
     @Test
     public void testAddShouldAddNewTemplate() {
         Template template = initTestTemplate();
@@ -41,7 +48,7 @@ public void testAddShouldAddNewTemplate() {
         List<Template> actualTemplates = templateRepository.getAll();
         Assert.assertNotNull(actualTemplates);
         Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
     }
 
     @Test
@@ -53,7 +60,7 @@ public void testUpdateShouldUpdateExistingTemplate() {
         Assert.assertNotNull(actualTemplates);
         Assert.assertEquals(1, actualTemplates.size());
         Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
 
         template.setType("event");
         templateRepository.update(template);
@@ -63,7 +70,7 @@ public void testUpdateShouldUpdateExistingTemplate() {
         Assert.assertEquals(1, updatedTemplates.size());
         Template updatedTemplate = updatedTemplates.get(0);
         Assert.assertEquals("event", updatedTemplate.getType());
-        Assert.assertEquals("operation_area_1", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
 
     }
 
@@ -113,7 +120,7 @@ public void testGetTemplateByTemplateIdShouldReturnCorrectTemplate() {
         Assert.assertNotNull(actualTemplate);
         Assert.assertEquals(2, actualTemplate.getTemplateId().intValue());
         Assert.assertEquals("event", actualTemplate.getType());
-        Assert.assertEquals("operation_area_1", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
     }
 
     @Test
@@ -133,36 +140,8 @@ public void testGetTemplateShouldReturnCorrectPgTemplate() {
     }
 
     private Template initTestTemplate() {
-        PlanTemplate planTemplate = new PlanTemplate();
-
-        List<Jurisdiction> jurisdictions = new ArrayList<>();
-        Jurisdiction jurisdiction = new Jurisdiction();
-        jurisdiction.setCode("operation_area_1");
-        jurisdictions.add(jurisdiction);
-        planTemplate.setJurisdiction(jurisdictions);
-
-        ActionTemplate action = new ActionTemplate();
-        action.setCode("Blood Screening");
-        action.setIdentifier("id-1");
-        Condition condition = new Condition();
-        condition.setExpression(new Expression());
-        action.setCondition(Collections.singleton(condition));
-        action.setGoalId("goal");
-        planTemplate.setActions(Collections.singletonList(action));
-
-        GoalTemplate goalTemplate = new GoalTemplate();
-        goalTemplate.setId("goal-id");
-        goalTemplate.setDescription("Blood screening goal");
-        goalTemplate.setPriority("Routine");
-        TargetTemplate target = new TargetTemplate();
-        target.setDue("Now");
-        target.setMeasure("90");
-        goalTemplate.setTargets(Collections.singletonList(target));
-        planTemplate.setGoals(Collections.singletonList(goalTemplate));
-        PeriodTemplate period = new PeriodTemplate();
-        period.setEnd("2026-12-12");
-        period.setStart("2022-12-12");
-        planTemplate.setEffectivePeriod(period);
+        PlanTemplate planTemplate = gson.fromJson(planJson, PlanTemplate.class);
+
         Template template = new Template();
         template.setTemplate(planTemplate);
         template.setTemplateId(1);

From 6b865a5df16e1a50c8495b0e24b587a5f7df1f03 Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 16:23:15 +0300
Subject: [PATCH 45/47] Update unit tests

---
 .../postgres/TemplateRepositoryTest.java      | 61 +++++++++++++------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
index e96acc447..6aec3a05c 100644
--- a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -1,32 +1,33 @@
 package org.opensrp.repository.postgres;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.opensrp.domain.ActionTemplate;
+import org.opensrp.domain.GoalTemplate;
 import org.opensrp.domain.PlanTemplate;
+import org.opensrp.domain.PeriodTemplate;
+import org.opensrp.domain.TargetTemplate;
 import org.opensrp.domain.Template;
 import org.opensrp.repository.TemplateRepository;
-import org.opensrp.util.DateTypeConverter;
-import org.smartregister.utils.TaskDateTimeTypeConverter;
+import org.smartregister.domain.Condition;
+import org.smartregister.domain.Expression;
+import org.smartregister.domain.Jurisdiction;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+
 public class TemplateRepositoryTest extends BaseRepositoryTest{
 
     @Autowired
     private TemplateRepository templateRepository;
 
-    public Gson gson = new GsonBuilder().registerTypeAdapter(DateTime.class, new TaskDateTimeTypeConverter())
-            .registerTypeAdapter(LocalDate.class, new DateTypeConverter()).create();
-
     @BeforeClass
     public static void bootStrap() {
         tableNames= Arrays.asList("core.template");
@@ -38,8 +39,6 @@ protected Set<String> getDatabaseScripts() {
         return scripts;
     }
 
-    String planJson = "{\"identifier\":\"f375baef-ba6c-4ce3-bdf2-b2c9323db34f\",\"version\":\"3\",\"name\":\"A1-ป่าละอู (7707060301)-จารุวัฒน์_จันทร์อุปถัมภ์-2021-09-13-Site\",\"title\":\"A1 - ป่าละอู (7707060301) - จารุวัฒน์ จันทร์อุปถัมภ์ - 2021-09-13 - Site\",\"status\":\"retired\",\"date\":\"2021-09-13\",\"effectivePeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"useContext\":[{\"code\":\"interventionType\",\"valueCodableConcept\":\"FI\"},{\"code\":\"fiStatus\",\"valueCodableConcept\":\"A1\"},{\"code\":\"fiReason\",\"valueCodableConcept\":\"Case Triggered\"},{\"code\":\"caseNum\",\"valueCodableConcept\":\"141311000000055210913110043058\"},{\"code\":\"opensrpEventId\",\"valueCodableConcept\":\"83b59fae-1727-4371-8e0e-71e52451d83a\"},{\"code\":\"taskGenerationStatus\",\"valueCodableConcept\":\"True\"},{\"code\":\"teamAssignmentStatus\",\"valueCodableConcept\":\"True\"}],\"jurisdiction\":[{\"code\":\"1fd869c8-f511-4322-a45f-88a52fcfa4de\"}],\"serverVersion\":1601948174008,\"goal\":[{\"id\":\"Case_Confirmation\",\"description\":\"ยืนยันบ้านผู้ป่วย\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนผู้ป่วยที่ได้รับการยืนยัน\",\"detail\":{\"detailQuantity\":{\"value\":1.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"case(s)\"}},\"due\":\"2021-09-23\"}]},{\"id\":\"RACD_register_families\",\"description\":\"ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"ร้อยละของบ้าน/สิ่งปลูกสร้างที่ได้ลงทะเบียนข้อมูลครัวเรือน\",\"detail\":{\"detailQuantity\":{\"value\":100.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"Percent\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"RACD_Blood_Screening\",\"description\":\"เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนผู้ที่ได้รับการเจาะโลหิต\",\"detail\":{\"detailQuantity\":{\"value\":50.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"Person(s)\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"BCC_Focus\",\"description\":\"ให้สุขศึกษาในพื้นที่ปฏิบัติงานอย่างน้อย 1 ครั้ง\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการให้สุขศึกษา\",\"detail\":{\"detailQuantity\":{\"value\":1.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"RACD_bednet_distribution\",\"description\":\"แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนบ้าน/สิ่งปลูกสร้างที่ได้รับมุ้ง\",\"detail\":{\"detailQuantity\":{\"value\":90.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"Percent\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"Larval_Dipping\",\"description\":\"ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการตักลูกน้ำ\",\"detail\":{\"detailQuantity\":{\"value\":3.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2021-10-03\"}]},{\"id\":\"Mosquito_Collection\",\"description\":\"กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการจับยุง\",\"detail\":{\"detailQuantity\":{\"value\":3.0,\"comparator\":\"\\u0026amp;amp;amp;amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2021-10-03\"}]}],\"action\":[{\"identifier\":\"662d4bff-43cc-4f50-af1e-3bc86f8af253\",\"prefix\":1,\"title\":\"การยืนยันบ้านผู้ป่วย\",\"description\":\"ยืนยันบ้านผู้ป่วย\",\"code\":\"Case Confirmation\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-09-23\"},\"reason\":\"Investigation\",\"goalId\":\"Case_Confirmation\",\"subjectCodableConcept\":{\"text\":\"Jurisdiction\"},\"taskTemplate\":\"Case_Confirmation\",\"type\":\"create\"},{\"identifier\":\"04415dc9-6493-4b41-9bab-35f5b7400dc4\",\"prefix\":2,\"title\":\"ลงทะเบียนครัวเรือน\",\"description\":\"ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน\",\"code\":\"RACD Register Family\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_register_families\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"RACD_register_families\",\"type\":\"create\"},{\"identifier\":\"c269f0a3-7dcc-4663-ac97-56ae5f3219f2\",\"prefix\":3,\"title\":\"กิจกรรมการเจาะโลหิต\",\"description\":\"เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)\",\"code\":\"Blood Screening\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_Blood_Screening\",\"subjectCodableConcept\":{\"text\":\"Person\"},\"taskTemplate\":\"RACD_Blood_Screening\",\"type\":\"create\"},{\"identifier\":\"b7e23f43-6769-4e20-85ac-c38bfaf7888f\",\"prefix\":4,\"title\":\"กิจกรรมการให้สุขศึกษา\",\"description\":\"ดำเนินกิจกรรมให้สุขศึกษา\",\"code\":\"BCC\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"BCC_Focus\",\"subjectCodableConcept\":{\"text\":\"Jurisdiction\"},\"taskTemplate\":\"BCC_Focus\",\"type\":\"create\"},{\"identifier\":\"b13d4ee2-7362-4cab-9653-c50bf0db3bfd\",\"prefix\":5,\"title\":\"กิจกรรมสำรวจ/ชุบ/แจกมุ้ง\",\"description\":\"แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)\",\"code\":\"Bednet Distribution\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_bednet_distribution\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"Bednet_Distribution\",\"type\":\"create\"},{\"identifier\":\"247679b8-e52b-48c4-b8b9-483651dbb934\",\"prefix\":6,\"title\":\"กิจกรรมการตักลูกน้ำ\",\"description\":\"ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน\",\"code\":\"Larval Dipping\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"Larval_Dipping\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"Larval_Dipping\",\"type\":\"create\"},{\"identifier\":\"e82e1207-657f-4f29-bef1-adb3ae42a794\",\"prefix\":7,\"title\":\"กิจกรรมการจับยุง\",\"description\":\"กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง\",\"code\":\"Mosquito Collection\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-10-03\"},\"reason\":\"Investigation\",\"goalId\":\"Mosquito_Collection\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"taskTemplate\":\"Mosquito_Collection_Point\",\"type\":\"create\"}],\"experimental\":false}";
-
     @Test
     public void testAddShouldAddNewTemplate() {
         Template template = initTestTemplate();
@@ -48,7 +47,7 @@ public void testAddShouldAddNewTemplate() {
         List<Template> actualTemplates = templateRepository.getAll();
         Assert.assertNotNull(actualTemplates);
         Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
     }
 
     @Test
@@ -60,7 +59,7 @@ public void testUpdateShouldUpdateExistingTemplate() {
         Assert.assertNotNull(actualTemplates);
         Assert.assertEquals(1, actualTemplates.size());
         Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
 
         template.setType("event");
         templateRepository.update(template);
@@ -70,7 +69,7 @@ public void testUpdateShouldUpdateExistingTemplate() {
         Assert.assertEquals(1, updatedTemplates.size());
         Template updatedTemplate = updatedTemplates.get(0);
         Assert.assertEquals("event", updatedTemplate.getType());
-        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("operation_area_1", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
 
     }
 
@@ -120,7 +119,7 @@ public void testGetTemplateByTemplateIdShouldReturnCorrectTemplate() {
         Assert.assertNotNull(actualTemplate);
         Assert.assertEquals(2, actualTemplate.getTemplateId().intValue());
         Assert.assertEquals("event", actualTemplate.getType());
-        Assert.assertEquals("1fd869c8-f511-4322-a45f-88a52fcfa4de", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("operation_area_1", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
     }
 
     @Test
@@ -140,8 +139,36 @@ public void testGetTemplateShouldReturnCorrectPgTemplate() {
     }
 
     private Template initTestTemplate() {
-        PlanTemplate planTemplate = gson.fromJson(planJson, PlanTemplate.class);
-
+        PlanTemplate planTemplate = new PlanTemplate();
+
+        List<Jurisdiction> jurisdictions = new ArrayList<>();
+        Jurisdiction jurisdiction = new Jurisdiction();
+        jurisdiction.setCode("operation_area_1");
+        jurisdictions.add(jurisdiction);
+        planTemplate.setJurisdiction(jurisdictions);
+
+        ActionTemplate action = new ActionTemplate();
+        action.setCode("Blood Screening");
+        action.setIdentifier("id-1");
+        Condition condition = new Condition();
+        condition.setExpression(new Expression());
+        action.setCondition(Collections.singleton(condition));
+        action.setGoalId("goal");
+        planTemplate.setActions(Collections.singletonList(action));
+
+        GoalTemplate goalTemplate = new GoalTemplate();
+        goalTemplate.setId("goal-id");
+        goalTemplate.setDescription("Blood screening goal");
+        goalTemplate.setPriority("Routine");
+        TargetTemplate target = new TargetTemplate();
+        target.setDue("Now");
+        target.setMeasure("90");
+        goalTemplate.setTargets(Collections.singletonList(target));
+        planTemplate.setGoals(Collections.singletonList(goalTemplate));
+        PeriodTemplate period = new PeriodTemplate();
+        period.setEnd("2026-12-12");
+        period.setStart("2022-12-12");
+        planTemplate.setEffectivePeriod(period);
         Template template = new Template();
         template.setTemplate(planTemplate);
         template.setTemplateId(1);

From f1c5306cb87b9b03468b2df59af7151798a0ddcb Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 17:37:09 +0300
Subject: [PATCH 46/47] Use Lombok to generate setters and getters

---
 .../org/opensrp/domain/ActionTemplate.java    | 142 ++----------------
 .../java/org/opensrp/domain/GoalTemplate.java |  39 +----
 .../java/org/opensrp/domain/PlanTemplate.java | 142 ++----------------
 .../org/opensrp/domain/TargetTemplate.java    | 119 ++++-----------
 .../postgres/PractitionerRepositoryTest.java  |  13 ++
 .../postgres/TemplateRepositoryTest.java      |  59 ++------
 6 files changed, 86 insertions(+), 428 deletions(-)

diff --git a/src/main/java/org/opensrp/domain/ActionTemplate.java b/src/main/java/org/opensrp/domain/ActionTemplate.java
index 20165a363..cdb41f030 100644
--- a/src/main/java/org/opensrp/domain/ActionTemplate.java
+++ b/src/main/java/org/opensrp/domain/ActionTemplate.java
@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
 import org.smartregister.domain.Condition;
 import org.smartregister.domain.DynamicValue;
 import org.smartregister.domain.Trigger;
@@ -9,6 +12,9 @@
 import java.io.Serializable;
 import java.util.Set;
 
+@Getter
+@Setter
+@AllArgsConstructor
 public class ActionTemplate  implements Serializable {
     private static final long serialVersionUID = 1L;
     private String identifier;
@@ -31,143 +37,13 @@ public ActionTemplate() {
         this.type = ActionTemplate.ActionType.CREATE;
     }
 
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public void setPrefix(int prefix) {
-        this.prefix = prefix;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public void setTimingPeriod(PeriodTemplate timingPeriod) {
-        this.timingPeriod = timingPeriod;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public void setGoalId(String goalId) {
-        this.goalId = goalId;
-    }
-
-    public void setSubjectCodableConcept(ActionTemplate.SubjectConcept subjectCodableConcept) {
-        this.subjectCodableConcept = subjectCodableConcept;
-    }
-
-    public void setTaskTemplate(String taskTemplate) {
-        this.taskTemplate = taskTemplate;
-    }
-
-    public void setTrigger(Set<Trigger> trigger) {
-        this.trigger = trigger;
-    }
-
-    public void setCondition(Set<Condition> condition) {
-        this.condition = condition;
-    }
-
-    public void setDefinitionUri(String definitionUri) {
-        this.definitionUri = definitionUri;
-    }
-
-    public void setDynamicValue(Set<DynamicValue> dynamicValue) {
-        this.dynamicValue = dynamicValue;
-    }
-
-    public void setType(ActionTemplate.ActionType type) {
-        this.type = type;
-    }
-
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    public int getPrefix() {
-        return this.prefix;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public String getCode() {
-        return this.code;
-    }
-
-    public PeriodTemplate getTimingPeriod() {
-        return this.timingPeriod;
-    }
-
-    public String getReason() {
-        return this.reason;
-    }
-
-    public String getGoalId() {
-        return this.goalId;
-    }
-
-    public ActionTemplate.SubjectConcept getSubjectCodableConcept() {
-        return this.subjectCodableConcept;
-    }
-
-    public String getTaskTemplate() {
-        return this.taskTemplate;
-    }
-
-    public Set<Trigger> getTrigger() {
-        return this.trigger;
-    }
-
-    public Set<Condition> getCondition() {
-        return this.condition;
-    }
-
-    public String getDefinitionUri() {
-        return this.definitionUri;
-    }
-
-    public Set<DynamicValue> getDynamicValue() {
-        return this.dynamicValue;
-    }
-
-    public ActionTemplate.ActionType getType() {
-        return this.type;
-    }
-
+    @Getter
+    @Setter
+    @AllArgsConstructor
     public static class SubjectConcept implements Serializable {
         private String text;
 
-        public SubjectConcept(String text) {
-            this.text = text;
-        }
-
-        public SubjectConcept() {
-        }
-
-        public String getText() {
-            return this.text;
-        }
 
-        public void setText(String text) {
-            this.text = text;
-        }
     }
 
     public static enum ActionType {
diff --git a/src/main/java/org/opensrp/domain/GoalTemplate.java b/src/main/java/org/opensrp/domain/GoalTemplate.java
index 30facc66a..8cf41b5b7 100644
--- a/src/main/java/org/opensrp/domain/GoalTemplate.java
+++ b/src/main/java/org/opensrp/domain/GoalTemplate.java
@@ -2,10 +2,18 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.List;
 
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class GoalTemplate implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -16,35 +24,4 @@ public class GoalTemplate implements Serializable {
     @SerializedName("target")
     private List<TargetTemplate> targets;
 
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getPriority() {
-        return this.priority;
-    }
-
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-
-    public List<TargetTemplate> getTargets() {
-        return this.targets;
-    }
-
-    public void setTargets(List<TargetTemplate> targets) {
-        this.targets = targets;
-    }
 }
diff --git a/src/main/java/org/opensrp/domain/PlanTemplate.java b/src/main/java/org/opensrp/domain/PlanTemplate.java
index 23b490a32..21d4e08aa 100644
--- a/src/main/java/org/opensrp/domain/PlanTemplate.java
+++ b/src/main/java/org/opensrp/domain/PlanTemplate.java
@@ -2,11 +2,20 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.SerializedName;
-import org.smartregister.domain.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.smartregister.domain.Jurisdiction;
+import org.smartregister.domain.PlanDefinition;
 
 import java.io.Serializable;
 import java.util.List;
 
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class PlanTemplate  implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -40,118 +49,6 @@ public class PlanTemplate  implements Serializable {
     @JsonProperty
     private boolean experimental;
 
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public String getVersion() {
-        return this.version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getStatus() {
-        return this.status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getDate() {
-        return this.date;
-    }
-
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-    public PeriodTemplate getEffectivePeriod() {
-        return this.effectivePeriod;
-    }
-
-    public void setEffectivePeriod(PeriodTemplate effectivePeriod) {
-        this.effectivePeriod = effectivePeriod;
-    }
-
-    public List<PlanDefinition.UseContext> getUseContext() {
-        return this.useContext;
-    }
-
-    public void setUseContext(List<PlanDefinition.UseContext> useContext) {
-        this.useContext = useContext;
-    }
-
-    public List<Jurisdiction> getJurisdiction() {
-        return this.jurisdiction;
-    }
-
-    public void setJurisdiction(List<Jurisdiction> jurisdiction) {
-        this.jurisdiction = jurisdiction;
-    }
-
-    public List<GoalTemplate> getGoals() {
-        return this.goals;
-    }
-
-    public void setGoals(List<GoalTemplate> goals) {
-        this.goals = goals;
-    }
-
-    public List<ActionTemplate> getActions() {
-        return this.actions;
-    }
-
-    public void setActions(List<ActionTemplate> actions) {
-        this.actions = actions;
-    }
-
-    public Long getServerVersion() {
-        return this.serverVersion;
-    }
-
-    public void setServerVersion(Long serverVersion) {
-        this.serverVersion = serverVersion;
-    }
-
-    public boolean isExperimental() {
-        return this.experimental;
-    }
-
-    public void setExperimental(boolean experimental) {
-        this.experimental = experimental;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public int compareTo(PlanDefinition o) {
         return this.getName().equals(o.getName()) ? this.getName().compareTo(o.getIdentifier()) : this.getName().compareTo(o.getName());
     }
@@ -193,24 +90,13 @@ public static PlanTemplate.PlanStatus from(String value) {
         }
     }
 
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
     public static class UseContext implements Serializable {
         private String code;
         private String valueCodableConcept;
 
-        public String getCode() {
-            return this.code;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-
-        public String getValueCodableConcept() {
-            return this.valueCodableConcept;
-        }
-
-        public void setValueCodableConcept(String valueCodableConcept) {
-            this.valueCodableConcept = valueCodableConcept;
-        }
     }
 }
diff --git a/src/main/java/org/opensrp/domain/TargetTemplate.java b/src/main/java/org/opensrp/domain/TargetTemplate.java
index 41660216b..b82240376 100644
--- a/src/main/java/org/opensrp/domain/TargetTemplate.java
+++ b/src/main/java/org/opensrp/domain/TargetTemplate.java
@@ -1,128 +1,61 @@
 package org.opensrp.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.AbstractMap;
 
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class TargetTemplate implements Serializable {
     private static final long serialVersionUID = 1L;
     private String measure;
     private TargetTemplate.Detail detail;
     private String due;
 
-    public String getMeasure() {
-        return this.measure;
-    }
-
-    public void setMeasure(String measure) {
-        this.measure = measure;
-    }
-
-    public String getDue() {
-        return this.due;
-    }
-
-    public void setDue(String due) {
-        this.due = due;
-    }
-
-    public TargetTemplate.Detail getDetail() {
-        return this.detail;
-    }
-
-    public void setDetail(TargetTemplate.Detail detail) {
-        this.detail = detail;
-    }
-
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
     static class DetailCodableConcept {
         private String text;
 
-        public String getText() {
-            return this.text;
-        }
-
-        public void setText(String text) {
-            this.text = text;
-        }
     }
 
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
     static class MeasureRange implements Serializable {
         private TargetTemplate.Measure high;
         private TargetTemplate.Measure low;
-
-        public TargetTemplate.Measure getHigh() {
-            return this.high;
-        }
-
-        public void setHigh(TargetTemplate.Measure high) {
-            this.high = high;
-        }
-
-        public TargetTemplate.Measure getLow() {
-            return this.low;
-        }
-
-        public void setLow(TargetTemplate.Measure low) {
-            this.low = low;
-        }
     }
 
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
     static class Measure implements Serializable {
         private float value;
         private String comparator;
         private String unit;
 
-        public float getValue() {
-            return this.value;
-        }
-
-        public void setValue(float value) {
-            this.value = value;
-        }
-
-        public String getComparator() {
-            return this.comparator;
-        }
-
-        public void setComparator(String comparator) {
-            this.comparator = comparator;
-        }
-
-        public String getUnit() {
-            return this.unit;
-        }
-
-        public void setUnit(String unit) {
-            this.unit = unit;
-        }
     }
 
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
     static class Detail implements Serializable {
         private TargetTemplate.Measure detailQuantity;
         private TargetTemplate.MeasureRange detailRange;
         private AbstractMap.SimpleEntry<String, String> detailCodableConcept;
 
-        public TargetTemplate.Measure getDetailQuantity() {
-            return this.detailQuantity;
-        }
-
-        public void setDetailQuantity(TargetTemplate.Measure detailQuantity) {
-            this.detailQuantity = detailQuantity;
-        }
-
-        public TargetTemplate.MeasureRange getDetailRange() {
-            return this.detailRange;
-        }
-
-        public void setDetailRange(TargetTemplate.MeasureRange detailRange) {
-            this.detailRange = detailRange;
-        }
-
-        public AbstractMap.SimpleEntry<String, String> getDetailCodableConcept() {
-            return this.detailCodableConcept;
-        }
-
-        public void setDetailCodableConcept(AbstractMap.SimpleEntry<String, String> detailCodableConcept) {
-            this.detailCodableConcept = detailCodableConcept;
-        }
     }
+
 }
diff --git a/src/test/java/org/opensrp/repository/postgres/PractitionerRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/PractitionerRepositoryTest.java
index f1a8d169c..67dd9afc1 100755
--- a/src/test/java/org/opensrp/repository/postgres/PractitionerRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/PractitionerRepositoryTest.java
@@ -379,4 +379,17 @@ public void testCountAllPractitioners() {
         practitionerRepository.add(practitioner1);
         assertEquals(1, practitionerRepository.countAllPractitioners());
     }
+
+    @Test
+    public void testGetPractitionersByIdentifier() {
+        Practitioner expectedPractitioner = initTestPractitioner1();
+        practitionerRepository.add(expectedPractitioner);
+        Practitioner actualPractitioner = practitionerRepository.getPractitionerByIdentifier(expectedPractitioner.getIdentifier());
+        assertNotNull(actualPractitioner);
+        assertEquals(expectedPractitioner.getIdentifier(),actualPractitioner.getIdentifier());
+        assertEquals(expectedPractitioner.getName(),actualPractitioner.getName());
+        assertEquals(expectedPractitioner.getUserId(),actualPractitioner.getUserId());
+        assertEquals(expectedPractitioner.getUsername(),actualPractitioner.getUsername());
+    }
+
 }
diff --git a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
index 6aec3a05c..417050277 100644
--- a/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
+++ b/src/test/java/org/opensrp/repository/postgres/TemplateRepositoryTest.java
@@ -1,23 +1,20 @@
 package org.opensrp.repository.postgres;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opensrp.domain.ActionTemplate;
-import org.opensrp.domain.GoalTemplate;
 import org.opensrp.domain.PlanTemplate;
-import org.opensrp.domain.PeriodTemplate;
-import org.opensrp.domain.TargetTemplate;
 import org.opensrp.domain.Template;
 import org.opensrp.repository.TemplateRepository;
-import org.smartregister.domain.Condition;
-import org.smartregister.domain.Expression;
-import org.smartregister.domain.Jurisdiction;
+import org.smartregister.utils.DateTypeConverter;
+import org.smartregister.utils.TaskDateTimeTypeConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -28,6 +25,11 @@ public class TemplateRepositoryTest extends BaseRepositoryTest{
     @Autowired
     private TemplateRepository templateRepository;
 
+    public Gson gson = new GsonBuilder().registerTypeAdapter(DateTime.class, new TaskDateTimeTypeConverter())
+            .registerTypeAdapter(LocalDate.class, new DateTypeConverter()).create();
+
+    String planJson = "{\"identifier\":\"64ae21ed-e60f-4ab0-8060-335375f8482b\",\"version\":\"2\",\"name\":\"A1-เมืองทอง(Site)-4-Madrine_QA Test-2021-12-07-Site\",\"title\":\"A1 - เมืองทอง(Site)-4 - Madrine QA Test - 2021-12-07 - Site\",\"status\":\"active\",\"date\":\"2021-12-07\",\"effectivePeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"useContext\":[{\"code\":\"interventionType\",\"valueCodableConcept\":\"Dynamic-FI\"},{\"code\":\"fiStatus\",\"valueCodableConcept\":\"A1\"},{\"code\":\"fiReason\",\"valueCodableConcept\":\"Case Triggered\"},{\"code\":\"caseNum\",\"valueCodableConcept\":\"2401224081141261323\"},{\"code\":\"opensrpEventId\",\"valueCodableConcept\":\"685f019c-01b7-4812-b80f-277321f6f8f3\"},{\"code\":\"taskGenerationStatus\",\"valueCodableConcept\":\"internal\"},{\"code\":\"teamAssignmentStatus\",\"valueCodableConcept\":\"True\"}],\"jurisdiction\":[{\"code\":\"b49faa39-5e24-4de8-bf3f-cdda6f320179\"}],\"serverVersion\":1607066368048,\"goal\":[{\"id\":\"Case_Confirmation\",\"description\":\"ยืนยันบ้านผู้ป่วย\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนผู้ป่วยที่ได้รับการยืนยัน\",\"detail\":{\"detailQuantity\":{\"value\":1.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"case(s)\"}},\"due\":\"2026-12-07\"}]},{\"id\":\"RACD_register_families\",\"description\":\"ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"ร้อยละของบ้าน/สิ่งปลูกสร้างที่ได้ลงทะเบียนข้อมูลครัวเรือน\",\"detail\":{\"detailQuantity\":{\"value\":100.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"Percent\"}},\"due\":\"2026-12-07\"}]},{\"id\":\"RACD_Blood_Screening\",\"description\":\"เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนผู้ที่ได้รับการเจาะโลหิต\",\"detail\":{\"detailQuantity\":{\"value\":50.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"Person(s)\"}},\"due\":\"2026-12-07\"}]},{\"id\":\"BCC_Focus\",\"description\":\"ให้สุขศึกษาในพื้นที่ปฏิบัติงานอย่างน้อย 1 ครั้ง\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการให้สุขศึกษา\",\"detail\":{\"detailQuantity\":{\"value\":1.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2026-12-07\"}]},{\"id\":\"RACD_bednet_distribution\",\"description\":\"แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนบ้าน/สิ่งปลูกสร้างที่ได้รับมุ้ง\",\"detail\":{\"detailQuantity\":{\"value\":90.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"Percent\"}},\"due\":\"2026-12-07\"}]},{\"id\":\"Larval_Dipping\",\"description\":\"ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการตักลูกน้ำ\",\"detail\":{\"detailQuantity\":{\"value\":3.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2026-12-07\"}]},{\"id\":\"Mosquito_Collection\",\"description\":\"กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง\",\"priority\":\"medium-priority\",\"target\":[{\"measure\":\"จำนวนกิจกรรมการจับยุง\",\"detail\":{\"detailQuantity\":{\"value\":3.0,\"comparator\":\"\\u0026amp;gt;\\u003d\",\"unit\":\"activit(y|ies)\"}},\"due\":\"2026-12-07\"}]}],\"action\":[{\"identifier\":\"662d4bff-43cc-4f50-af1e-3bc86f8af253\",\"prefix\":1,\"title\":\"การยืนยันบ้านผู้ป่วย\",\"description\":\"ยืนยันบ้านผู้ป่วย\",\"code\":\"Case Confirmation\",\"timingPeriod\":{\"start\":\"2021-09-13\",\"end\":\"2021-09-23\"},\"reason\":\"Investigation\",\"goalId\":\"Case_Confirmation\",\"subjectCodableConcept\":{\"text\":\"QuestionnaireResponse\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"plan-activation\"}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Event is case details event\",\"expression\":\"questionnaire \\u003d \\u0027Case_Details\\u0027\"}}],\"definitionUri\":\"case_confirmation.json\",\"type\":\"create\"},{\"identifier\":\"d0a9e189-240e-40fb-9761-6960a735426c\",\"prefix\":2,\"title\":\"ลงทะเบียนครัวเรือน\",\"description\":\"ลงทะเบียนครัวเรือนและสมาชิกในครัวเรือน (100%) ภายในพื้นที่ปฏิบัติงาน\",\"code\":\"RACD Register Family\",\"timingPeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_register_families\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"plan-activation\"},{\"type\":\"named-event\",\"name\":\"event-submission\",\"expression\":{\"description\":\"Trigger when a Register_Structure event is submitted\",\"expression\":\"questionnaire \\u003d \\u0027Register_Structure\\u0027 or questionnaire \\u003d \\u0027Archive_Family\\u0027\"}}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Apply to residential structures in Register_Structure questionnaires\",\"expression\":\"$this.is(FHIR.Location) or (questionnaire \\u003d \\u0027Register_Structure\\u0027 and $this.item.where(linkId\\u003d\\u0027structureType\\u0027).answer.value \\u003d\\u0027Residential Structure\\u0027)\"}},{\"kind\":\"applicability\",\"expression\":{\"description\":\"Structure is residential or type does not exist\",\"expression\":\"$this.is(FHIR.QuestionnaireResponse) or (($this.type.where(id\\u003d\\u0027locationType\\u0027).exists().not() or $this.type.where(id\\u003d\\u0027locationType\\u0027).text \\u003d \\u0027Residential Structure\\u0027) and $this.contained.exists().not())\",\"subjectCodableConcept\":{\"text\":\"Family\"}}}],\"definitionUri\":\"family_register.json\",\"type\":\"create\"},{\"identifier\":\"fdf297df-3593-47e9-97fc-e6a93851cf37\",\"prefix\":3,\"title\":\"กิจกรรมการเจาะโลหิต\",\"description\":\"เจาะเลือดรอบบ้านผู้ป่วยในรัศมี 1 กิโลเมตร (100%)\",\"code\":\"Blood Screening\",\"timingPeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_Blood_Screening\",\"subjectCodableConcept\":{\"text\":\"Person\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"plan-activation\"},{\"type\":\"named-event\",\"name\":\"event-submission\",\"expression\":{\"description\":\"Trigger when a Family Registration or Family Member Registration event is submitted\",\"expression\":\"questionnaire \\u003d \\u0027Family_Registration\\u0027 or questionnaire \\u003d \\u0027Family_Member_Registration\\u0027\"}}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Person is older than 5 years or person associated with questionnaire response if older than 5 years\",\"expression\":\"($this.is(FHIR.Patient) and $this.birthDate \\u0026amp;amp;lt;\\u003d today() - 5 \\u0027years\\u0027) or ($this.contained.where(Patient.birthDate \\u0026amp;amp;lt;\\u003d today() - 5 \\u0027years\\u0027).exists())\"}}],\"definitionUri\":\"blood_screening.json\",\"type\":\"create\"},{\"identifier\":\"9ef064b3-023e-411f-8b37-491e3d0cf830\",\"prefix\":4,\"title\":\"กิจกรรมการให้สุขศึกษา\",\"description\":\"ดำเนินกิจกรรมให้สุขศึกษา\",\"code\":\"BCC\",\"timingPeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"reason\":\"Investigation\",\"goalId\":\"BCC_Focus\",\"subjectCodableConcept\":{\"text\":\"Jurisdiction\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"plan-activation\"}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Jurisdiction type location\",\"expression\":\"Location.physicalType.coding.exists(code\\u003d\\u0027jdn\\u0027)\"}}],\"definitionUri\":\"behaviour_change_communication.json\",\"type\":\"create\"},{\"identifier\":\"21c75b01-f0c5-4fb0-ae11-58da4b23c036\",\"prefix\":5,\"title\":\"กิจกรรมสำรวจ/ชุบ/แจกมุ้ง\",\"description\":\"แจกมุ้งทุกหลังคาเรือนในพื้นที่ปฏิบัติงาน (100%)\",\"code\":\"Bednet Distribution\",\"timingPeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"reason\":\"Investigation\",\"goalId\":\"RACD_bednet_distribution\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"plan-activation\"},{\"type\":\"named-event\",\"name\":\"event-submission\",\"expression\":{\"description\":\"Trigger when a Family Registration event is submitted\",\"expression\":\"questionnaire \\u003d \\u0027Family_Registration\\u0027\"}}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Structure is residential or type does not exist\",\"expression\":\"$this.is(FHIR.QuestionnaireResponse) or (($this.type.where(id\\u003d\\u0027locationType\\u0027).exists().not() or $this.type.where(id\\u003d\\u0027locationType\\u0027).text \\u003d \\u0027Residential Structure\\u0027) and $this.contained.exists())\",\"subjectCodableConcept\":{\"text\":\"Family\"}}}],\"definitionUri\":\"bednet_distribution.json\",\"type\":\"create\"},{\"identifier\":\"90032f7c-e9fc-4a0a-9962-78584cb42f82\",\"prefix\":6,\"title\":\"กิจกรรมการตักลูกน้ำ\",\"description\":\"ดำเนินกิจกรรมจับลูกน้ำอย่างน้อย 3 แห่งในพื้นที่ปฏิบัติงาน\",\"code\":\"Larval Dipping\",\"timingPeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"reason\":\"Investigation\",\"goalId\":\"Larval_Dipping\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"event-submission\",\"expression\":{\"description\":\"Trigger when a Register_Structure event is submitted\",\"expression\":\"questionnaire \\u003d \\u0027Register_Structure\\u0027\"}},{\"type\":\"named-event\",\"name\":\"plan-activation\"}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Apply to larval breeding sites in Register_Structure questionnaires\",\"expression\":\"$this.is(FHIR.Location) or (questionnaire \\u003d \\u0027Register_Structure\\u0027 and $this.item.where(linkId\\u003d\\u0027structureType\\u0027).answer.value \\u003d\\u0027Larval Breeding Site\\u0027)\"}},{\"kind\":\"applicability\",\"expression\":{\"description\":\"Structure is a larval breeding site\",\"expression\":\"$this.is(FHIR.QuestionnaireResponse) or $this.type.where(id\\u003d\\u0027locationType\\u0027).text \\u003d \\u0027Larval Breeding Site\\u0027\"}}],\"definitionUri\":\"larval_dipping_form.json\",\"type\":\"create\"},{\"identifier\":\"b0a7b972-dfe9-42c9-b07a-54f7224ae144\",\"prefix\":7,\"title\":\"กิจกรรมการจับยุง\",\"description\":\"กิจกรรมจับยุงกำหนดไว้อย่างน้อย 3 แห่ง\",\"code\":\"Mosquito Collection\",\"timingPeriod\":{\"start\":\"2021-12-07\",\"end\":\"2026-12-07\"},\"reason\":\"Investigation\",\"goalId\":\"Mosquito_Collection\",\"subjectCodableConcept\":{\"text\":\"Location\"},\"trigger\":[{\"type\":\"named-event\",\"name\":\"plan-activation\"},{\"type\":\"named-event\",\"name\":\"event-submission\",\"expression\":{\"description\":\"Trigger when a Register_Structure event is submitted\",\"expression\":\"questionnaire \\u003d \\u0027Register_Structure\\u0027\"}}],\"condition\":[{\"kind\":\"applicability\",\"expression\":{\"description\":\"Structure is a mosquito collection point\",\"expression\":\"$this.is(FHIR.QuestionnaireResponse) or $this.type.where(id\\u003d\\u0027locationType\\u0027).text \\u003d \\u0027Mosquito Collection Point\\u0027\"}},{\"kind\":\"applicability\",\"expression\":{\"description\":\"Apply to mosquito collection point in Register_Structure questionnaires\",\"expression\":\"$this.is(FHIR.Location) or (questionnaire \\u003d \\u0027Register_Structure\\u0027 and $this.item.where(linkId\\u003d\\u0027structureType\\u0027).answer.value \\u003d\\u0027Mosquito Collection Point\\u0027)\"}}],\"definitionUri\":\"mosquito_collection_form.json\",\"type\":\"create\"}],\"experimental\":false}";
+
     @BeforeClass
     public static void bootStrap() {
         tableNames= Arrays.asList("core.template");
@@ -47,7 +49,7 @@ public void testAddShouldAddNewTemplate() {
         List<Template> actualTemplates = templateRepository.getAll();
         Assert.assertNotNull(actualTemplates);
         Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("b49faa39-5e24-4de8-bf3f-cdda6f320179", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
     }
 
     @Test
@@ -59,7 +61,7 @@ public void testUpdateShouldUpdateExistingTemplate() {
         Assert.assertNotNull(actualTemplates);
         Assert.assertEquals(1, actualTemplates.size());
         Assert.assertEquals(1, actualTemplates.get(0).getTemplateId().intValue());
-        Assert.assertEquals("operation_area_1", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("b49faa39-5e24-4de8-bf3f-cdda6f320179", actualTemplates.get(0).getTemplate().getJurisdiction().get(0).getCode());
 
         template.setType("event");
         templateRepository.update(template);
@@ -69,7 +71,7 @@ public void testUpdateShouldUpdateExistingTemplate() {
         Assert.assertEquals(1, updatedTemplates.size());
         Template updatedTemplate = updatedTemplates.get(0);
         Assert.assertEquals("event", updatedTemplate.getType());
-        Assert.assertEquals("operation_area_1", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("b49faa39-5e24-4de8-bf3f-cdda6f320179", updatedTemplate.getTemplate().getJurisdiction().get(0).getCode());
 
     }
 
@@ -119,7 +121,7 @@ public void testGetTemplateByTemplateIdShouldReturnCorrectTemplate() {
         Assert.assertNotNull(actualTemplate);
         Assert.assertEquals(2, actualTemplate.getTemplateId().intValue());
         Assert.assertEquals("event", actualTemplate.getType());
-        Assert.assertEquals("operation_area_1", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
+        Assert.assertEquals("b49faa39-5e24-4de8-bf3f-cdda6f320179", actualTemplate.getTemplate().getJurisdiction().get(0).getCode());
     }
 
     @Test
@@ -139,36 +141,7 @@ public void testGetTemplateShouldReturnCorrectPgTemplate() {
     }
 
     private Template initTestTemplate() {
-        PlanTemplate planTemplate = new PlanTemplate();
-
-        List<Jurisdiction> jurisdictions = new ArrayList<>();
-        Jurisdiction jurisdiction = new Jurisdiction();
-        jurisdiction.setCode("operation_area_1");
-        jurisdictions.add(jurisdiction);
-        planTemplate.setJurisdiction(jurisdictions);
-
-        ActionTemplate action = new ActionTemplate();
-        action.setCode("Blood Screening");
-        action.setIdentifier("id-1");
-        Condition condition = new Condition();
-        condition.setExpression(new Expression());
-        action.setCondition(Collections.singleton(condition));
-        action.setGoalId("goal");
-        planTemplate.setActions(Collections.singletonList(action));
-
-        GoalTemplate goalTemplate = new GoalTemplate();
-        goalTemplate.setId("goal-id");
-        goalTemplate.setDescription("Blood screening goal");
-        goalTemplate.setPriority("Routine");
-        TargetTemplate target = new TargetTemplate();
-        target.setDue("Now");
-        target.setMeasure("90");
-        goalTemplate.setTargets(Collections.singletonList(target));
-        planTemplate.setGoals(Collections.singletonList(goalTemplate));
-        PeriodTemplate period = new PeriodTemplate();
-        period.setEnd("2026-12-12");
-        period.setStart("2022-12-12");
-        planTemplate.setEffectivePeriod(period);
+        PlanTemplate planTemplate = gson.fromJson(planJson, PlanTemplate.class);
         Template template = new Template();
         template.setTemplate(planTemplate);
         template.setTemplateId(1);

From 78cf0db1542260e7ddd9f27b571f31e89d82445e Mon Sep 17 00:00:00 2001
From: Richard Kareko <rkareko@ona.io>
Date: Thu, 9 Dec 2021 19:55:40 +0300
Subject: [PATCH 47/47] Bump up version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 09b5a9b92..aaf1ad641 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.13-ALPHA5-SNAPSHOT</version>
+	<version>2.12.16-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>