COMMERCE-2369 Shipment Refactor (from Alec) #1791

ethanbustad · 2019-12-11T18:03:27Z

https://issues.liferay.com/browse/COMMERCE-2369

…ommerceShippingOriginLocator

…e handles that

…ase from

…undles.append() calls

…any assigned

…ion is selected

…ileEntry

…lementation

…e queries

…tock or not when deleting a shipment

… shipments

liferay-continuous-integration · 2019-12-11T18:03:32Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

ethanbustad · 2019-12-11T18:03:53Z

ci:test

liferay-continuous-integration · 2019-12-11T18:44:10Z

Validation PASSED. Running batch tests.

Build Time: 32 minutes 48 seconds 857 ms

Base Branch:

Branch Name: 7.1.x
Branch GIT ID: d81ea66aa0cd49e165b51bb6a7fa126e1a6396aa

Task Summary:

subrepository-compile-jdk8 - ✔️
subrepository-semantic-versioning-jdk8 - ✔️
subrepository-pmd-jdk8 - ✔️
subrepository-source-format-jdk8 - ✔️
central-requirements-jdk8/subrepository-unit-jdk8 - ✔️

For full console, click here.

Test Results:

22 Tests Passed.
0 Tests Failed.

For all test results, click here.

liferay-continuous-integration · 2019-12-11T20:28:53Z

❌ ci:test:default - 11 out of 13 jobs passed in 2 hours 24 minutes 40 seconds 904 ms

Click here for more details.

Base Branch:

Branch Name: 7.1.x
Branch GIT ID: d81ea66aa0cd49e165b51bb6a7fa126e1a6396aa

ci:test:default - 11 out of 13 jobs PASSED

2 Failed Jobs:

11 Successful Jobs:

For more details click here.

Failures (upstream comparison is not available):

test-subrepository-acceptance-pullrequest-batch(7.1.x)/subrepository-integration-mysql57-jdk8

Job Results:

1948 Tests Passed.
5 Tests Failed.

AXIS_VARIABLE=2,label_exp=!master #827

CommerceVirtualOrderItemLocalServiceTest.testAddCommerceVirtualOrderItem

java.lang.AssertionError: 
[
SCENARIO Add a virtual order item
GIVEN An order item
WHEN An order is paid
THEN I should be able to see the created virtual order item
]
[
Message: expected:<null> but was:<2019-12-11 20:02:32.526>
]
	at org.junit.Assert.fail(Assert.java:88)
	at org.junit.Assert.failNotEquals(Assert.java:834)
	at org.junit.Assert.assertEquals(Assert.java:118)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at com.liferay.commerce.product.type.virtual.order.service.test.CommerceVirtualOrderItemLocalServiceTest.testAddCommerceVirtualOrderItem(CommerceVirtualOrderItemLocalServiceTest.java:175)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.liferay.arquillian.extension.junit.bridge.server.TestExecutorRunnable$2.evaluate(TestExecutorRunnable.java:234)
	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
	at com.liferay.portal.kernel.test.rule.BaseTestRule$1.evaluate(BaseTestRule.java:55)
	at com.liferay.portal.kernel.test.rule.BaseTestRule$1.evaluate(BaseTestRule.java:55)
	at com.liferay.portal.kernel.test.rule.BaseTestRule$1.evaluate(BaseTestRule.java:55)
	at com.liferay.portal.kernel.test.rule.BaseTestRule$...

CommerceShipmentItemTest.testAddCommerceShipmentItem

com.liferay.commerce.exception.CommerceOrderValidatorException
	at com.liferay.commerce.service.impl.CommerceOrderItemLocalServiceImpl.validate(CommerceOrderItemLocalServiceImpl.java:756)
	at com.liferay.commerce.service.impl.CommerceOrderItemLocalServiceImpl.addCommerceOrderItem(CommerceOrderItemLocalServiceImpl.java:104)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:153)
	at com.liferay.portal.spring.transaction.DefaultTransactionExecutor._execute(DefaultTransactionExecutor.java:203)
	at com.liferay.portal.spring.transaction.DefaultTransactionExecutor.execute(DefaultTransactionExecutor.java:94)
	at com.liferay.portal.spring.transaction.TransactionInterceptor.invoke(TransactionInterceptor.java:110)
	at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:130)
	at com.liferay.portal.service.ServiceContextAdvice.invoke(ServiceContextAdvice.java:51)
	at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:130)
	at com.liferay.portal.spring.aop.ChainableMethodAdvice.invoke(ChainableMethodAdvice.java:55)
	at com.liferay.portal.spring.aop.ServiceBe...

CommerceShipmentItemTest.testAddCommerceShipmentItemOnShippedShipment

