Merge pull request #90 from ydayagi/flpath1893

fix(orchestrator): update openapi flpath-1893
redhat-developer · Dec 2, 2024 · 651312a · 651312a
2 parents 948e2ad + 1d4cfa1
commit 651312a
Show file tree

Hide file tree

Showing 12 changed files with 301 additions and 319 deletions.
diff --git a/workspaces/orchestrator/.changeset/red-seahorses-give.md b/workspaces/orchestrator/.changeset/red-seahorses-give.md
@@ -0,0 +1,6 @@
+---
+'@red-hat-developer-hub/backstage-plugin-orchestrator-backend': patch
+'@red-hat-developer-hub/backstage-plugin-orchestrator-common': patch
+---
+
+update openapi flpath-1893
diff --git a/...aces/orchestrator/plugins/orchestrator-backend/src/service/api/mapping/V2Mappings.test.ts b/...aces/orchestrator/plugins/orchestrator-backend/src/service/api/mapping/V2Mappings.test.ts
@@ -76,7 +76,6 @@ describe('scenarios to verify mapToWorkflowOverviewDTO', () => {
       getProcessInstancesStatusDTOFromString(overview.lastRunStatus),
     );
     expect(result.category).toBe('assessment');
-    expect(result.avgDurationMs).toBe(overview.avgDurationMs);
     expect(result.description).toBe(overview.description);
   });
 });

