merging dev to test

DSL/Resql/training/POST/add-intent.sql

@@ -1,18 +1,2 @@
--- Insert new row for intent preserving existing status
--- This finds the latest version of the intent and creates a new row with preserved status
 INSERT INTO intent (intent, created, status, isForService)
-SELECT 
-    :intent,
-    CURRENT_TIMESTAMP,
-    COALESCE(latest_intent.status, :status),
-    false
-FROM (
-    -- Find the latest version of the specific intent
-    SELECT DISTINCT ON (intent) 
-        intent,
-        status,
-        created
-    FROM intent
-    WHERE intent = :intent
-    ORDER BY intent, created DESC
-) AS latest_intent;
+VALUES (:intent, CURRENT_TIMESTAMP, :status, false);

DSL/Resql/training/POST/update-intent-name.sql

@@ -0,0 +1,12 @@
+-- Update intent name by inserting a new record with the new name and copying over status and isForService from the old record.
+-- Expects :oldIntent and :newIntent parameters.
+INSERT INTO intent (intent, status, isForService, created)
+SELECT
+    :newIntent,
+    status,
+    isForService,
+    CURRENT_TIMESTAMP
+FROM intent
+WHERE intent = :oldIntent
+ORDER BY created DESC
+LIMIT 1;

DSL/Resql/training/POST/update-intent.sql

@@ -6,8 +6,14 @@ INSERT INTO intent (intent, created, status, isForService)
 SELECT 
     :intent,
     CURRENT_TIMESTAMP,
-    COALESCE(:status, latest_intent.status),
-    COALESCE(:isForService, latest_intent.isForService)
+    COALESCE(NULLIF(:status, ''), latest_intent.status),
+    COALESCE(
+        CASE 
+            WHEN CAST(:isForService AS TEXT) = '' THEN NULL 
+            ELSE CAST(:isForService AS BOOLEAN) 
+        END,
+        latest_intent.isForService
+    )
 FROM (
     -- Find the latest version of the specific intent
     SELECT DISTINCT ON (intent) 

DSL/Ruuter.private/training/GET/rasa/intents/mark-for-service.yml

@@ -53,6 +53,7 @@ updateInDatabase:
     body:
       intent: ${intent}
       isForService: ${isForService}
+      status: ""
   result: addIntentResult
 
 returnSuccess:

DSL/Ruuter.private/training/POST/rasa/intents/update.yml

@@ -291,9 +291,10 @@ addNewIntentInPipeline:
 addInDatabase:
   call: http.post
   args:
-    url: "[#TRAINING_RESQL]/add-intent"
+    url: "[#TRAINING_RESQL]/update-intent-name"
     body:
-      intent: ${incoming.body.newName}
+      oldIntent: ${incoming.body.oldName}
+      newIntent: ${incoming.body.newName}
   result: addInDatabaseResult
 
 deleteOldIntentFile:

DSL/Ruuter.private/training/POST/rasa/responses/add.yml

@@ -105,6 +105,7 @@ updateIntentStatus:
     url: "[#TRAINING_RESQL]/update-intent"
     body:
       intent: ${intent}
+      isForService: ""
       status: "NOT_TRAINED"
   result: updateIntentStatusResult
   next: returnSuccess

DSL/Ruuter.private/training/POST/rasa/responses/update.yml

@@ -105,6 +105,7 @@ updateIntentStatus:
     url: "[#TRAINING_RESQL]/update-intent"
     body:
       intent: ${intent}
+      isForService: ""
       status: "NOT_TRAINED"
   result: updateIntentStatusResult
   next: returnSuccess