com.liferay.commerce.exception.CommerceOrderValidatorException
	at com.liferay.commerce.service.impl.CommerceOrderItemLocalServiceImpl.validate(CommerceOrderItemLocalServiceImpl.java:756)
	at com.liferay.commerce.service.impl.CommerceOrderItemLocalServiceImpl.addCommerceOrderItem(CommerceOrderItemLocalServiceImpl.java:104)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:153)
	at com.liferay.portal.spring.transaction.DefaultTransactionExecutor._execute(DefaultTransactionExecutor.java:203)
	at com.liferay.portal.spring.transaction.DefaultTransactionExecutor.execute(DefaultTransactionExecutor.java:94)
	at com.liferay.portal.spring.transaction.TransactionInterceptor.invoke(TransactionInterceptor.java:110)
	at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:130)
	at com.liferay.portal.service.ServiceContextAdvice.invoke(ServiceContextAdvice.java:51)
	at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:130)
	at com.liferay.portal.spring.aop.ChainableMethodAdvice.invoke(ChainableMethodAdvice.java:55)
	at com.liferay.portal.spring.aop.ServiceBe...

...

ethanbustad · 2019-12-11T20:30:48Z

ci:test

liferay-continuous-integration · 2019-12-11T21:23:03Z

Validation PASSED. Running batch tests.

Build Time: 40 minutes 2 seconds 306 ms

Base Branch:

Branch Name: 7.1.x
Branch GIT ID: 499c441afe2ece76c1a9550e06ae3e211d023373

Task Summary:

subrepository-compile-jdk8 - ✔️
subrepository-semantic-versioning-jdk8 - ✔️
subrepository-pmd-jdk8 - ✔️
subrepository-source-format-jdk8 - ✔️
central-requirements-jdk8/subrepository-unit-jdk8 - ✔️

For full console, click here.

Test Results:

22 Tests Passed.
0 Tests Failed.

For all test results, click here.

liferay-continuous-integration · 2019-12-11T22:48:15Z

❌ ci:test:default - 11 out of 13 jobs passed in 2 hours 17 minutes 8 seconds 221 ms

Click here for more details.

Base Branch:

Branch Name: 7.1.x
Branch GIT ID: 499c441afe2ece76c1a9550e06ae3e211d023373

ci:test:default - 11 out of 13 jobs PASSED

2 Failed Jobs:

11 Successful Jobs:

For more details click here.

Failures (upstream comparison is not available):

test-subrepository-acceptance-pullrequest-batch(7.1.x)/subrepository-integration-mysql57-jdk8

Job Results:

1948 Tests Passed.
5 Tests Failed.

AXIS_VARIABLE=2,label_exp=!master #828

CommerceShipmentItemTest.testAddCommerceShipmentItem

java.lang.AssertionError: 
[
SCENARIO Create a Shipment Item for an Order
GIVEN A Group
 AND An Order Item
 AND A CPInstance
WHEN A Shipment Item is added to a Shipment
THEN That Shipment should contain the Shipment Item
]
[
Message: {level=ERROR, loggerName=com.liferay.commerce.service.impl.CommerceShipmentItemLocalServiceImpl, message=com.liferay.commerce.exception.NoSuchOrderItemException: No CommerceOrderItem exists with the primary key 88645
]
	at com.liferay.portal.test.rule.LogAssertionAppender.append(LogAssertionAppender.java:61)
	at org.apache.log4j.AppenderSkeleton.doAppend(AppenderSkeleton.java:251)
	at org.apache.log4j.helpers.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:66)
	at org.apache.log4j.Category.callAppenders(Category.java:206)
	at org.apache.log4j.Category.forcedLog(Category.java:391)
	at org.apache.log4j.Category.log(Category.java:856)
	at com.liferay.portal.log.Log4jLogImpl.error(Log4jLogImpl.java:54)
	at com.liferay.portal.kernel.log.LogWrapper.error(LogWrapper.java:69)
	at com.liferay.commerce.service.impl.CommerceShipmentItemLocalServiceImpl.deleteCommerceShipmentItem(CommerceShipmentItemLocalServiceImpl.java:116)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.liferay.porta...

CommerceShipmentItemTest.testAddCommerceShipmentItemOnShippedShipment

