Skip to content

Commit

Permalink
hotfix: return type should be string instead of enum (#4831)
Browse files Browse the repository at this point in the history 
* hotfix: return type should be string instead of enum

* hotfix: return type should be string instead of enum

* hotfix: return type should be string instead of enum (invoiceStatus)

* hotfix: return type should be string instead of enum (submodules)
  • Loading branch information
@AleX83Xpert
AleX83Xpert authored Jun 14, 2024
1 parent a9ff596 commit 9704ad7
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 84 deletions.
2 changes: 2 additions & 0 deletions apps/condo/domains/acquiring/schema/AcquiringIntegrationContext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ const AcquiringIntegrationContext = new GQLListSchema('AcquiringIntegrationConte
create: access.canManageStatusField,
update: access.canManageStatusField,
},
graphQLReturnType: 'String',
},

invoiceStatus: {
Expand All @@ -187,6 +188,7 @@ const AcquiringIntegrationContext = new GQLListSchema('AcquiringIntegrationConte
create: access.canManageStatusField,
update: access.canManageStatusField,
},
graphQLReturnType: 'String',
},

invoiceTaxRegime: {
Expand Down
1 change: 1 addition & 0 deletions apps/condo/domains/billing/schema/BillingIntegrationOrganizationContext.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const BillingIntegrationOrganizationContext = new GQLListSchema('BillingIntegrat
hooks: {
resolveInput: getStatusResolver('BillingIntegration', 'integration'),
},
graphQLReturnType: 'String',
},

state: {
Expand Down
62 changes: 21 additions & 41 deletions apps/condo/schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10906,12 +10906,6 @@ input BillingIntegrationOrganizationContextHistoryRecordsCreateInput {
data: BillingIntegrationOrganizationContextHistoryRecordCreateInput
}

enum BillingIntegrationOrganizationContextStatusType {
InProgress
Error
Finished
}

input BillingIntegrationProblemRelateToOneInput {
create: BillingIntegrationProblemCreateInput
connect: BillingIntegrationProblemWhereUniqueInput
Expand Down Expand Up @@ -10945,7 +10939,7 @@ type BillingIntegrationOrganizationContext {

""" Status of BillingIntegration connection, Can be one of the following: ["InProgress", "Error", "Finished"]. If not specified explicitly on creation, uses default value from related BillingIntegration model
"""
status: BillingIntegrationOrganizationContextStatusType
status: String

""" The current state of the integration process. Some integration need to store past state or data related to cache files/folders for past state. The data structure depends on the integration and defined there
"""
Expand Down Expand Up @@ -10992,10 +10986,10 @@ input BillingIntegrationOrganizationContextWhereInput {
settings_not: JSON
settings_in: [JSON]
settings_not_in: [JSON]
status: BillingIntegrationOrganizationContextStatusType
status_not: BillingIntegrationOrganizationContextStatusType
status_in: [BillingIntegrationOrganizationContextStatusType]
status_not_in: [BillingIntegrationOrganizationContextStatusType]
status: String
status_not: String
status_in: [String]
status_not_in: [String]
state: JSON
state_not: JSON
state_in: [JSON]
Expand Down Expand Up @@ -11099,7 +11093,7 @@ input BillingIntegrationOrganizationContextUpdateInput {
integration: BillingIntegrationRelateToOneInput
organization: OrganizationRelateToOneInput
settings: JSON
status: BillingIntegrationOrganizationContextStatusType
status: String
state: JSON
lastReport: JSON
currentProblem: BillingIntegrationProblemRelateToOneInput
Expand All @@ -11123,7 +11117,7 @@ input BillingIntegrationOrganizationContextCreateInput {
integration: BillingIntegrationRelateToOneInput
organization: OrganizationRelateToOneInput
settings: JSON
status: BillingIntegrationOrganizationContextStatusType
status: String
state: JSON
lastReport: JSON
currentProblem: BillingIntegrationProblemRelateToOneInput
Expand Down Expand Up @@ -53199,20 +53193,6 @@ input RecipientFieldInput {
classificationCode: String
}

enum AcquiringIntegrationContextStatusType {
InProgress
Verification
Error
Finished
}

enum AcquiringIntegrationContextInvoiceStatusType {
InProgress
Verification
Error
Finished
}

enum AcquiringIntegrationContextInvoiceTaxRegimeType {
general
simple
Expand Down Expand Up @@ -53274,11 +53254,11 @@ type AcquiringIntegrationContext {

""" Status of AcquiringIntegration connection, Can be one of the following: ["InProgress", "Error", "Finished"]. If not specified explicitly on creation, uses default value from related AcquiringIntegration model
"""
status: AcquiringIntegrationContextStatusType
status: String

""" Status of AcquiringIntegration connection, Can be one of the following: ["InProgress", "Error", "Finished"]. If not specified explicitly on creation, uses default value from related AcquiringIntegration model
"""
invoiceStatus: AcquiringIntegrationContextInvoiceStatusType
invoiceStatus: String

""" The regime of counting taxes for company """
invoiceTaxRegime: AcquiringIntegrationContextInvoiceTaxRegimeType
Expand Down Expand Up @@ -53415,14 +53395,14 @@ input AcquiringIntegrationContextWhereInput {
invoiceImplicitFeeDistributionSchema_not: [FeeDistributionFieldInput!]
invoiceImplicitFeeDistributionSchema_in: [[FeeDistributionFieldInput!]]
invoiceImplicitFeeDistributionSchema_not_in: [[FeeDistributionFieldInput!]]
status: AcquiringIntegrationContextStatusType
status_not: AcquiringIntegrationContextStatusType
status_in: [AcquiringIntegrationContextStatusType]
status_not_in: [AcquiringIntegrationContextStatusType]
invoiceStatus: AcquiringIntegrationContextInvoiceStatusType
invoiceStatus_not: AcquiringIntegrationContextInvoiceStatusType
invoiceStatus_in: [AcquiringIntegrationContextInvoiceStatusType]
invoiceStatus_not_in: [AcquiringIntegrationContextInvoiceStatusType]
status: String
status_not: String
status_in: [String]
status_not_in: [String]
invoiceStatus: String
invoiceStatus_not: String
invoiceStatus_in: [String]
invoiceStatus_not_in: [String]
invoiceTaxRegime: AcquiringIntegrationContextInvoiceTaxRegimeType
invoiceTaxRegime_not: AcquiringIntegrationContextInvoiceTaxRegimeType
invoiceTaxRegime_in: [AcquiringIntegrationContextInvoiceTaxRegimeType]
Expand Down Expand Up @@ -53559,8 +53539,8 @@ input AcquiringIntegrationContextUpdateInput {
invoiceRecipient: RecipientFieldInput
implicitFeeDistributionSchema: [FeeDistributionFieldInput!]
invoiceImplicitFeeDistributionSchema: [FeeDistributionFieldInput!]
status: AcquiringIntegrationContextStatusType
invoiceStatus: AcquiringIntegrationContextInvoiceStatusType
status: String
invoiceStatus: String
invoiceTaxRegime: AcquiringIntegrationContextInvoiceTaxRegimeType
invoiceVatPercent: String
invoiceSalesTaxPercent: String
Expand Down Expand Up @@ -53593,8 +53573,8 @@ input AcquiringIntegrationContextCreateInput {
invoiceRecipient: RecipientFieldInput
implicitFeeDistributionSchema: [FeeDistributionFieldInput!]
invoiceImplicitFeeDistributionSchema: [FeeDistributionFieldInput!]
status: AcquiringIntegrationContextStatusType
invoiceStatus: AcquiringIntegrationContextInvoiceStatusType
status: String
invoiceStatus: String
invoiceTaxRegime: AcquiringIntegrationContextInvoiceTaxRegimeType
invoiceVatPercent: String
invoiceSalesTaxPercent: String
Expand Down
62 changes: 21 additions & 41 deletions apps/condo/schema.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,9 @@ export type AcquiringIntegrationContext = {
/** Contains information about the default distribution of implicit fee. Each part is paid by the recipient organization on deducted from payment amount. If part exists then explicit part with the same name from AcquiringIntegration.explicitFeeDistributionSchema is ignored */
invoiceImplicitFeeDistributionSchema?: Maybe<Array<FeeDistributionField>>;
/** Status of AcquiringIntegration connection, Can be one of the following: ["InProgress", "Error", "Finished"]. If not specified explicitly on creation, uses default value from related AcquiringIntegration model */
status?: Maybe<AcquiringIntegrationContextStatusType>;
status?: Maybe<Scalars['String']>;
/** Status of AcquiringIntegration connection, Can be one of the following: ["InProgress", "Error", "Finished"]. If not specified explicitly on creation, uses default value from related AcquiringIntegration model */
invoiceStatus?: Maybe<AcquiringIntegrationContextInvoiceStatusType>;
invoiceStatus?: Maybe<Scalars['String']>;
/** The regime of counting taxes for company */
invoiceTaxRegime?: Maybe<AcquiringIntegrationContextInvoiceTaxRegimeType>;
/** The percentage of VAT. Depends of integrations settings (see AcquiringIntegration.vatPercentOptions) */
Expand Down Expand Up @@ -480,8 +480,8 @@ export type AcquiringIntegrationContextCreateInput = {
invoiceRecipient?: Maybe<RecipientFieldInput>;
implicitFeeDistributionSchema?: Maybe<Array<FeeDistributionFieldInput>>;
invoiceImplicitFeeDistributionSchema?: Maybe<Array<FeeDistributionFieldInput>>;
status?: Maybe<AcquiringIntegrationContextStatusType>;
invoiceStatus?: Maybe<AcquiringIntegrationContextInvoiceStatusType>;
status?: Maybe<Scalars['String']>;
invoiceStatus?: Maybe<Scalars['String']>;
invoiceTaxRegime?: Maybe<AcquiringIntegrationContextInvoiceTaxRegimeType>;
invoiceVatPercent?: Maybe<Scalars['String']>;
invoiceSalesTaxPercent?: Maybe<Scalars['String']>;
Expand Down Expand Up @@ -884,13 +884,6 @@ export type AcquiringIntegrationContextHistoryRecordsUpdateInput = {
data?: Maybe<AcquiringIntegrationContextHistoryRecordUpdateInput>;
};

export enum AcquiringIntegrationContextInvoiceStatusType {
InProgress = 'InProgress',
Verification = 'Verification',
Error = 'Error',
Finished = 'Finished'
}

export enum AcquiringIntegrationContextInvoiceTaxRegimeType {
General = 'general',
Simple = 'simple'
Expand All @@ -903,13 +896,6 @@ export type AcquiringIntegrationContextRelateToOneInput = {
disconnectAll?: Maybe<Scalars['Boolean']>;
};

export enum AcquiringIntegrationContextStatusType {
InProgress = 'InProgress',
Verification = 'Verification',
Error = 'Error',
Finished = 'Finished'
}

export type AcquiringIntegrationContextUpdateInput = {
integration?: Maybe<AcquiringIntegrationRelateToOneInput>;
organization?: Maybe<OrganizationRelateToOneInput>;
Expand All @@ -923,8 +909,8 @@ export type AcquiringIntegrationContextUpdateInput = {
invoiceRecipient?: Maybe<RecipientFieldInput>;
implicitFeeDistributionSchema?: Maybe<Array<FeeDistributionFieldInput>>;
invoiceImplicitFeeDistributionSchema?: Maybe<Array<FeeDistributionFieldInput>>;
status?: Maybe<AcquiringIntegrationContextStatusType>;
invoiceStatus?: Maybe<AcquiringIntegrationContextInvoiceStatusType>;
status?: Maybe<Scalars['String']>;
invoiceStatus?: Maybe<Scalars['String']>;
invoiceTaxRegime?: Maybe<AcquiringIntegrationContextInvoiceTaxRegimeType>;
invoiceVatPercent?: Maybe<Scalars['String']>;
invoiceSalesTaxPercent?: Maybe<Scalars['String']>;
Expand Down Expand Up @@ -1042,14 +1028,14 @@ export type AcquiringIntegrationContextWhereInput = {
invoiceImplicitFeeDistributionSchema_not?: Maybe<Array<FeeDistributionFieldInput>>;
invoiceImplicitFeeDistributionSchema_in?: Maybe<Array<Maybe<Array<FeeDistributionFieldInput>>>>;
invoiceImplicitFeeDistributionSchema_not_in?: Maybe<Array<Maybe<Array<FeeDistributionFieldInput>>>>;
status?: Maybe<AcquiringIntegrationContextStatusType>;
status_not?: Maybe<AcquiringIntegrationContextStatusType>;
status_in?: Maybe<Array<Maybe<AcquiringIntegrationContextStatusType>>>;
status_not_in?: Maybe<Array<Maybe<AcquiringIntegrationContextStatusType>>>;
invoiceStatus?: Maybe<AcquiringIntegrationContextInvoiceStatusType>;
invoiceStatus_not?: Maybe<AcquiringIntegrationContextInvoiceStatusType>;
invoiceStatus_in?: Maybe<Array<Maybe<AcquiringIntegrationContextInvoiceStatusType>>>;
invoiceStatus_not_in?: Maybe<Array<Maybe<AcquiringIntegrationContextInvoiceStatusType>>>;
status?: Maybe<Scalars['String']>;
status_not?: Maybe<Scalars['String']>;
status_in?: Maybe<Array<Maybe<Scalars['String']>>>;
status_not_in?: Maybe<Array<Maybe<Scalars['String']>>>;
invoiceStatus?: Maybe<Scalars['String']>;
invoiceStatus_not?: Maybe<Scalars['String']>;
invoiceStatus_in?: Maybe<Array<Maybe<Scalars['String']>>>;
invoiceStatus_not_in?: Maybe<Array<Maybe<Scalars['String']>>>;
invoiceTaxRegime?: Maybe<AcquiringIntegrationContextInvoiceTaxRegimeType>;
invoiceTaxRegime_not?: Maybe<AcquiringIntegrationContextInvoiceTaxRegimeType>;
invoiceTaxRegime_in?: Maybe<Array<Maybe<AcquiringIntegrationContextInvoiceTaxRegimeType>>>;
Expand Down Expand Up @@ -15935,7 +15921,7 @@ export type BillingIntegrationOrganizationContext = {
/** Settings that are required to get data from the `billing data source`. It can also contain fine-tuning optional integration settings. The data structure depends on the integration and defined there */
settings?: Maybe<Scalars['JSON']>;
/** Status of BillingIntegration connection, Can be one of the following: ["InProgress", "Error", "Finished"]. If not specified explicitly on creation, uses default value from related BillingIntegration model */
status?: Maybe<BillingIntegrationOrganizationContextStatusType>;
status?: Maybe<Scalars['String']>;
/** The current state of the integration process. Some integration need to store past state or data related to cache files/folders for past state. The data structure depends on the integration and defined there */
state?: Maybe<Scalars['JSON']>;
/** Information about last report, such as time of report, period of report, amount of loaded data and etc */
Expand All @@ -15962,7 +15948,7 @@ export type BillingIntegrationOrganizationContextCreateInput = {
integration?: Maybe<BillingIntegrationRelateToOneInput>;
organization?: Maybe<OrganizationRelateToOneInput>;
settings?: Maybe<Scalars['JSON']>;
status?: Maybe<BillingIntegrationOrganizationContextStatusType>;
status?: Maybe<Scalars['String']>;
state?: Maybe<Scalars['JSON']>;
lastReport?: Maybe<Scalars['JSON']>;
currentProblem?: Maybe<BillingIntegrationProblemRelateToOneInput>;
Expand Down Expand Up @@ -16203,17 +16189,11 @@ export type BillingIntegrationOrganizationContextRelateToOneInput = {
disconnectAll?: Maybe<Scalars['Boolean']>;
};

export enum BillingIntegrationOrganizationContextStatusType {
InProgress = 'InProgress',
Error = 'Error',
Finished = 'Finished'
}

export type BillingIntegrationOrganizationContextUpdateInput = {
integration?: Maybe<BillingIntegrationRelateToOneInput>;
organization?: Maybe<OrganizationRelateToOneInput>;
settings?: Maybe<Scalars['JSON']>;
status?: Maybe<BillingIntegrationOrganizationContextStatusType>;
status?: Maybe<Scalars['String']>;
state?: Maybe<Scalars['JSON']>;
lastReport?: Maybe<Scalars['JSON']>;
currentProblem?: Maybe<BillingIntegrationProblemRelateToOneInput>;
Expand All @@ -16239,10 +16219,10 @@ export type BillingIntegrationOrganizationContextWhereInput = {
settings_not?: Maybe<Scalars['JSON']>;
settings_in?: Maybe<Array<Maybe<Scalars['JSON']>>>;
settings_not_in?: Maybe<Array<Maybe<Scalars['JSON']>>>;
status?: Maybe<BillingIntegrationOrganizationContextStatusType>;
status_not?: Maybe<BillingIntegrationOrganizationContextStatusType>;
status_in?: Maybe<Array<Maybe<BillingIntegrationOrganizationContextStatusType>>>;
status_not_in?: Maybe<Array<Maybe<BillingIntegrationOrganizationContextStatusType>>>;
status?: Maybe<Scalars['String']>;
status_not?: Maybe<Scalars['String']>;
status_in?: Maybe<Array<Maybe<Scalars['String']>>>;
status_not_in?: Maybe<Array<Maybe<Scalars['String']>>>;
state?: Maybe<Scalars['JSON']>;
state_not?: Maybe<Scalars['JSON']>;
state_in?: Maybe<Array<Maybe<Scalars['JSON']>>>;
Expand Down
2 changes: 1 addition & 1 deletion apps/condorb
Submodule condorb updated from cb034f to 249de9
2 changes: 1 addition & 1 deletion apps/registry
Submodule registry updated from d420e6 to 2d90b9

0 comments on commit 9704ad7

Please sign in to comment.