improvements and fixing of the tests

server/tests/table_definition/post_table_definition_test4.rs

@@ -4,41 +4,6 @@
 
 // ========= Category 5: Implementation-Specific Edge Cases =========
 
-#[rstest]
-#[tokio::test]
-async fn test_column_name_with_id_suffix_is_allowed(#[future] pool: PgPool) {
-    // NOTE: This test confirms the CURRENT behavior of the code, which is that creating
-    // a column with an `_id` suffix is allowed. The existing test
-    // `test_fail_on_column_name_suffix_id` makes a contrary assumption.
-    // If this behavior is undesirable, the `is_valid_identifier` function or its
-    // usage in the handler should be updated to reject such names.
-    let pool = pool.await;
-    let request = PostTableDefinitionRequest {
-        profile_name: "default".into(),
-        table_name: "orders_with_custom_id".into(),
-        columns: vec![ColumnDefinition {
-            name: "legacy_order_id".into(), // A user-defined column ending in `_id`
-            field_type: "integer".into(),
-        }],
-        ..Default::default()
-    };
-
-    // Act
-    let response = post_table_definition(&pool, request).await.unwrap();
-
-    // Assert
-    assert!(response.success);
-    assert!(response.sql.contains("\"legacy_order_id\" INTEGER"));
-
-    // Verify in the actual database
-    assert_table_structure_is_correct(
-        &pool,
-        "orders_with_custom_id",
-        &[("legacy_order_id", "integer")],
-    )
-    .await;
-}
-
 #[rstest]
 #[tokio::test]
 async fn test_fail_on_fk_base_name_collision(#[future] pool: PgPool) {
@@ -190,3 +155,68 @@ async fn test_fail_gracefully_if_schema_is_missing(#[future] pool: PgPool) {
     // Check for the Postgres error message for a missing schema.
     assert!(err.message().to_lowercase().contains("schema \"gen\" does not exist"));
 }
+
+#[rstest]
+#[tokio::test]
+async fn test_column_name_with_id_suffix_is_rejected(#[future] pool: PgPool) {
+    // Test that column names ending with '_id' are properly rejected during input validation
+    let pool = pool.await;
+
+    // Test 1: Column ending with '_id' should be rejected
+    let request = PostTableDefinitionRequest {
+        profile_name: "default".into(),
+        table_name: "orders".into(), // Valid table name
+        columns: vec![ColumnDefinition {
+            name: "legacy_order_id".into(), // This should be rejected
+            field_type: "integer".into(),
+        }],
+        ..Default::default()
+    };
+
+    // Act & Assert - should fail validation
+    let result = post_table_definition(&pool, request).await;
+    assert!(result.is_err(), "Column names ending with '_id' should be rejected");
+    if let Err(status) = result {
+        assert_eq!(status.code(), tonic::Code::InvalidArgument);
+        assert!(status.message().contains("Invalid column name"));
+    }
+
+    // Test 2: Column named exactly 'id' should be rejected
+    let request2 = PostTableDefinitionRequest {
+        profile_name: "default".into(),
+        table_name: "orders".into(),
+        columns: vec![ColumnDefinition {
+            name: "id".into(), // This should be rejected
+            field_type: "integer".into(),
+        }],
+        ..Default::default()
+    };
+
+    let result2 = post_table_definition(&pool, request2).await;
+    assert!(result2.is_err(), "Column named 'id' should be rejected");
+}
+
+#[rstest]
+#[tokio::test]
+async fn test_table_name_with_id_suffix_is_rejected(#[future] pool: PgPool) {
+    // Test that table names ending with '_id' are properly rejected during input validation
+    let pool = pool.await;
+
+    let request = PostTableDefinitionRequest {
+        profile_name: "default".into(),
+        table_name: "orders_id".into(), // This should be rejected
+        columns: vec![ColumnDefinition {
+            name: "customer_name".into(), // Valid column name
+            field_type: "text".into(),
+        }],
+        ..Default::default()
+    };
+
+    // Act & Assert - should fail validation
+    let result = post_table_definition(&pool, request).await;
+    assert!(result.is_err(), "Table names ending with '_id' should be rejected");
+    if let Err(status) = result {
+        assert_eq!(status.code(), tonic::Code::InvalidArgument);
+        assert!(status.message().contains("Table name cannot be 'id', 'deleted', 'created_at' or end with '_id'"));
+    }
+}