fix(multiple): Delete Collections; delete Entity suffixes; use Custom…

…Field interface

packages/shopware-6-client/src/interfaces/models/system/country/Country.ts

@@ -1,8 +1,9 @@
-import { SalesChannelCollection } from "../sales-channel/SalesChannelCollection";
-import { CountryStateCollection } from "./CountryStateCollection";
-import { OrderAddressCollection } from "../../checkout/order/OrderAddressCollection";
-import { CountryTranslationCollection } from "./CountryTranslationCollection";
-import { CustomerAddressCollection } from "../../checkout/customer/CustomerAddressCollection";
+import { CountryState } from "./CountryState";
+import { CountryTranslation } from "./CountryTranslation";
+import { OrderAddress } from "../../checkout/order/OrderAddress";
+import { CustomerAddress } from "../../checkout/customer/CustomerAddress";
+import { SalesChannel } from "../sales-channel/SalesChannel";
+
 export interface Country {
   name: string | null;
   iso: string | null;
@@ -13,10 +14,10 @@ export interface Country {
   iso3: string | null;
   displayStateInRegistration: boolean;
   forceStateInRegistration: boolean;
-  states: CountryStateCollection | null;
-  translations: CountryTranslationCollection | null;
-  orderAddresses: OrderAddressCollection | null;
-  customerAddress: CustomerAddressCollection | null;
-  salesChannelDefaultAssignments: SalesChannelCollection | null;
-  salesChannels: SalesChannelCollection | null;
+  states: CountryState[] | null;
+  translations: CountryTranslation[] | null;
+  orderAddresses: OrderAddress[] | null;
+  customerAddress: CustomerAddress[] | null;
+  salesChannelDefaultAssignments: SalesChannel[] | null;
+  salesChannels: SalesChannel[] | null;
 }

packages/shopware-6-client/src/interfaces/models/system/country/CountryState.ts

@@ -1,17 +1,18 @@
-import { iCustomField } from "../../Common";
 import { Country } from "./Country";
+import { CountryStateTranslation } from "./CountryStateTranslation";
+import { CustomerAddress } from "../../checkout/customer/CustomerAddress";
 import { OrderAddress } from "../../checkout/order/OrderAddress";
-import { CustomerAddressCollection } from "../../checkout/customer/CustomerAddressCollection";
-import { CountryStateTranslationCollection } from "./CountryStateTranslationCollection";
+import { CustomField } from "../../common/CustomField";
+
 export interface CountryState {
   countryId: string;
   shortCode: string;
   name: string | null;
   position: number;
   active: boolean;
   country: Country | null;
-  translations: CountryStateTranslationCollection | null;
-  customerAddresses: CustomerAddressCollection | null;
-  orderAddressCollection: OrderAddress | null;
-  customFields: iCustomField;
+  translations: CountryStateTranslation[] | null;
+  customerAddresses: CustomerAddress[] | null;
+  orderAddresses: OrderAddress[] | null;
+  customFields: CustomField[];
 }

packages/shopware-6-client/src/interfaces/models/system/country/CountryStateTranslation.ts

@@ -1,8 +1,8 @@
-import { iCustomField } from "../../Common";
 import { CountryState } from "./CountryState";
+import { CustomField } from "../../common/CustomField";
 export interface CountryStateTranslation {
   countryStateId: string;
   name: string | null;
   countryState: CountryState | null;
-  customFields: iCustomField;
+  customFields: CustomField[];
 }

packages/shopware-6-client/src/interfaces/models/system/country/CountryTranslation.ts

@@ -1,8 +1,8 @@
-import { iCustomField } from "../../Common";
 import { Country } from "./Country";
+import { CustomField } from "../../common/CustomField";
 export interface CountryTranslation {
   countryId: string;
   name: string | null;
   country: Country | null;
-  customFields: iCustomField | null;
+  customFields: CustomField[];
 }

packages/shopware-6-client/src/interfaces/models/system/currency/Currency.ts

@@ -1,9 +1,10 @@
-import { CurrencyTranslationCollection } from "./CurrencyTranslationCollection";
-import { OrderCollection } from "../../checkout/order/OrderCollection";
-import { SalesChannelCollection } from "../sales-channel/SalesChannelCollection";
-import { SalesChannelDomainCollection } from "../sales-channel/SalesChannelDomainCollection";
-import { ShippingMethodPriceCollection } from "../../checkout/shipping/ShippingMethodPriceCollection";
-import { PromotionDiscountPriceCollection } from "../../checkout/promotion/PromotionDiscountPriceCollection";
+import { CurrencyTranslation } from "./CurrencyTranslation";
+import { Order } from "../../checkout/order/Order";
+import { ShippingMethodPrice } from "../../checkout/shipping/ShippingMethodPrice";
+import { PromotionDiscountPrice } from "../../checkout/promotion/PromotionDiscountPrice";
+import { SalesChannel } from "../sales-channel/SalesChannel";
+import { SalesChannelDomain } from "../sales-channel/SalesChannelDomain";
+import { CustomField } from "../../common/CustomField";
 
 export interface Currency {
   isoCode: string;
@@ -13,13 +14,13 @@ export interface Currency {
   name: string | null;
   position: number;
   decimalPrecision: number;
-  translations: CurrencyTranslationCollection | null;
-  orders: OrderCollection | null;
-  salesChannels: SalesChannelCollection | null;
-  salesChannelDefaultAssignments: SalesChannelCollection | null;
-  salesChannelDomains: SalesChannelDomainCollection | null;
-  customFields: [] | null;
-  shippingMethodPrices: ShippingMethodPriceCollection | null;
-  promotionDiscountPrices: PromotionDiscountPriceCollection;
+  translations: CurrencyTranslation[] | null;
+  orders: Order[] | null;
+  salesChannels: SalesChannel[] | null;
+  salesChannelDefaultAssignments: SalesChannel[] | null;
+  salesChannelDomains: SalesChannelDomain[] | null;
+  customFields: CustomField[];
+  shippingMethodPrices: ShippingMethodPrice[] | null;
+  promotionDiscountPrices: PromotionDiscountPrice[];
   isSystemDefault: boolean | null;
 }

packages/shopware-6-client/src/interfaces/models/system/currency/CurrencyTranslation.ts

@@ -1,8 +1,9 @@
 import { Currency } from "./Currency";
+import { CustomField } from "../../common/CustomField";
 export interface CurrencyTranslation {
   currencyId: string;
   shortName: string | null;
   name: string | null;
   currency: Currency | null;
-  customFields: [] | null;
+  customFields: CustomField[];
 }

packages/shopware-6-client/src/interfaces/models/system/locale/Locale.ts

@@ -1,12 +1,14 @@
-import { LocaleTranslationCollection } from "./LocaleTranslationCollection";
-import { LanguageCollection } from "../../framework/language/LanguageCollection";
-import { UserCollection } from "../user/UserCollection";
+import { LocaleTranslation } from "./LocaleTranslation";
+import { User } from "../user/User";
+import { Language } from "../../framework/language/Language";
+import { CustomField } from "../../common/CustomField";
+
 export interface Locale {
   code: string;
   name: string | null;
   territory: string | null;
-  translations: LocaleTranslationCollection | null;
-  users: UserCollection | null;
-  languages: LanguageCollection | null;
-  customFields: [] | null;
+  translations: LocaleTranslation[] | null;
+  users: User[] | null;
+  languages: Language[] | null;
+  customFields: CustomField | null;
 }

packages/shopware-6-client/src/interfaces/models/system/locale/LocaleTranslation.ts

@@ -1,8 +1,9 @@
 import { Locale } from "./Locale";
+import { CustomField } from "../../common/CustomField";
 export interface LocaleTranslation {
   localeId: string;
   name: string | null;
   territory: string | null;
   locale: Locale | null;
-  customFields: [] | null;
+  customFields: CustomField | null;
 }

packages/shopware-6-client/src/interfaces/models/system/number-range/NumberRange.ts

@@ -1,8 +1,9 @@
-import { iCustomField } from "../../Common";
-import { NumberRangeTranslationCollection } from "./NumberRangeTranslationCollection";
-import { NumberRangeSalesChannelCollection } from "./NumberRangeSalesChannelCollection";
-import { NumberRangeState } from "./NumberRangeState";
+import { CustomField } from "../../common/CustomField";
 import { NumberRangeType } from "./NumberRangeType";
+import { NumberRangeSalesChannel } from "./NumberRangeSalesChannel";
+import { NumberRangeState } from "./NumberRangeState";
+import { NumberRangeTranslation } from "./NumberRangeTranslation";
+
 export interface NumberRange {
   typeId: string | null;
   global: boolean;
@@ -11,8 +12,8 @@ export interface NumberRange {
   pattern: string | null;
   start: number | null;
   type: NumberRangeType | null;
-  numberRangeSalesChannels: NumberRangeSalesChannelCollection | null;
+  numberRangeSalesChannels: NumberRangeSalesChannel[] | null;
   state: NumberRangeState | null;
-  customFields: iCustomField | null;
-  translations: NumberRangeTranslationCollection | null;
+  customFields: CustomField[];
+  translations: NumberRangeTranslation[] | null;
 }

packages/shopware-6-client/src/interfaces/models/system/number-range/NumberRangeSalesChannel.ts

@@ -1,10 +1,10 @@
-import { SalesChannelEntity } from "../sales-channel/SalesChannelEntity";
+import { SalesChannel } from "../sales-channel/SalesChannel";
 import { NumberRange } from "./NumberRange";
 import { NumberRangeType } from "./NumberRangeType";
 export interface NumberRangeSalesChannel {
   numberRangeId: string;
   salesChannelId: string;
   numberRange: NumberRange | null;
-  salesChannel: SalesChannelEntity | null;
+  salesChannel: SalesChannel | null;
   numberRangeType: NumberRangeType | null;
 }

packages/shopware-6-client/src/interfaces/models/system/number-range/NumberRangeTranslation.ts

@@ -1,9 +1,9 @@
-import { iCustomField } from "../../Common";
 import { NumberRange } from "./NumberRange";
+import { CustomField } from "../../common/CustomField";
 export interface NumberRangeTranslation {
   numberRangeId: string;
   name: string | null;
   description: string | null;
   numberRange: NumberRange | null;
-  customFields: iCustomField | null;
+  customFields: CustomField[];
 }

packages/shopware-6-client/src/interfaces/models/system/number-range/NumberRangeType.ts

@@ -1,13 +1,14 @@
-import { iCustomField } from "../../Common";
-import { NumberRangeCollection } from "./NumberRangeCollection";
+import { NumberRange } from "./NumberRange";
 import { NumberRangeSalesChannel } from "./NumberRangeSalesChannel";
-import { NumberRangeTypeTranslationCollection } from "./NumberRangeTypeTranslationCollection";
+import { CustomField } from "../../common/CustomField";
+import { NumberRangeTypeTranslation } from "./NumberRangeTypeTranslation";
+
 export interface NumberRangeType {
   typeName: string;
   technicalName: string;
   global: boolean;
-  numberRanges: NumberRangeCollection | null;
+  numberRanges: NumberRange[] | null;
   numberRangeSalesChannels: NumberRangeSalesChannel | null;
-  customFields: iCustomField | null;
-  translations: NumberRangeTypeTranslationCollection | null;
+  customFields: CustomField[];
+  translations: NumberRangeTypeTranslation[] | null;
 }

packages/shopware-6-client/src/interfaces/models/system/number-range/NumberRangeTypeTranslation.ts

@@ -1,8 +1,8 @@
-import { iCustomField } from "../../Common";
 import { NumberRangeType } from "./NumberRangeType";
-interface NumberRangeTypeTranslation {
+import { CustomField } from "../../common/CustomField";
+export interface NumberRangeTypeTranslation {
   numberRangeTypeId: string;
   typeName: string | null;
   numberRangeType: NumberRangeType | null;
-  customFields: iCustomField | null;
+  customFields: CustomField[];
 }

packages/shopware-6-client/src/interfaces/models/system/sales-channel/SalesChannel.ts

@@ -0,0 +1,72 @@
+import { CurrencyTranslation } from "../currency/CurrencyTranslation";
+import { Language } from "../../framework/language/Language";
+import { SalesChannelType } from "./SalesChannelType";
+import { Currency } from "../currency/Currency";
+import { PaymentMethod } from "../../checkout/payment/PaymentMethod";
+import { ShippingMethodPrice } from "../../checkout/shipping/ShippingMethodPrice";
+import { Country } from "../country/Country";
+import { Order } from "../../checkout/order/Order";
+import { Customer } from "../../checkout/customer/Customer";
+import { Category } from "packages/shopware-6-client/src";
+import { ProductVisibility } from "../../content/product/ProductVisibility";
+import { MailTemplateSalesChannel } from "../../content/mail-template/MailTemplateSalesChannel";
+import { NumberRangeSalesChannel } from "../number-range/NumberRangeSalesChannel";
+import { MailHeaderFooter } from "../../content/mail-template/MailHeaderFooter";
+import { CustomerGroup } from "../../checkout/customer/CustomerGroup";
+import { NewsletterRecipient } from "../../content/newsletter/NewsletterRecipient";
+import { PromotionSalesChannel } from "../../checkout/promotion/PromotionSalesChannel";
+import { DocumentBaseConfigDefinition } from "../../checkout/document/DocumentBaseConfigDefinition";
+import { ShippingMethod } from "../../checkout/shipping/ShippingMethod";
+import { SalesChannelTranslation } from "./SalesChannelTranslation";
+import { SalesChannelDomain } from "./SalesChannelDomain";
+import { SystemConfig } from "../system-config/SystemConfig";
+import { ProductReview } from "../../content/product/ProductReview";
+import { CustomField } from "../../common/CustomField";
+
+export interface SalesChannel {
+  typeId: string;
+  languageId: string;
+  currencyId: string;
+  paymentMethodId: string;
+  shippingMethodId: string;
+  countryId: string;
+  navigationCategoryId: string;
+  footerCategoryId: string | null;
+  serviceCategoryId: string | null;
+  name: string | null;
+  shortName: string | null;
+  accessKey: string;
+  currencies: CurrencyTranslation[] | null;
+  languages: Language[] | null;
+  configuration: [] | null;
+  active: boolean;
+  type: SalesChannelType | null;
+  currency: Currency | null;
+  language: Language | null;
+  paymentMethod: PaymentMethod | null;
+  shippingMethod: ShippingMethodPrice | null;
+  country: Country | null;
+  orders: Order[] | null;
+  customers: Customer[] | null;
+  countries: Country[] | null;
+  paymentMethods: PaymentMethod[] | null;
+  shippingMethods: ShippingMethod[] | null;
+  translations: SalesChannelTranslation[] | null;
+  domains: SalesChannelDomain[] | null;
+  systemConfigs: SystemConfig[] | null;
+  customFields: CustomField[];
+  naigationCategory: Category | null;
+  footerCategory: Category | null;
+  serviceCategory: Category | null;
+  productVisibilities: ProductVisibility[] | null;
+  mailTemplates: MailTemplateSalesChannel[] | null;
+  mailHeaderFooterId: string | null;
+  numberRangeSalesChannels: NumberRangeSalesChannel[] | null;
+  mailHeaderFooter: MailHeaderFooter | null;
+  customerGroupId: string | null;
+  customerGroup: CustomerGroup | null;
+  newsletterRecipients: NewsletterRecipient[] | null;
+  promotionSalesChannels: PromotionSalesChannel[] | null;
+  documentBaseConfigSalesChannels: DocumentBaseConfigDefinition | null;
+  productReviews: ProductReview[] | null;
+}

packages/shopware-6-client/src/interfaces/models/system/sales-channel/SalesChannelDomain.ts

@@ -0,0 +1,17 @@
+import { Language } from "../../framework/language/Language";
+import { SalesChannel } from "./SalesChannel";
+import { SnippetSet } from "../../framework/snippet/SnippetSet";
+import { Currency } from "../currency/Currency";
+import { CustomField } from "../../common/CustomField";
+export interface SalesChannelDomain {
+  url: string;
+  currencyId: string | null;
+  currency: Currency | null;
+  snippetSetId: string | null;
+  snippetSet: SnippetSet | null;
+  salesChannelId: string;
+  salesChannel: SalesChannel | null;
+  languageId: string;
+  language: Language | null;
+  customFields: CustomField[];
+}