Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/gh 12987 handle new cart entry api format #13066

Merged
merged 15 commits into from
Jul 15, 2021
Merged

Feature/gh 12987 handle new cart entry api format #13066

merged 15 commits into from
Jul 15, 2021

Conversation

Stofftiger
Copy link
Contributor

@Stofftiger Stofftiger commented Jul 12, 2021 •
edited by ChristophHi
Loading

Enable handling of the enhanced content for the ConfigurationInfo structure of the OrderEntry.
Closes #12987

@CLAassistant
Copy link

CLAassistant commented Jul 12, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@cypress
Copy link

cypress bot commented Jul 12, 2021 •
edited
Loading


Test summary

2 • 0 • 0 • 0 • Flakiness 0

Run details
Project spartacus
Status Passed
Commit b6bb18b ℹ️
Started Jul 15, 2021 7:25 AM
Ended Jul 15, 2021 7:26 AM
Duration 01:06 💡
OS Linux Ubuntu - 18.04
Browser Electron 89

View run in Cypress Dashboard ➡️

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

ChristophHi
ChristophHi requested changes Jul 12, 2021
View reviewed changes
...ents/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.spec.ts Outdated Show resolved Hide resolved
...ents/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.spec.ts Outdated Show resolved Hide resolved
...ents/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.spec.ts Outdated
@@ -124,4 +233,240 @@ describe('ConfiguratorCartEntryBundleInfoService', () => {
expect(lineItems[2]).toEqual(expectedLineItem3);
expect(lineItems[3]).toEqual(expectedLineItem4);
});

describe('for enhanced OCC API format: ', () => {
it('should retrieve an existing lineitem for requested lineitemNumber from lineitemMap', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'line item' instead of 'lineitem'. Also in other test descriptions

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

...ents/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.spec.ts Outdated Show resolved Hide resolved
...omponents/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts Outdated Show resolved Hide resolved
feature-libs/product-configurator/common/core/model/common-configurator.model.ts Outdated Show resolved Hide resolved
feature-libs/product-configurator/common/core/model/common-configurator.model.ts Outdated Show resolved Hide resolved
...omponents/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts Outdated Show resolved Hide resolved
AlexanderKuschner and others added 7 commits July 12, 2021 16:05
@AlexanderKuschner @ChristophHi
Update feature-libs/product-configurator/common/components/configurat…
c629640 
…or-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.spec.ts

Co-authored-by: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
@AlexanderKuschner @ChristophHi
Update feature-libs/product-configurator/common/components/configurat…
921324d 
…or-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.spec.ts

Co-authored-by: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
@AlexanderKuschner @ChristophHi
Update feature-libs/product-configurator/common/components/configurat…
6f96c31 
…or-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts

Co-authored-by: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
@AlexanderKuschner @ChristophHi
Update feature-libs/product-configurator/common/core/model/common-con…
05ffa0b 
…figurator.model.ts

Co-authored-by: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
@AlexanderKuschner @ChristophHi
Update feature-libs/product-configurator/common/core/model/common-con…
eef8fd4 
…figurator.model.ts

Co-authored-by: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
@AlexanderKuschner
GH-12987 adjust configuration info format
cd9662c
@AlexanderKuschner
Merge remote-tracking branch 'origin/develop' into feature/GH-12987_H…
211b5a7 
…andle_new_cart_entry_API_format
@AlexanderKuschner AlexanderKuschner linked an issue Jul 14, 2021 that may be closed by this pull request
Make configurator-cart-entry-bundle-info.service.ts handle new API format in addition #12987
Closed
@github-actions
Copy link
Contributor

Public API changes

⚠️ @spartacus/product-configurator/common

 }
 
 // @public
+export enum ConfigurationInfoFields {
+    // (undocumented)
+    FORMATTED_PRICE = "FORMATTED_PRICE",
+    // (undocumented)
+    KEY = "KEY",
+    // (undocumented)
+    NAME = "NAME",
+    // (undocumented)
+    PRICE_VALUE = "PRICE_VALUE",
+    // (undocumented)
+    QTY = "QTY"
+}
+
+// @public
+export enum ConfigurationInfoSpecialFields {
+    // (undocumented)
+    CURRENCY = "CI#@#CURRENCY",
+    // (undocumented)
+    LINE_ITEM = "LI",
+    // (undocumented)
+    LINE_ITEM_DELIMITER = "#",
+    // (undocumented)
+    VERSION = "CI#@#VERSION"
+}
+
+// @public
 export class ConfiguratorCartEntryBundleInfoComponent {
     constructor(commonConfigUtilsService: CommonConfiguratorUtilsService, configCartEntryBundleInfoService: ConfiguratorCartEntryBundleInfoService, breakpointService: BreakpointService, cartItemContext?: CartItemContext | undefined);
     // (undocumented)
@@
 // @public
 export class ConfiguratorCartEntryBundleInfoService {
     // (undocumented)
+    protected addLineItemData(lineItemMap: Map<number, LineItem>, configurationInfoSplit: string[], configurationInfoValue: string): void;
+    // (undocumented)
+    protected getOrCreateLineItem(lineItemMap: Map<number, LineItem>, lineItemNumber: number): LineItem;
+    // (undocumented)
+    protected logWarning(text: string): void;
+    // (undocumented)
     protected prepareLineItem(configurationInfo: ConfigurationInfo): LineItem;
     // (undocumented)
+    protected processConfigurationInfoEntry(lineItemMap: Map<number, LineItem>, configurationInfo: ConfigurationInfo): void;
+    // (undocumented)
+    protected processConfigurationInfos(configurationInfos: ConfigurationInfo[]): LineItem[];
+    // (undocumented)
     protected removeDelimiter(label: string): string;
     retrieveLineItems(entry: OrderEntry): LineItem[];
     // (undocumented)

⚠️ Some entry points are currently impossible to analyze.

Read more

💰 How to debug problems?

Read more

@AlexanderKuschner AlexanderKuschner merged commit 6c2f6e8 into develop Jul 15, 2021
@AlexanderKuschner AlexanderKuschner deleted the feature/GH-12987_Handle_new_cart_entry_API_format branch July 15, 2021 08:43
@AlexanderKuschner AlexanderKuschner temporarily deployed to dev July 15, 2021 08:43 Inactive
Stofftiger added a commit that referenced this pull request Jul 16, 2021
@Stofftiger
feat: enables enhanced configuration info structure content handling …
520d0f5 
…of the order entry (#13066)

Each configuration info line contains data for one item parameter like name, price or quantity. 

Closes #12987
@Stofftiger Stofftiger mentioned this pull request Jul 16, 2021
Merged
Stofftiger added a commit that referenced this pull request Jul 16, 2021
@Stofftiger
feat: enables enhanced configuration info structure content handling …
7c729e3 
…of the order entry (#13066) (#13139)

Each configuration info line contains data for one item parameter like name, price or quantity. 

Closes #12987
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexanderKuschner AlexanderKuschner AlexanderKuschner left review comments

@ChristophHi ChristophHi ChristophHi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make configurator-cart-entry-bundle-info.service.ts handle new API format in addition
4 participants
@Stofftiger @CLAassistant @ChristophHi @AlexanderKuschner