merging dev to test

DSL/DMapper/services/hbs/service_declaration.handlebars

@@ -0,0 +1,8 @@
+{
+    "id": "{{ name }}",
+    "name": {{{ snakeToString name }}},
+    "description": "{{ description }}",
+    "examples": [{{#each examples}}"{{{this}}}"{{#unless @last}},{{/unless}}{{/each}}],
+    "entities": [{{#each entities}}"{{{this}}}"{{#unless @last}},{{/unless}}{{/each}}],
+    "text_for_embedding": "{{description}}\n{{#each examples}}{{this}}{{#unless @last}}\n{{/unless}}{{/each}}"
+}

DSL/Liquibase/changelog/21111321831-add-examples-keywords-to-services.sql

@@ -0,0 +1,5 @@
+-- liquibase formatted sql
+-- changeset VassiliM:21111321831
+ALTER TABLE services
+    ADD COLUMN entities text[] NOT NULL DEFAULT '{}',
+    ADD COLUMN examples text[] NOT NULL DEFAULT '{}';

DSL/Resql/services/POST/add-services.sql

@@ -0,0 +1,11 @@
+INSERT INTO services (name, description, service_id, ruuter_type, structure)
+SELECT 
+    name,
+    '',
+    gen_random_uuid(),
+    'POST'::ruuter_request_type,
+    structure
+FROM UNNEST(
+    ARRAY[:names]::text[],
+    ARRAY[:structures]::json[]
+) AS t(name, structure);

DSL/Resql/services/POST/add.sql

@@ -1,2 +1,2 @@
-INSERT INTO services (name, description, slot, service_id, ruuter_type, is_common, current_state, structure)
-VALUES (:name, :description, :slot, :service_id, :ruuter_type::ruuter_request_type, :is_common, :state::service_state, :structure::json);
+INSERT INTO services (name, description, slot, examples, entities, service_id, ruuter_type, is_common, current_state, structure)
+VALUES (:name, :description, :slot, ARRAY[:examples]::text[], ARRAY[:entities]::text[], :service_id, :ruuter_type::ruuter_request_type, :is_common, :state::service_state, :structure::json);

DSL/Resql/services/POST/delete-service.sql

@@ -1,29 +1,3 @@
-INSERT INTO services (
-    name,
-    description,
-    slot,
-    created_at,
-    updated_at,
-    ruuter_type,
-    current_state,
-    service_id,
-    is_common,
-    deleted,
-    structure
-)
-SELECT
-    name,
-    description,
-    slot,
-    created_at,
-    updated_at,
-    ruuter_type,
-    current_state,
-    service_id,
-    is_common,
-    TRUE AS deleted,
-    structure
-FROM services
-WHERE service_id = :id
-ORDER BY id DESC
-LIMIT 1;
+UPDATE services
+SET deleted = TRUE
+WHERE service_id = :id;

DSL/Resql/services/POST/edit.sql

@@ -1,14 +1,11 @@
-INSERT INTO services (name, description, slot, ruuter_type, current_state, service_id, is_common, structure)
-SELECT
-  :name,
-  :description,
-  :slot,
-  ruuter_type,
-  :state::service_state,
-  service_id,
-  COALESCE(:is_common, false) AS is_common,
-  :structure::json
-FROM services
-WHERE service_id = :id
-ORDER BY id DESC
-LIMIT 1;
+UPDATE services
+SET
+    name = :name,
+    description = :description,
+    slot = :slot,
+    examples = ARRAY[:examples]::text[],
+    entities = ARRAY[:entities]::text[],
+    current_state = :state::service_state,
+    is_common = COALESCE(:is_common, false),
+    structure = :structure::json
+WHERE service_id = :id;

DSL/Resql/services/POST/endpoints/delete_endpoint.sql

@@ -1,25 +1,3 @@
-INSERT INTO endpoints (
-    endpoint_id,
-    service_id,
-    name,
-    type,
-    is_common,
-    definitions,
-    deleted,
-    created_at,
-    updated_at
-)
-SELECT
-    endpoint_id,
-    service_id,
-    name,
-    type,
-    is_common,
-    definitions,
-    TRUE AS deleted,
-    created_at, 
-    updated_at
-FROM endpoints
-WHERE endpoint_id = :id::uuid
-ORDER BY id DESC
-LIMIT 1;
+UPDATE endpoints
+SET deleted = TRUE
+WHERE endpoint_id = :id::uuid;

DSL/Resql/services/POST/endpoints/delete_endpoints_by_service_id.sql

@@ -1,31 +1,5 @@
-WITH latest_endpoints AS (
-    SELECT DISTINCT ON (endpoint_id) *
-    FROM endpoints
-    WHERE
-        service_id = :serviceId::uuid
-        AND is_common = FALSE
-        AND deleted = FALSE
-    ORDER BY endpoint_id, id DESC
-)
-INSERT INTO endpoints (
-    endpoint_id,
-    service_id,
-    name,
-    type,
-    is_common,
-    definitions,
-    deleted,
-    created_at,
-    updated_at
-)
-SELECT
-    endpoint_id,
-    service_id,
-    name,
-    type,
-    is_common,
-    definitions,
-    TRUE AS deleted,
-    created_at,
-    updated_at
-FROM latest_endpoints;
+UPDATE endpoints
+SET deleted = TRUE
+WHERE service_id = :serviceId::uuid
+  AND is_common = FALSE
+  AND deleted = FALSE;

DSL/Resql/services/POST/endpoints/get_common_endpoints.sql

@@ -1,15 +1,10 @@
-WITH LatestEndpoints AS (
-  SELECT DISTINCT ON (e.endpoint_id) e.*
-  FROM endpoints AS e
-  WHERE e.is_common = true
-  ORDER BY e.endpoint_id, e.id DESC
-)
 SELECT
   endpoint_id,
   name,
   type,
   is_common,
   definitions
-FROM LatestEndpoints
-WHERE deleted IS FALSE
+FROM endpoints
+WHERE is_common = true
+  AND deleted IS FALSE
 ORDER BY id DESC;

DSL/Resql/services/POST/endpoints/get_endpoints_by_service_id.sql

@@ -1,31 +1,26 @@
-WITH LatestEndpoints AS (
-  SELECT DISTINCT ON (e.endpoint_id) e.*
-  FROM endpoints AS e
-  WHERE (e.service_id = :id::uuid OR e.is_common = true)
-  ORDER BY e.endpoint_id, e.id DESC
-),
-UserPreferences AS (
+WITH UserPreferences AS (
   SELECT endpoints
   FROM user_step_preference
   WHERE user_id_code = :user_id_code
   ORDER BY created_at DESC
   LIMIT 1
 )
 SELECT
-  le.endpoint_id,
-  le.name,
-  le.type,
-  le.is_common,
-  le.definitions
-FROM LatestEndpoints AS le
+  e.endpoint_id,
+  e.name,
+  e.type,
+  e.is_common,
+  e.definitions
+FROM endpoints AS e
 CROSS JOIN UserPreferences AS up
-WHERE le.deleted IS FALSE
+WHERE (e.service_id = :id::uuid OR e.is_common = true)
+  AND e.deleted IS FALSE
 ORDER BY 
   CASE 
     WHEN up.endpoints IS NULL OR array_length(up.endpoints, 1) = 0 THEN 1
-    ELSE array_position(up.endpoints, le.endpoint_id)
+    ELSE array_position(up.endpoints, e.endpoint_id)
   END,
   CASE 
-    WHEN up.endpoints IS NULL OR array_length(up.endpoints, 1) = 0 THEN le.id
+    WHEN up.endpoints IS NULL OR array_length(up.endpoints, 1) = 0 THEN e.id
     ELSE NULL
   END DESC; 

DSL/Resql/services/POST/endpoints/remove_endpoint_from_preferences.sql

@@ -1,15 +1,6 @@
 -- Remove a specific endpoint from all user step preferences
 -- This is called when an endpoint is deleted to clean up references
 
-INSERT INTO user_step_preference (steps, endpoints, user_id_code)
-SELECT 
-    steps,
-    array_remove(endpoints, :endpoint_id::uuid) AS endpoints,
-    user_id_code
-FROM user_step_preference AS usp1
-WHERE endpoints @> ARRAY[:endpoint_id::uuid]
-  AND created_at = (
-    SELECT MAX(created_at) 
-    FROM user_step_preference AS usp2 
-    WHERE usp2.user_id_code = usp1.user_id_code
-  ); 
+UPDATE user_step_preference
+SET endpoints = array_remove(endpoints, :endpoint_id::uuid)
+WHERE endpoints @> ARRAY[:endpoint_id::uuid];

DSL/Resql/services/POST/endpoints/remove_service_endpoints_from_preferences.sql

@@ -1,23 +1,26 @@
 -- Remove all non-common endpoints of a deleted service from all user step preferences
 -- This is called when a service is deleted to clean up references to its endpoints
 
-INSERT INTO user_step_preference (steps, endpoints, user_id_code)
-SELECT 
-    steps,
-    array_remove(endpoints, le.endpoint_id) AS endpoints,
-    user_id_code
-FROM user_step_preference AS usp1
-CROSS JOIN (
-    SELECT DISTINCT ON (endpoint_id) endpoint_id
-    FROM endpoints
-    WHERE service_id = :serviceId::uuid
-      AND is_common = FALSE
-      AND deleted = FALSE
-    ORDER BY endpoint_id, id DESC
-) AS le
-WHERE usp1.endpoints @> ARRAY[le.endpoint_id]
-  AND usp1.created_at = (
-    SELECT MAX(created_at) 
-    FROM user_step_preference AS usp2 
-    WHERE usp2.user_id_code = usp1.user_id_code
-  ); 
+UPDATE user_step_preference AS usp
+SET endpoints = COALESCE((
+    SELECT array_agg(endpoint_id)::uuid[]
+    FROM unnest(usp.endpoints) AS endpoint_id
+    WHERE endpoint_id NOT IN (
+        SELECT endpoint_id
+        FROM endpoints
+        WHERE service_id = :serviceId::uuid
+          AND is_common = FALSE
+          AND deleted = FALSE
+    )
+), ARRAY[]::uuid[])
+WHERE EXISTS (
+    SELECT 1
+    FROM unnest(usp.endpoints) AS endpoint_id
+    WHERE endpoint_id IN (
+        SELECT endpoint_id
+        FROM endpoints
+        WHERE service_id = :serviceId::uuid
+          AND is_common = FALSE
+          AND deleted = FALSE
+    )
+); 

DSL/Resql/services/POST/endpoints/update_endpoint.sql

@@ -1,9 +1,8 @@
-INSERT INTO endpoints (endpoint_id, service_id, name, type, is_common, definitions)
-VALUES (
-  :endpointId::uuid,
-  :serviceId::uuid,
-  :name,
-  :type::endpoint_type,
-  :isCommon,
-  :definitions::jsonb
-);
+UPDATE endpoints
+SET
+    service_id = :serviceId::uuid,
+    name = :name,
+    type = :type::endpoint_type,
+    is_common = :isCommon,
+    definitions = :definitions::jsonb
+WHERE endpoint_id = :endpointId::uuid;

DSL/Resql/services/POST/get-import-names.sql

@@ -0,0 +1,19 @@
+WITH input_names AS (
+  SELECT TRIM(UNNEST(string_to_array(:names, ','))) AS name
+),
+processed_names AS (
+  SELECT 
+    CASE 
+      WHEN EXISTS (
+        SELECT 1 
+        FROM services s
+        WHERE s.name = iname.name 
+        AND NOT s.deleted
+      )
+      THEN iname.name || '_' || to_char(NOW() AT TIME ZONE :timezone, 'YYYY_MM_DD_HH24_MI_SS')
+      ELSE iname.name
+    END AS processed_name
+  FROM input_names iname
+)
+SELECT string_agg(processed_name, ',') AS names
+FROM processed_names;

DSL/Resql/services/POST/get-service-by-id.sql

@@ -1,20 +1,15 @@
-WITH MaxService AS (
-  SELECT MAX(id) AS maxId
-  FROM services
-  WHERE service_id = :id
-  LIMIT 1
-)
 SELECT
   id,
   name,
   description,
   slot,
+  examples,
+  entities,
   current_state AS state,
   ruuter_type AS type,
   is_common,
   structure::json,
   service_id
 FROM services
-JOIN MaxService ON id = maxId
-WHERE NOT deleted
-ORDER BY id ASC;
+WHERE service_id = :id
+  AND NOT deleted;

DSL/Resql/services/POST/get-service-name-by-id.sql

@@ -1,4 +1,3 @@
-SELECT name FROM services
-WHERE service_id = :id
-ORDER BY id DESC
-LIMIT 1;
+SELECT name
+FROM services
+WHERE service_id = :id;