merging dev to test

.gitignore

@@ -4,12 +4,10 @@
 /DSL/Ruuter/services/POST/services/active
 /DSL/Ruuter/services/POST/services/draft
 /DSL/Ruuter/services/POST/services/inactive
-/DSL/Ruuter/services/POST/services/endpoints
 /DSL/Ruuter/services/POST/services/inactive
 /DSL/Ruuter/services/GET/services/active
 /DSL/Ruuter/services/GET/services/draft
 /DSL/Ruuter/services/GET/services/inactive
-/DSL/Ruuter/services/GET/services/endpoints
 /DSL/Ruuter/services/GET/services/inactive
 .DS_Store
 .vscode

DSL/Liquibase/changelog/20250516152343-remove_file_name_from_endpoints.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd
+                        http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd">
+
+    <changeSet id="20250516152343" author="1AhmedYasser">
+        <sqlFile path="changelog/migrations/20250516152343-remove_file_name_from_endpoints.sql" />
+        <rollback>
+            <sqlFile path="changelog/migrations/rollback/20250516152343_rollback.sql" />
+        </rollback>
+    </changeSet>
+</databaseChangeLog> 

DSL/Liquibase/changelog/migrations/20250516152343-remove_file_name_from_endpoints.sql

@@ -0,0 +1,4 @@
+-- liquibase formatted sql
+-- changeset 1AhmedYasser:20250516152343
+
+ALTER TABLE endpoints DROP COLUMN file_name;

DSL/Liquibase/changelog/migrations/rollback/20250516152343_rollback.sql

@@ -0,0 +1,5 @@
+-- liquibase formatted sql
+-- rollback
+
+-- Add back the file_name column as TEXT
+ALTER TABLE endpoints ADD COLUMN file_name TEXT NOT NULL;

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

@@ -3,7 +3,6 @@ INSERT INTO endpoints (
     service_id,
     name,
     type,
-    file_name,
     is_common,
     definitions
 )
@@ -12,7 +11,6 @@ VALUES (
     :serviceId::uuid,
     :name,
     :type::endpoint_type,
-    :fileName,
     :isCommon,
     :definitions::jsonb
-); 
+); 

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

@@ -3,7 +3,6 @@ INSERT INTO endpoints (
     service_id,
     name,
     type,
-    file_name,
     is_common,
     definitions,
     deleted,
@@ -15,7 +14,6 @@ SELECT
     service_id,
     name,
     type,
-    file_name,
     is_common,
     definitions,
     TRUE AS deleted,
@@ -24,4 +22,4 @@ SELECT
 FROM endpoints
 WHERE endpoint_id = :id::uuid
 ORDER BY id DESC
-LIMIT 1;
+LIMIT 1;

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

@@ -12,7 +12,6 @@ INSERT INTO endpoints (
     service_id,
     name,
     type,
-    file_name,
     is_common,
     definitions,
     deleted,
@@ -24,7 +23,6 @@ SELECT
     service_id,
     name,
     type,
-    file_name,
     is_common,
     definitions,
     TRUE AS deleted,

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

@@ -8,7 +8,6 @@ SELECT
   endpoint_id,
   name,
   type,
-  file_name,
   is_common,
   definitions
 FROM LatestEndpoints

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

@@ -8,9 +8,8 @@ SELECT
   endpoint_id,
   name,
   type,
-  file_name,
   is_common,
   definitions
 FROM LatestEndpoints
 WHERE deleted IS FALSE
-ORDER BY id DESC;
+ORDER BY id DESC;

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

@@ -1,10 +1,9 @@
-INSERT INTO endpoints (endpoint_id, service_id, name, type, file_name, is_common, definitions)
+INSERT INTO endpoints (endpoint_id, service_id, name, type, is_common, definitions)
 VALUES (
   :endpointId::uuid,
   :serviceId::uuid,
   :name,
   :type::endpoint_type,
-  :fileName,
   :isCommon,
   :definitions::jsonb
-);
+);

DSL/Resql/services/POST/get-common-services-list.sql

@@ -16,9 +16,9 @@ FROM services
 JOIN MaxServices ON id = maxId
 WHERE NOT deleted AND is_common
 ORDER BY
-  CASE WHEN :sorting = 'id asc' THEN id END ASC,
   CASE WHEN :sorting = 'name asc' THEN name END ASC,
   CASE WHEN :sorting = 'name desc' THEN name END DESC,
   CASE WHEN :sorting = 'state asc' THEN current_state END ASC,
-  CASE WHEN :sorting = 'state desc' THEN current_state END DESC
+  CASE WHEN :sorting = 'state desc' THEN current_state END DESC,
+  name ASC
 OFFSET ((GREATEST(:page, 1) - 1) * :page_size) LIMIT :page_size;

DSL/Resql/services/POST/get-services-list.sql

@@ -15,9 +15,9 @@ FROM services
 JOIN MaxServices ON id = maxId
 WHERE NOT deleted AND NOT is_common
 ORDER BY 
-   CASE WHEN :sorting = 'id asc' THEN id END ASC,
    CASE WHEN :sorting = 'name asc' THEN name END ASC,
    CASE WHEN :sorting = 'name desc' THEN name END DESC,
    CASE WHEN :sorting = 'state asc' THEN current_state END ASC,
-   CASE WHEN :sorting = 'state desc' THEN current_state END DESC
+   CASE WHEN :sorting = 'state desc' THEN current_state END DESC,
+   name ASC
 OFFSET ((GREATEST(:page, 1) - 1) * :page_size) LIMIT :page_size;