diff --git a/features/backend/report_tables/main_tests_report_tables.feature b/features/backend/report_tables/main_tests_report_tables.feature index 526d0beec..0a247817d 100644 --- a/features/backend/report_tables/main_tests_report_tables.feature +++ b/features/backend/report_tables/main_tests_report_tables.feature @@ -1,7 +1,7 @@ @ProcessMakerMichelangelo @RestAPI -Feature: DataBase Connections +Feature: Report Tables - Scenario: List all the database connections (result 0 database connections) + Scenario: List all the report tables (result 0 report tables) Given that I have a valid access_token And I request "project/96189226752f3e5e23c1303036042196/report-tables" Then the response status code should be 200 @@ -9,7 +9,7 @@ Feature: DataBase Connections And the response has 0 record - Scenario: Create a new database connection + Scenario: Create a new report table Given that I have a valid access_token And POST this data: """ @@ -39,16 +39,16 @@ Feature: DataBase Connections Then the response status code should be 201 And store "rep_uid" in session array - @3: TEST FOR GET DATABASE CONNECTIONS /---------------------------------------------------------------------- - Scenario: List all the database connections (result 1 database connection) + @3: TEST FOR GET report tableS /---------------------------------------------------------------------- + Scenario: List all the report tables (result 1 report table) Given that I have a valid access_token And I request "project/96189226752f3e5e23c1303036042196/report-tables" Then the response status code should be 200 And the response charset is "UTF-8" And the response has 1 record - @4: TEST FOR PUT DATABASE CONNECTION /----------------------------------------------------------------------- - Scenario: Update a database connection + @4: TEST FOR PUT report table /----------------------------------------------------------------------- + Scenario: Update a report table Given that I have a valid access_token And PUT this data: """ @@ -70,16 +70,16 @@ Feature: DataBase Connections ] } """ - And that I want to update a resource with the key "dbs_uid" stored in session array + And that I want to update a resource with the key "rep_uid" stored in session array And I request "project/96189226752f3e5e23c1303036042196/report-table" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" - Scenario: Get a database connection (with change in "dbs_description" and "dbs_database_name") + Scenario: Get a report table (with change in "rep_tab_dsc") Given that I have a valid access_token - And that I want to get a resource with the key "dbs_uid" stored in session array + And that I want to get a resource with the key "rep_uid" stored in session array And I request "project/96189226752f3e5e23c1303036042196/report-table" Then the response status code should be 200 And the response charset is "UTF-8" @@ -87,16 +87,16 @@ Feature: DataBase Connections And that "rep_tab_dsc" is set to "nueva descripcion" - Scenario: Delete a database connection + Scenario: Delete a report table Given that I have a valid access_token - And that I want to delete a resource with the key "dbs_uid" stored in session array + And that I want to delete a resource with the key "rep_uid" stored in session array And I request "project/96189226752f3e5e23c1303036042196/report-table" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" - @7: TEST FOR GET DATABASE CONNECTIONS /---------------------------------------------------------------------- - Scenario: List all the database connections (result 0 database connections) + @7: TEST FOR GET report tableS /---------------------------------------------------------------------- + Scenario: List all the report tables (result 0 report tables) Given that I have a valid access_token And I request "project/96189226752f3e5e23c1303036042196/report-tables" Then the response status code should be 200 diff --git a/workflow/engine/src/BusinessModel/ReportTable.php b/workflow/engine/src/BusinessModel/ReportTable.php index a2d56ddf9..be038045e 100644 --- a/workflow/engine/src/BusinessModel/ReportTable.php +++ b/workflow/engine/src/BusinessModel/ReportTable.php @@ -95,11 +95,8 @@ class ReportTable public function getDataReportTableData($pro_uid, $rep_uid) { //VALIDATION - if ($validate) { - $pro_uid = $this->validateProUid($pro_uid); - $rep_uid = $this->validateRepUid($rep_uid); - $repData['PRO_UID'] = $pro_uid; - } + $pro_uid = $this->validateProUid($pro_uid); + $rep_uid = $this->validateRepUid($rep_uid); $additionalTables = new AdditionalTables(); $table = $additionalTables->load($rep_uid, true); diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/ReportTable.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/ReportTable.php index beaa58cc2..3d8aea5cf 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/ReportTable.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/ReportTable.php @@ -101,7 +101,7 @@ class ReportTable extends Api * @param string $rep_tab_name {@from body} * @param string $rep_tab_dsc {@from body} * @param string $rep_tab_connection {@from body} - * @param string $rep_tab_type {@from body} + * @param string $rep_tab_type {@from body} {@choice NORMAL,GRID} * @param string $rep_tab_grid {@from body} * @return array *