java.lang.AssertionError: 
[
SCENARIO Try to add a new Shipment Item after a shipment is marked as shipped
GIVEN A Group
 AND A ShipmentItem
 AND A CPInstance
WHEN A Shipment is marked as shipped
THEN Shipment Items should not be able to be added
]
[
Message: {level=ERROR, loggerName=com.liferay.commerce.service.impl.CommerceShipmentItemLocalServiceImpl, message=com.liferay.commerce.exception.NoSuchOrderItemException: No CommerceOrderItem exists with the primary key 88690
]
	at com.liferay.portal.test.rule.LogAssertionAppender.append(LogAssertionAppender.java:61)
	at org.apache.log4j.AppenderSkeleton.doAppend(AppenderSkeleton.java:251)
	at org.apache.log4j.helpers.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:66)
	at org.apache.log4j.Category.callAppenders(Category.java:206)
	at org.apache.log4j.Category.forcedLog(Category.java:391)
	at org.apache.log4j.Category.log(Category.java:856)
	at com.liferay.portal.log.Log4jLogImpl.error(Log4jLogImpl.java:54)
	at com.liferay.portal.kernel.log.LogWrapper.error(LogWrapper.java:69)
	at com.liferay.commerce.service.impl.CommerceShipmentItemLocalServiceImpl.deleteCommerceShipmentItem(CommerceShipmentItemLocalServiceImpl.java:116)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:...

CommerceShipmentItemTest.testDeleteCommerceShipmentItemOnShippedShipment

java.lang.AssertionError: 
[
SCENARIO Try to delete a Shipment Item after a shipment is marked as shipped
GIVEN A Group
 AND A ShipmentItem
 AND A CPInstance
WHEN A Shipment is marked as shipped
THEN Shipment Items should not be able to be added
]
[
Message: {level=ERROR, loggerName=com.liferay.commerce.service.impl.CommerceShipmentItemLocalServiceImpl, message=com.liferay.commerce.exception.NoSuchOrderItemException: No CommerceOrderItem exists with the primary key 88752
]
	at com.liferay.portal.test.rule.LogAssertionAppender.append(LogAssertionAppender.java:61)
	at org.apache.log4j.AppenderSkeleton.doAppend(AppenderSkeleton.java:251)
	at org.apache.log4j.helpers.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:66)
	at org.apache.log4j.Category.callAppenders(Category.java:206)
	at org.apache.log4j.Category.forcedLog(Category.java:391)
	at org.apache.log4j.Category.log(Category.java:856)
	at com.liferay.portal.log.Log4jLogImpl.error(Log4jLogImpl.java:54)
	at com.liferay.portal.kernel.log.LogWrapper.error(LogWrapper.java:69)
	at com.liferay.commerce.service.impl.CommerceShipmentItemLocalServiceImpl.deleteCommerceShipmentItem(CommerceShipmentItemLocalServiceImpl.java:116)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:4...

...

marco-leo · 2019-12-11T22:55:33Z

@alecsloan This looks like a real fail

ethanbustad · 2019-12-16T19:26:39Z

Forwarded to #1804.

riccardo-alberti and others added 30 commits November 29, 2019 18:23

COMMERCE-2412 Fix jsp imports

c9b03dd

COMMERCE-2412 Fix jsp imports

f1b614b

COMMERCE-2412 Restored jsp import liferay-util

a514348

COMMERCE-2412 build.gradle fix conflicts

72879e5

COMMERCE-2498 Fix Validation

fd7e3c6

COMMERCE-2498 Baseline

8c9dcaf

COMMERCE-2498 LPS-84119 Enforce double quote instead of single quote

feac275

COMMERCE-2479 commerce-machine-learning-impl 7.2 compatibility

645b49f

COMMERCE-1648 Move some pages to be child pages

c04d836

COMMERCE-1648 Add redirect handling for Senna

591f538

COMMERCE-1453 Remove SF suppressions for CommerceRegionsStarter and C…

4cc97ea

…ommerceShippingOriginLocator

COMMERCE-1453 Manual logical SF

97a5bcf

COMMERCE-1453 We don't need to set Uuid or Modified date as peristenc…

7b928f5

…e handles that

COMMERCE-1453 Semantic Versioning (gradle baseline)

521b463

COMMERCE-2311 Replace activate/deactivate action with js

f2206c8

COMMERCE-2052 Add button in account table to select accounts to purch…

23b3073

…ase from

COMMERCE-2355 Add onclick parameter to ClayTableAction and update usages

0fa32e9

COMMERCE-2354 Get rid of needless StringPool.x from inside of StringB…

b82eaa3

…undles.append() calls

COMMERCE-1687 We should show them the default image if we don't find …

a469d2c

…any assigned

COMMERCE-1687 Get groupId based on the related entity

f699c32

COMMERCE-1687 Add logic so that all the images will show until an opt…

464b0d2

…ion is selected

COMMERCE-1687 Enforce that groupId is passed for adding CPAttachmentF…

f01fe0b

…ileEntry

COMMERCE-1687 Fix API usage so userId and groupId are passed

0ac2e3b

COMMERCE-1687 Semantic Versioning (gradle baseline)

551f097

COMMERCE-1687 Regenerate service files (gradle buildService)

a830a26

COMMERCE-2496 Fix Speedwell JS due to changed Liferay FE API

148c0c2

COMMERCE-2282 Fixed commerce product version contributor registry imp…

78e6de5