diff --git a/workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/mapping/V2Mappings.ts b/workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/mapping/V2Mappings.ts
@@ -46,7 +46,6 @@ export function mapToWorkflowOverviewDTO(
     name: overview.name,
     format: overview.format,
     workflowId: overview.workflowId,
-    avgDurationMs: overview.avgDurationMs,
     description: overview.description,
     lastRunId: overview.lastRunId,
     lastRunStatus: overview.lastRunStatus

diff --git a/workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/test-utils.ts b/workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/test-utils.ts
@@ -38,7 +38,6 @@ interface WorkflowOverviewParams {
   lastTriggeredMs?: number;
   lastRunStatus?: ProcessInstanceStateValues;
   category?: string;
-  avgDurationMs?: number;
   description?: string;
 }
 export function generateTestWorkflowOverview(
@@ -52,7 +51,6 @@ export function generateTestWorkflowOverview(
       params.lastTriggeredMs ?? Date.parse('2024-02-09T10:34:56Z'),
     lastRunStatus: params.lastRunStatus ?? ProcessInstanceState.Completed,
     category: params.category ?? 'assessment', // validate input
-    avgDurationMs: params.avgDurationMs ?? 1000,
     description: params.description ?? 'Test Workflow Description',
   };
 }

diff --git a/workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/v2.test.ts b/workspaces/orchestrator/plugins/orchestrator-backend/src/service/api/v2.test.ts
@@ -296,7 +296,6 @@ describe('getWorkflowOverviewById', () => {
     expect(overviewV2.lastTriggeredMs).toBeUndefined();
     expect(overviewV2.lastRunStatus).toBeUndefined();
     expect(overviewV2.category).toEqual('infrastructure');
-    expect(overviewV2.avgDurationMs).toBeUndefined();
     expect(overviewV2.description).toBeUndefined();
   });
 

diff --git a/workspaces/orchestrator/plugins/orchestrator-common/report.api.md b/workspaces/orchestrator/plugins/orchestrator-common/report.api.md
diff --git a/workspaces/orchestrator/plugins/orchestrator-common/src/generated/.METADATA.sha1 b/workspaces/orchestrator/plugins/orchestrator-common/src/generated/.METADATA.sha1
@@ -1 +1 @@
-5fcc8d37339b5241ec2435343b540d2aec5c6873
+91326c20d83a0f45099f3ba29eab13709d60a938
diff --git a/workspaces/orchestrator/plugins/orchestrator-common/src/generated/api/definition.ts b/workspaces/orchestrator/plugins/orchestrator-common/src/generated/api/definition.ts
diff --git a/workspaces/orchestrator/plugins/orchestrator-common/src/generated/client/api.ts b/workspaces/orchestrator/plugins/orchestrator-common/src/generated/client/api.ts
@@ -660,12 +660,6 @@ export interface WorkflowOverviewDTO {
      * @memberof WorkflowOverviewDTO
      */
     'category'?: WorkflowCategoryDTO;
-    /**
-     * 
-     * @type {number}
-     * @memberof WorkflowOverviewDTO
-     */
-    'avgDurationMs'?: number;
     /**
      * 
      * @type {string}

diff --git a/workspaces/orchestrator/plugins/orchestrator-common/src/generated/docs/html/index.html b/workspaces/orchestrator/plugins/orchestrator-common/src/generated/docs/html/index.html
@@ -1224,10 +1224,6 @@
     "category" : {
       "$ref" : "#/components/schemas/WorkflowCategoryDTO"
     },
-    "avgDurationMs" : {
-      "minimum" : 0,
-      "type" : "number"
-    },
     "description" : {
       "type" : "string"
     }
@@ -2844,19 +2840,19 @@ <h3>Usage and SDK Samples</h3>
  "http://localhost/v2/workflows/instances" \
  -d '{
   &quot;paginationInfo&quot; : {
-    &quot;offset&quot; : 5.962133916683182,
-    &quot;pageSize&quot; : 1.4658129805029452,
+    &quot;offset&quot; : 1.4658129805029452,
+    &quot;pageSize&quot; : 6.027456183070403,
     &quot;orderDirection&quot; : &quot;ASC&quot;,
     &quot;orderBy&quot; : &quot;orderBy&quot;,
-    &quot;totalCount&quot; : 5.637376656633329
+    &quot;totalCount&quot; : 5.962133916683182
   },
   &quot;filters&quot; : {
     &quot;paginationInfo&quot; : {
-      &quot;offset&quot; : 5.962133916683182,
-      &quot;pageSize&quot; : 1.4658129805029452,
+      &quot;offset&quot; : 1.4658129805029452,
+      &quot;pageSize&quot; : 6.027456183070403,
       &quot;orderDirection&quot; : &quot;ASC&quot;,
       &quot;orderBy&quot; : &quot;orderBy&quot;,
-      &quot;totalCount&quot; : 5.637376656633329
+      &quot;totalCount&quot; : 5.962133916683182
     },
     &quot;filters&quot; : {
       &quot;filters&quot; : [ null, null ],
@@ -3757,11 +3753,11 @@ <h3>Usage and SDK Samples</h3>
  "http://localhost/v2/workflows/{workflowId}/instances" \
  -d '{
   &quot;paginationInfo&quot; : {
-    &quot;offset&quot; : 5.962133916683182,
-    &quot;pageSize&quot; : 1.4658129805029452,
+    &quot;offset&quot; : 1.4658129805029452,
+    &quot;pageSize&quot; : 6.027456183070403,
     &quot;orderDirection&quot; : &quot;ASC&quot;,
     &quot;orderBy&quot; : &quot;orderBy&quot;,
-    &quot;totalCount&quot; : 5.637376656633329
+    &quot;totalCount&quot; : 5.962133916683182
   },
   &quot;filters&quot; : {
     &quot;filters&quot; : [ null, null ],
@@ -5452,11 +5448,11 @@ <h3>Usage and SDK Samples</h3>
  "http://localhost/v2/workflows/overview" \
  -d '{
   &quot;paginationInfo&quot; : {
-    &quot;offset&quot; : 5.962133916683182,
-    &quot;pageSize&quot; : 1.4658129805029452,
+    &quot;offset&quot; : 1.4658129805029452,
+    &quot;pageSize&quot; : 6.027456183070403,
     &quot;orderDirection&quot; : &quot;ASC&quot;,
     &quot;orderBy&quot; : &quot;orderBy&quot;,
-    &quot;totalCount&quot; : 5.637376656633329
+    &quot;totalCount&quot; : 5.962133916683182
   },
   &quot;filters&quot; : {
     &quot;filters&quot; : [ null, null ],

diff --git a/...s/orchestrator-common/src/generated/docs/markdown/Models/WorkflowOverviewDTO.md b/...s/orchestrator-common/src/generated/docs/markdown/Models/WorkflowOverviewDTO.md
@@ -10,7 +10,6 @@
 | **lastTriggeredMs** | **BigDecimal** |  | [optional] [default to null] |
 | **lastRunStatus** | [**ProcessInstanceStatusDTO**](ProcessInstanceStatusDTO.md) |  | [optional] [default to null] |
 | **category** | [**WorkflowCategoryDTO**](WorkflowCategoryDTO.md) |  | [optional] [default to null] |
-| **avgDurationMs** | **BigDecimal** |  | [optional] [default to null] |
 | **description** | **String** |  | [optional] [default to null] |
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

diff --git a/workspaces/orchestrator/plugins/orchestrator-common/src/openapi/openapi.yaml b/workspaces/orchestrator/plugins/orchestrator-common/src/openapi/openapi.yaml
@@ -379,9 +379,6 @@ components:
           $ref: '#/components/schemas/ProcessInstanceStatusDTO'
         category:
           $ref: '#/components/schemas/WorkflowCategoryDTO'
-        avgDurationMs:
-          type: number
-          minimum: 0
         description:
           type: string
       required:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5fcc8d37339b5241ec2435343b540d2aec5c6873
		91326c20d83a0f45099f3ba29eab13709d60a938