Merge develop to master

apps/web/src/api-clients/_common/constants/api-doc-constant.ts

@@ -95,6 +95,22 @@ export const API_DOC = {
             'analyze',
             'list',
         ],
+        'report-adjustment-policy': [
+            'create',
+            'delete',
+            'get',
+            'list',
+            'update',
+            'change-order',
+        ],
+        'report-adjustment': [
+            'create',
+            'delete',
+            'get',
+            'list',
+            'update',
+            'change-order',
+        ],
         'data-source': [
             'get',
             'list',

apps/web/src/api-clients/cost-analysis/cost-report-config/composables/use-cost-report-config-api.ts

@@ -2,21 +2,23 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
 import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
 import type { CostReportConfigListParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list';
+import type { CostReportConfigRunParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/run';
 import type { CostReportConfigUpdateParameters } from '@/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update';
 import type { CostReportConfigModel } from '@/api-clients/cost-analysis/cost-report-config/schema/model';
 
-
 interface UseCostReportConfigApiReturn {
     costReportConfigAPI: {
         update: (params: CostReportConfigUpdateParameters) => Promise<CostReportConfigModel>;
         list: (params: CostReportConfigListParameters) => Promise<ListResponse<CostReportConfigModel>>;
+        run: (params: CostReportConfigRunParameters) => Promise<void>;
     }
 }
 
 export const useCostReportConfigApi = (): UseCostReportConfigApiReturn => {
     const actions = {
         update: SpaceConnector.clientV2.costAnalysis.costReportConfig.update<CostReportConfigUpdateParameters, CostReportConfigModel>,
         list: SpaceConnector.clientV2.costAnalysis.costReportConfig.list<CostReportConfigListParameters, ListResponse<CostReportConfigModel>>,
+        run: SpaceConnector.clientV2.costAnalysis.costReportConfig.run<CostReportConfigRunParameters, void>,
     };
 
     return {

apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/list.ts

@@ -1,7 +1,10 @@
 import type { Query } from '@cloudforet/core-lib/space-connector/type';
 
+import type { CostReportConfigStatus } from '@/api-clients/cost-analysis/cost-report-config/schema/type';
 
 export interface CostReportConfigListParameters {
     query?: Query;
     cost_report_config_id?: string;
+    state?: CostReportConfigStatus;
+    scope?: 'WORKSPACE'|'PROJECT';
 }

apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/run.ts

@@ -0,0 +1,3 @@
+export interface CostReportConfigRunParameters {
+    cost_report_config_id: string;
+}

apps/web/src/api-clients/cost-analysis/cost-report-config/schema/api-verbs/update.ts

@@ -12,4 +12,8 @@ export interface CostReportConfigUpdateParameters {
         state: string;
         data_sources: string[];
     };
+    adjustment_options?: {
+        enabled: boolean;
+        period?: number;
+    };
 }

apps/web/src/api-clients/cost-analysis/cost-report-config/schema/model.ts

@@ -20,6 +20,11 @@ export interface CostReportConfigModel {
         data_sources: string[];
     };
     language?: LanguageCode;
+    scope: 'WORKSPACE'|'PROJECT';
+    adjustment_options?: {
+        enabled: boolean;
+        period: number;
+    };
     domain_id: string;
     created_at: string;
     updated_at: string;

apps/web/src/api-clients/cost-analysis/cost-report-data/schema/model.ts

@@ -19,4 +19,8 @@ export interface CostReportDataModel {
     workspace_id: string;
     domain_id: string;
     created_at: string;
+    is_adjusted: boolean;
+    region_code: string;
+    region_key: string;
+    report_adjustment_policy_id: string;
 }

apps/web/src/api-clients/cost-analysis/cost-report/schema/api-verbs/list.ts

@@ -5,8 +5,9 @@ import type { CostReportStatus } from '@/api-clients/cost-analysis/cost-report/s
 
 export interface CostReportListParameters {
     query?: Query;
+    cost_report_config_id?: string;
     cost_report_id?: string;
     status?: CostReportStatus;
     issue_date?: string;
-    workspace_name?: string;
+    name?: string;
 }

apps/web/src/api-clients/cost-analysis/cost-report/schema/model.ts

@@ -12,9 +12,12 @@ export interface CostReportModel {
     issue_date: string;
     report_year: string;
     report_month: string;
-    workspace_name: string;
+    name: string;
     cost_report_config_id: string;
     workspace_id: string;
+    project_id: string;
+    service_account_id: string;
+    is_adjusted: boolean;
     domain_id: string;
     bank_name: string;
     currency_date: string;

apps/web/src/api-clients/cost-analysis/cost-report/schema/type.ts

@@ -1 +1 @@
-export type CostReportStatus = 'IN_PROGRESS' | 'SUCCESS';
+export type CostReportStatus = 'IN_PROGRESS' | 'ADJUSTING' | 'DONE';

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/composables/use-report-adjustment-policy-api.ts

@@ -0,0 +1,41 @@
+import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
+
+import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
+import type { ReportAdjustmentPolicyChangeOrderParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/change-order';
+import type { ReportAdjustmentPolicyCreateParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/create';
+import type { ReportAdjustmentPolicyDeleteParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/delete';
+import type { ReportAdjustmentPolicyGetParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/get';
+import type { ReportAdjustmentPolicyListParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/list';
+import type { ReportAdjustmentPolicySyncCurrencyParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/sync-currency';
+import type { ReportAdjustmentPolicyUpdateParameters } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/update';
+import type { ReportAdjustmentPolicyModel } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/model';
+
+
+
+interface UseReportAdjustmentPolicyApiReturn {
+    reportAdjustmentPolicyAPI: {
+        update: (params: ReportAdjustmentPolicyUpdateParameters) => Promise<ReportAdjustmentPolicyModel>;
+        list: (params: ReportAdjustmentPolicyListParameters) => Promise<ListResponse<ReportAdjustmentPolicyModel>>;
+        create: (params: ReportAdjustmentPolicyCreateParameters) => Promise<ReportAdjustmentPolicyModel>;
+        delete: (params: ReportAdjustmentPolicyDeleteParameters) => Promise<ReportAdjustmentPolicyModel>;
+        changeOrder: (params: ReportAdjustmentPolicyChangeOrderParameters) => Promise<ReportAdjustmentPolicyModel>;
+        get: (params: ReportAdjustmentPolicyGetParameters) => Promise<ReportAdjustmentPolicyModel>;
+        syncCurrency: (params: ReportAdjustmentPolicySyncCurrencyParameters) => Promise<ReportAdjustmentPolicyModel>;
+    }
+}
+
+export const useReportAdjustmentPolicyApi = (): UseReportAdjustmentPolicyApiReturn => {
+    const actions = {
+        update: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.update<ReportAdjustmentPolicyUpdateParameters, ReportAdjustmentPolicyModel>,
+        list: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.list<ReportAdjustmentPolicyListParameters, ListResponse<ReportAdjustmentPolicyModel>>,
+        create: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.create<ReportAdjustmentPolicyCreateParameters, ReportAdjustmentPolicyModel>,
+        delete: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.delete<ReportAdjustmentPolicyDeleteParameters, ReportAdjustmentPolicyModel>,
+        changeOrder: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.changeOrder<ReportAdjustmentPolicyChangeOrderParameters, ReportAdjustmentPolicyModel>,
+        get: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.get<ReportAdjustmentPolicyGetParameters, ReportAdjustmentPolicyModel>,
+        syncCurrency: SpaceConnector.clientV2.costAnalysis.reportAdjustmentPolicy.syncCurrency<ReportAdjustmentPolicySyncCurrencyParameters, ReportAdjustmentPolicyModel>,
+    };
+
+    return {
+        reportAdjustmentPolicyAPI: actions,
+    };
+};

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/change-order.ts

@@ -0,0 +1,4 @@
+export interface ReportAdjustmentPolicyChangeOrderParameters {
+    report_adjustment_policy_id: string;
+    order: number;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/create.ts

@@ -0,0 +1,11 @@
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { ReportAdjustmentPolicyFilter } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/type';
+
+
+export interface ReportAdjustmentPolicyCreateParameters {
+    cost_report_config_id: string;
+    order?: number;
+    description?: string;
+    tags?: Tags;
+    policy_filter: ReportAdjustmentPolicyFilter;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/delete.ts

@@ -0,0 +1,3 @@
+export interface ReportAdjustmentPolicyDeleteParameters {
+    report_adjustment_policy_id: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/get.ts

@@ -0,0 +1,3 @@
+export interface ReportAdjustmentPolicyGetParameters {
+    report_adjustment_policy_id: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/list.ts

@@ -0,0 +1,6 @@
+import type { Query } from '@cloudforet/core-lib/space-connector/type';
+
+
+export interface ReportAdjustmentPolicyListParameters {
+    query?: Query;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/sync-currency.ts

@@ -0,0 +1,3 @@
+export interface ReportAdjustmentPolicySyncCurrencyParameters {
+    report_adjustment_policy_id: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/api-verbs/update.ts

@@ -0,0 +1,9 @@
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { ReportAdjustmentPolicyFilter } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/type';
+
+export interface ReportAdjustmentPolicyUpdateParameters {
+    report_adjustment_policy_id: string;
+    description?: string;
+    policy_filter?: ReportAdjustmentPolicyFilter;
+    tags?: Tags;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/model.ts

@@ -0,0 +1,18 @@
+import type { Tags } from '@/api-clients/_common/schema/model';
+import type { ReportAdjustmentPolicyFilter, ReportAdjustmentPolicyScope } from '@/api-clients/cost-analysis/report-adjustment-policy/schema/type';
+
+export interface ReportAdjustmentPolicyModel {
+    report_adjustment_policy_id: string;
+    description: string;
+    scope: ReportAdjustmentPolicyScope;
+    order: number;
+    adjustments: string[];
+    tags: Tags;
+    policy_filter: ReportAdjustmentPolicyFilter;
+    cost_report_config_id: string;
+    domain_id: string;
+    workspace_id: string;
+    project_id: string;
+    created_at: string;
+    updated_at: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment-policy/schema/type.ts

@@ -0,0 +1,6 @@
+export type ReportAdjustmentPolicyScope = 'WORKSPACE'|'PROJECT'|'SERVICE_ACCOUNT';
+
+export type ReportAdjustmentPolicyFilter = {
+    workspace_ids?: string[];
+    project_ids?: string[];
+};

apps/web/src/api-clients/cost-analysis/report-adjustment/composables/use-report-adjustment-api.ts

@@ -0,0 +1,36 @@
+import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
+
+import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
+import type { ReportAdjustmentChangeOrderParameters } from '@/api-clients/cost-analysis/report-adjustment/schema/api-verbs/change-order';
+import type { ReportAdjustmentCreateParameters } from '@/api-clients/cost-analysis/report-adjustment/schema/api-verbs/create';
+import type { ReportAdjustmentDeleteParameters } from '@/api-clients/cost-analysis/report-adjustment/schema/api-verbs/delete';
+import type { ReportAdjustmentGetParameters } from '@/api-clients/cost-analysis/report-adjustment/schema/api-verbs/get';
+import type { ReportAdjustmentListParameters } from '@/api-clients/cost-analysis/report-adjustment/schema/api-verbs/list';
+import type { ReportAdjustmentUpdateParameters } from '@/api-clients/cost-analysis/report-adjustment/schema/api-verbs/update';
+import type { ReportAdjustmentModel } from '@/api-clients/cost-analysis/report-adjustment/schema/model';
+
+interface UseReportAdjustmentApiReturn {
+    reportAdjustmentAPI: {
+        update: (params: ReportAdjustmentUpdateParameters) => Promise<ReportAdjustmentModel>;
+        list: (params: ReportAdjustmentListParameters) => Promise<ListResponse<ReportAdjustmentModel>>;
+        create: (params: ReportAdjustmentCreateParameters) => Promise<ReportAdjustmentModel>;
+        delete: (params: ReportAdjustmentDeleteParameters) => Promise<ReportAdjustmentModel>;
+        changeOrder: (params: ReportAdjustmentChangeOrderParameters) => Promise<ReportAdjustmentModel>;
+        get: (params: ReportAdjustmentGetParameters) => Promise<ReportAdjustmentModel>;
+    }
+}
+
+export const useReportAdjustmentApi = (): UseReportAdjustmentApiReturn => {
+    const actions = {
+        update: SpaceConnector.clientV2.costAnalysis.reportAdjustment.update<ReportAdjustmentUpdateParameters, ReportAdjustmentModel>,
+        list: SpaceConnector.clientV2.costAnalysis.reportAdjustment.list<ReportAdjustmentListParameters, ListResponse<ReportAdjustmentModel>>,
+        create: SpaceConnector.clientV2.costAnalysis.reportAdjustment.create<ReportAdjustmentCreateParameters, ReportAdjustmentModel>,
+        delete: SpaceConnector.clientV2.costAnalysis.reportAdjustment.delete<ReportAdjustmentDeleteParameters, ReportAdjustmentModel>,
+        changeOrder: SpaceConnector.clientV2.costAnalysis.reportAdjustment.changeOrder<ReportAdjustmentChangeOrderParameters, ReportAdjustmentModel>,
+        get: SpaceConnector.clientV2.costAnalysis.reportAdjustment.get<ReportAdjustmentGetParameters, ReportAdjustmentModel>,
+    };
+
+    return {
+        reportAdjustmentAPI: actions,
+    };
+};

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/api-verbs/change-order.ts

@@ -0,0 +1,4 @@
+export interface ReportAdjustmentChangeOrderParameters {
+    report_adjustment_id: string;
+    order: number;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/api-verbs/create.ts

@@ -0,0 +1,14 @@
+import type { ReportAdjustmentUnit } from '@/api-clients/cost-analysis/report-adjustment/schema/type';
+
+
+export interface ReportAdjustmentCreateParameters {
+    name: string;
+    unit: ReportAdjustmentUnit;
+    value: number;
+    report_adjustment_policy_id: string;
+    provider: string;
+    description?: string;
+    currency?: string;
+    order?: number;
+    adjustment_filter?: Record<string, string>;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/api-verbs/delete.ts

@@ -0,0 +1,3 @@
+export interface ReportAdjustmentDeleteParameters {
+    report_adjustment_id: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/api-verbs/get.ts

@@ -0,0 +1,3 @@
+export interface ReportAdjustmentGetParameters {
+    report_adjustment_id: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/api-verbs/list.ts

@@ -0,0 +1,10 @@
+import type { Query } from '@cloudforet/core-lib/space-connector/type';
+
+
+export interface ReportAdjustmentListParameters {
+    query?: Query;
+    provider?: string;
+    report_adjustment_id?: string;
+    report_adjustment_policy_id?: string;
+    cost_report_config_id?: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/api-verbs/update.ts

@@ -0,0 +1,12 @@
+import type { ReportAdjustmentUnit } from '@/api-clients/cost-analysis/report-adjustment/schema/type';
+
+
+export interface ReportAdjustmentUpdateParameters {
+    report_adjustment_id: string;
+    name?: string;
+    unit?: ReportAdjustmentUnit;
+    value?: number;
+    description?: string;
+    provider?: string;
+    adjustment_filter?: Record<string, string>;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/model.ts

@@ -0,0 +1,20 @@
+import type { ReportAdjustmentUnit } from '@/api-clients/cost-analysis/report-adjustment/schema/type';
+
+export interface ReportAdjustmentModel {
+    report_adjustment_id: string;
+    name: string;
+    unit: ReportAdjustmentUnit;
+    value: number;
+    description: string;
+    provider: string;
+    currency: string;
+    order: number;
+    adjustment_filter: Record<string, string>;
+    cost_report_config_id: string;
+    report_adjustment_policy_id: string;
+    domain_id: string;
+    workspace_id: string;
+    project_id: string;
+    created_at: string;
+    updated_at: string;
+}

apps/web/src/api-clients/cost-analysis/report-adjustment/schema/type.ts

@@ -0,0 +1 @@
+export type ReportAdjustmentUnit = 'FIXED' | 'PERCENT';