…lementation

COMMERCE-1551 Inventory test add frutilla dependency

0d89d82

COMMERCE-1551 Added new inventory integration tests

ff5fe81

COMMERCE-1551 Added condition on warehouse active in inventory servic…

cc65730

…e queries

alecsloan and others added 9 commits December 11, 2019 08:52

COMMERCE-2369 Add modal for users to confirm whether they want to res…

00709b5

…tock or not when deleting a shipment

COMMERCE-2369 Add language keys for the sentences in the 2 new modals

c82fcae

COMMERCE-2369 Allow for multiple order ids to be shown on the list of…

fb42a9b

… shipments

COMMERCE-2369 Allow for multiple orders to be added to one shipment

f755e32

COMMERCE-2369 Regenerate language files (gradle buildLang)

3e5f351

COMMERCE-2369 Regenerate service files (gradle buildService)

33d725f

COMMERCE-2369 Sort

cf3d1d7

COMMERCE-2369 Wordsmith (capitalization)

5f1398e

COMMERCE-2369 Delete currency after test is over

f8d6981

ethanbustad mentioned this pull request Dec 11, 2019

Commerce 2369 Shipment Refactor #1771

Closed

liferay-continuous-integration added the ci:test - pending label Dec 11, 2019

liferay-continuous-integration added ci:test - failure and removed ci:test - pending labels Dec 11, 2019

liferay-continuous-integration added ci:test - pending and removed ci:test - failure labels Dec 11, 2019

liferay-continuous-integration added ci:test - failure and removed ci:test - pending labels Dec 11, 2019

marco-leo force-pushed the 7.1.x-next branch from 56b4fdf to 82c9525 Compare December 12, 2019 17:36

alecsloan mentioned this pull request Dec 13, 2019

Commerce 2369 Shipment Refactor (from Ethan originally from me) #1804

Closed

ethanbustad closed this Dec 16, 2019

ethanbustad deleted the COMMERCE-2369-alec branch January 31, 2020 19:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

COMMERCE-2369 Shipment Refactor (from Alec) #1791

COMMERCE-2369 Shipment Refactor (from Alec) #1791

ethanbustad commented Dec 11, 2019

liferay-continuous-integration commented Dec 11, 2019

ethanbustad commented Dec 11, 2019

liferay-continuous-integration commented Dec 11, 2019

Test Results:

For all test results, click here.

liferay-continuous-integration commented Dec 11, 2019

Base Branch:

2 Failed Jobs:

For more details click here.

Failures (upstream comparison is not available):

test-subrepository-acceptance-pullrequest-batch(7.1.x)/subrepository-integration-mysql57-jdk8

Job Results:

ethanbustad commented Dec 11, 2019

liferay-continuous-integration commented Dec 11, 2019

Test Results:

For all test results, click here.

liferay-continuous-integration commented Dec 11, 2019

Base Branch:

2 Failed Jobs:

For more details click here.

Failures (upstream comparison is not available):

test-subrepository-acceptance-pullrequest-batch(7.1.x)/subrepository-integration-mysql57-jdk8

Job Results:

marco-leo commented Dec 11, 2019

ethanbustad commented Dec 16, 2019

COMMERCE-2369 Shipment Refactor (from Alec) #1791

COMMERCE-2369 Shipment Refactor (from Alec) #1791

Conversation

ethanbustad commented Dec 11, 2019

liferay-continuous-integration commented Dec 11, 2019

ethanbustad commented Dec 11, 2019

liferay-continuous-integration commented Dec 11, 2019

Validation PASSED. Running batch tests.

Base Branch:

Task Summary:

For full console, click here.

Test Results:

For all test results, click here.

liferay-continuous-integration commented Dec 11, 2019

❌ ci:test:default - 11 out of 13 jobs passed in 2 hours 24 minutes 40 seconds 904 ms

Base Branch:

2 Failed Jobs:

For more details click here.

Failures (upstream comparison is not available):

test-subrepository-acceptance-pullrequest-batch(7.1.x)/subrepository-integration-mysql57-jdk8

Job Results:

ethanbustad commented Dec 11, 2019

liferay-continuous-integration commented Dec 11, 2019

Validation PASSED. Running batch tests.

Base Branch:

Task Summary:

For full console, click here.

Test Results:

For all test results, click here.

liferay-continuous-integration commented Dec 11, 2019

❌ ci:test:default - 11 out of 13 jobs passed in 2 hours 17 minutes 8 seconds 221 ms

Base Branch:

2 Failed Jobs:

For more details click here.

Failures (upstream comparison is not available):

test-subrepository-acceptance-pullrequest-batch(7.1.x)/subrepository-integration-mysql57-jdk8

Job Results:

marco-leo commented Dec 11, 2019

ethanbustad commented Dec 16, 2019