1 files changed, 58 insertions, 20 deletions
diff --git a/intentanalysis/src/test/resources/intentdb-test-init.sql b/intentanalysis/src/test/resources/intentdb-test-init.sql
index b84f8e3..211e1cb 100644
--- a/intentanalysis/src/test/resources/intentdb-test-init.sql
+++ b/intentanalysis/src/test/resources/intentdb-test-init.sql
@@ -14,29 +14,67 @@
 
  Date: 30/12/2019 14:40:23
 */
-DROP TABLE IF  EXISTS intent;
-DROP TABLE IF  EXISTS  expectation;
-DROP TABLE  IF  EXISTS state;
-
-CREATE TABLE if NOT EXISTS intent(
-    intent_id varchar(255),
-    intent_name varchar(255),
-    CONSTRAINT intent_test_task_pkey PRIMARY KEY (intent_id)
+//CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+DROP TABLE IF EXISTS intent;
+DROP TABLE IF EXISTS expectation;
+DROP TABLE IF EXISTS expectation_object;
+DROP TABLE IF EXISTS expectation_target;
+DROP TABLE IF EXISTS context;
+DROP TABLE IF EXISTS fulfilment_info;
+DROP TABLE IF EXISTS condition;
+
+create table if not exists intent
+(
+    intent_id   varchar(255) primary key,
+    intent_name varchar(255)
 );
 
-create table if not exists expectation(
-    expectation_id varchar(255),
+create table if not exists expectation
+(
+    expectation_id   varchar(255) primary key,
     expectation_name varchar(255),
-    target_moi varchar(255),
-    intent_id varchar(255),
-    CONSTRAINT expectation_test_task_pkey PRIMARY KEY (expectation_id)
+    expectation_type varchar(255),
+    intent_id        varchar(255)
+);
+
+create table if not exists expectation_object
+(
+    object_id       varchar(255) DEFAULT random_uuid(),
+    primary key (object_id),
+    object_type     varchar(255),
+    object_instance varchar(255),
+    expectation_id  varchar(255)
+);
+
+create table if not exists expectation_target
+(
+    target_id      varchar(255) primary key,
+    target_name    varchar(255),
+    expectation_id varchar(255)
 );
 
-create table if not exists state(
-    state_id varchar(255),
-    state_name varchar(255),
-    is_satisfied boolean,
-    condition varchar(255),
-    expectation_id varchar(255),
-    CONSTRAINT state_test_task_pkey PRIMARY KEY (state_id)
+create table if not exists context
+(
+    context_id   varchar(255) primary key,
+    context_name varchar(255),
+    parent_id    varchar(255)
 );
+
+create table if not exists fulfilment_info
+(
+    fulfilment_info_id     varchar(255) primary key,
+    fulfilment_info_status varchar(255),
+    not_fulfilled_state    varchar(255),
+    not_fulfilled_reason   varchar(255)
+);
+
+create table if not exists condition
+(
+    condition_id    varchar(255) primary key,
+    condition_name  varchar(255),
+    operator_type   varchar(255),
+    condition_value varchar(255),
+    parent_id       varchar(255)
+);
+