From c268e664fbe293b9c5828e1cfafe11d54355f0b3 Mon Sep 17 00:00:00 2001
From: "A.Voegl" <A.Voegl@avoegl.aditosoftware.local>
Date: Fri, 1 Mar 2019 09:20:16 +0100
Subject: [PATCH] Keyword Offer and Communication Fix

---
 entity/Offer_entity/Offer_entity.aod          |   1 +
 .../AditoBasic/init_CommunicationMedium.xml   | 112 +++++++++++++++++-
 .../basic/2019.2/OfferProbability.xml         |   2 +-
 3 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index ed4ee9cf14..a8b5fc48f7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -42,6 +42,7 @@
     <entityField>
       <name>PROBABILITY</name>
       <title>Probability</title>
+      <consumer>KeywordProbability</consumer>
     </entityField>
     <entityField>
       <name>CONTACT_ID</name>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
index 235ded53a4..941c31c3a1 100644
--- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
@@ -1,16 +1,42 @@
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <changeSet author="a.veogl" id="2b9bfc42-1fd5-452f-88f1-896f9065757a">
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+
+            <column name="NAME" value="category"/>
+            <column name="CONTAINER" value="CommunicationMedium"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+
+            <column name="NAME" value="contentType"/>
+            <column name="CONTAINER" value="CommunicationMedium"/>
+            <column name="TYPE" value="CHAR_VALUE"/>
+        </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>
 
             <column name="KEYID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
-            <column name="TITLE" value="Mobil"/>
+            <column name="TITLE" value="Mobbil"/>
             <column name="CONTAINER" value="CommunicationMedium"/>
             <column name="SORTING" valueNumeric="0"/>
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
         </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="688fe492-d5df-4af0-8bfe-8a7a4b6946d2"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+            <column name="CHAR_VALUE" value="PHONE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="e1581c4e-24c6-4461-9340-7b69f5a32a58"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+            <column name="CHAR_VALUE" value="TELEPHONE"/>
+        </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="66950de5-fa8b-465c-8db1-4eb7aac98bd3"/>
 
@@ -21,6 +47,18 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
         </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ace352ee-b9ba-47eb-a55d-4619a4b41e61"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="66950de5-fa8b-465c-8db1-4eb7aac98bd3"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+            <column name="CHAR_VALUE" value="EMAIL"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="283695a0-1896-4500-a284-b8fd8c9a38ce"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="66950de5-fa8b-465c-8db1-4eb7aac98bd3"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+            <column name="CHAR_VALUE" value="EMAIL"/>
+        </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f"/>
 
@@ -31,6 +69,18 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
         </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="bf5385d9-a50c-4c4d-8a98-aa94a894ba65"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+            <column name="CHAR_VALUE" value="PHONE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9cb37456-720e-4886-a142-b30624dc6dc5"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+            <column name="CHAR_VALUE" value="TELEPHONE"/>
+        </insert>
         <insert tableName="AB_KEYWORD_ENTRY">
             <column name="AB_KEYWORD_ENTRYID" value="cfebe176-0a64-428d-b0ec-bba454d2ca3e"/>
 
@@ -41,7 +91,31 @@
             <column name="ISACTIVE" valueNumeric="1"/>
             <column name="ISESSENTIAL" valueNumeric="0"/>
         </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="22b05555-f152-40e2-8ec8-9c1740fcc0e9"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="cfebe176-0a64-428d-b0ec-bba454d2ca3e"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+            <column name="CHAR_VALUE" value="OTHER"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="0b12da28-e132-4a91-a9ca-beceb811fa44"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="cfebe176-0a64-428d-b0ec-bba454d2ca3e"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+            <column name="CHAR_VALUE" value="LINK"/>
+        </insert>
         <rollback>
+            <delete tableName="AB_KEYWORD_ATTRIBUTE">
+                <where>AB_KEYWORD_ATTRIBUTEID = ?</where>
+                <whereParams>
+                    <param value="7250ff28-1d48-41cc-bb36-8c33ace341bb" />
+                </whereParams>
+            </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTE">
+                <where>AB_KEYWORD_ATTRIBUTEID = ?</where>
+                <whereParams>
+                    <param value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1" />
+                </whereParams>
+            </delete>
             <delete tableName="AB_KEYWORD_ENTRY">
                 <where>AB_KEYWORD_ENTRYID = ?</where>
                 <whereParams>
@@ -54,18 +128,54 @@
                     <param value="66950de5-fa8b-465c-8db1-4eb7aac98bd3" />
                 </whereParams>
             </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
+                <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
+                <whereParams>
+                    <param value="688fe492-d5df-4af0-8bfe-8a7a4b6946d2" />
+                </whereParams>
+            </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
+                <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
+                <whereParams>
+                    <param value="e1581c4e-24c6-4461-9340-7b69f5a32a58" />
+                </whereParams>
+            </delete>
             <delete tableName="AB_KEYWORD_ENTRY">
                 <where>AB_KEYWORD_ENTRYID = ?</where>
                 <whereParams>
                     <param value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f" />
                 </whereParams>
             </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
+                <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
+                <whereParams>
+                    <param value="ace352ee-b9ba-47eb-a55d-4619a4b41e61" />
+                </whereParams>
+            </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
+                <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
+                <whereParams>
+                    <param value="283695a0-1896-4500-a284-b8fd8c9a38ce" />
+                </whereParams>
+            </delete>
             <delete tableName="AB_KEYWORD_ENTRY">
                 <where>AB_KEYWORD_ENTRYID = ?</where>
                 <whereParams>
                     <param value="cfebe176-0a64-428d-b0ec-bba454d2ca3e" />
                 </whereParams>
             </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
+                <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
+                <whereParams>
+                    <param value="22b05555-f152-40e2-8ec8-9c1740fcc0e9" />
+                </whereParams>
+            </delete>
+            <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
+                <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
+                <whereParams>
+                    <param value="0b12da28-e132-4a91-a9ca-beceb811fa44" />
+                </whereParams>
+            </delete>
         </rollback>
     </changeSet>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/OfferProbability.xml b/others/db_changes/data_alias/basic/2019.2/OfferProbability.xml
index eaaddbc91f..adaa2322a6 100644
--- a/others/db_changes/data_alias/basic/2019.2/OfferProbability.xml
+++ b/others/db_changes/data_alias/basic/2019.2/OfferProbability.xml
@@ -42,7 +42,7 @@
             </update>
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="3"/>
-                <where>PROBABILITY_OLD = 'c510907f-8478-471e-b702-5008908504b'</where>
+                <where>PROBABILITY_OLD = 'c510907f-8478-471e-b702-5008908504bd'</where>
             </update>
             <update tableName="OFFER">
                 <column name="PROBABILITY" valueNumeric="4"/>
-- 
GitLab