Skip to content

Commit 73114c3

Browse files
vc-civc-ci
committed
Merge branch 'release/3.832.0'
2 parents aef5783 + 7085520 commit 73114c3

35 files changed

+3554
-25
lines changed

‎.github/workflows/module-ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.11
2-
# bump-ubuntu-version
1+
# v3.800.12
2+
# https://virtocommerce.atlassian.net/browse/VCST-2469
33
name: Module CI
44

55
on:
@@ -241,13 +241,12 @@ jobs:
241241
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
242242
(github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
243243
needs: 'ci'
244-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.11
245-
244+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.12
246245
with:
247246
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
248247
katalonRepoBranch: 'dev'
249248
testSuite: 'Test Suites/Modules/Platform_collection'
250-
installModules: 'true'
249+
installModules: 'false'
251250
installCustomModule: 'true'
252251
customModuleId: ${{ needs.ci.outputs.moduleId }}
253252
customModuleUrl: ${{ needs.ci.outputs.artifactUrl }}
@@ -260,7 +259,7 @@ jobs:
260259
deploy-cloud:
261260
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
262261
needs: ci
263-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.11
262+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.12
264263
with:
265264
releaseSource: module
266265
moduleId: ${{ needs.ci.outputs.moduleId }}

‎.github/workflows/module-release-hotfix.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.11
2-
# bump-ubuntu-version
1+
# v3.800.12
2+
# https://virtocommerce.atlassian.net/browse/VCST-2469
33
name: Release hotfix
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.12
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.12
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
4646
publish-github-release:
4747
needs:
4848
[build, test, get-metadata]
49-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
49+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.12
5050
with:
5151
fullKey: ${{ needs.build.outputs.packageFullKey }}
5252
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

‎.github/workflows/publish-nugets.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.11
2-
# bump-ubuntu-version
1+
# v3.800.12
2+
# https://virtocommerce.atlassian.net/browse/VCST-2469
33
name: Publish nuget
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.11
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.12
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.11
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.12
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -29,10 +29,12 @@ jobs:
2929
publish-nuget:
3030
needs:
3131
[build, test]
32-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.11
32+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.12
3333
with:
3434
fullKey: ${{ needs.build.outputs.packageFullKey }}
3535
forceGithub: false
36+
forceBlob: true
3637
secrets:
3738
envPAT: ${{ secrets.GITHUB_TOKEN }}
3839
nugetKey: ${{ secrets.NUGET_KEY }}
40+
BLOB_TOKEN: ${{ secrets.BLOB_TOKEN }}

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# v3.800.11
2-
# bump-ubuntu-version
1+
# v3.800.12
2+
# https://virtocommerce.atlassian.net/browse/VCST-2469
33
name: Release
44

55
on:
66
workflow_dispatch:
77

88
jobs:
99
release:
10-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.11
10+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.12
1111
secrets:
1212
envPAT: ${{ secrets.REPO_TOKEN }}

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<!-- These properties will be shared for all projects -->
44
<PropertyGroup>
5-
<VersionPrefix>3.831.0</VersionPrefix>
5+
<VersionPrefix>3.832.0</VersionPrefix>
66
<VersionSuffix>
77
</VersionSuffix>
88
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

‎src/VirtoCommerce.CustomerModule.Core/Events/CustomerPreferenceChangedEvent.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System.Collections.Generic;
2+
using VirtoCommerce.CustomerModule.Core.Model;
3+
using VirtoCommerce.Platform.Core.Events;
4+
5+
namespace VirtoCommerce.CustomerModule.Core.Events;
6+
7+
public class CustomerPreferenceChangedEvent(IEnumerable<GenericChangedEntry<CustomerPreference>> changedEntries)
8+
: GenericChangedEntryEvent<CustomerPreference>(changedEntries);

‎src/VirtoCommerce.CustomerModule.Core/Events/CustomerPreferenceChangingEvent.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
using System.Collections.Generic;
2+
using VirtoCommerce.CustomerModule.Core.Model;
3+
using VirtoCommerce.Platform.Core.Events;
4+
5+
namespace VirtoCommerce.CustomerModule.Core.Events;
6+
7+
public class CustomerPreferenceChangingEvent(IEnumerable<GenericChangedEntry<CustomerPreference>> changedEntries)
8+
: GenericChangedEntryEvent<CustomerPreference>(changedEntries);

‎src/VirtoCommerce.CustomerModule.Core/Extensions/CustomerPreferenceServiceExtensions.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System.Threading.Tasks;
2+
using VirtoCommerce.CustomerModule.Core.Services;
3+
4+
namespace VirtoCommerce.CustomerModule.Core.Extensions;
5+
6+
public static class CustomerPreferenceServiceExtensions
7+
{
8+
public const string SelectedAddressId = "SelectedAddressId";
9+
10+
public static Task<string> GetSelectedAddressId(this ICustomerPreferenceService service, string userId, string organizationId)
11+
{
12+
return service.GetValue(userId, [SelectedAddressId, organizationId]);
13+
}
14+
15+
public static Task SaveSelectedAddressId(this ICustomerPreferenceService service, string userId, string organizationId, string addressId)
16+
{
17+
return service.SaveValue(userId, [SelectedAddressId, organizationId], addressId);
18+
}
19+
}

‎src/VirtoCommerce.CustomerModule.Core/Model/Contact.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public Contact()
2727
public IList<string> AssociatedOrganizations { get; set; }
2828
public string DefaultOrganizationId { get; set; }
2929
public string CurrentOrganizationId { get; set; }
30+
31+
[Obsolete("Use GetSelectedAddressId() or SaveSelectedAddressId() from VirtoCommerce.CustomerModule.Core.Extensions.CustomerPreferenceServiceExtensions", DiagnosticId = "VC0011", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions/")]
3032
public string SelectedAddressId { get; set; }
3133

3234
public string TaxPayerId { get; set; }

‎src/VirtoCommerce.CustomerModule.Core/Model/CustomerPreference.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System;
2+
using VirtoCommerce.Platform.Core.Common;
3+
4+
namespace VirtoCommerce.CustomerModule.Core.Model;
5+
6+
public class CustomerPreference : AuditableEntity, ICloneable
7+
{
8+
public string UserId { get; set; }
9+
public string Name { get; set; }
10+
public string Value { get; set; }
11+
12+
public object Clone()
13+
{
14+
return MemberwiseClone();
15+
}
16+
}

‎src/VirtoCommerce.CustomerModule.Core/Model/CustomerPreferenceSearchCriteria.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using VirtoCommerce.Platform.Core.Common;
2+
3+
namespace VirtoCommerce.CustomerModule.Core.Model;
4+
5+
public class CustomerPreferenceSearchCriteria : SearchCriteriaBase
6+
{
7+
public string UserId { get; set; }
8+
public string Name { get; set; }
9+
}

‎src/VirtoCommerce.CustomerModule.Core/Model/CustomerPreferenceSearchResult.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
using VirtoCommerce.Platform.Core.Common;
2+
3+
namespace VirtoCommerce.CustomerModule.Core.Model;
4+
5+
public class CustomerPreferenceSearchResult : GenericSearchResult<CustomerPreference>;

‎src/VirtoCommerce.CustomerModule.Core/Services/ICustomerPreferenceCrudService.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
using VirtoCommerce.CustomerModule.Core.Model;
2+
using VirtoCommerce.Platform.Core.GenericCrud;
3+
4+
namespace VirtoCommerce.CustomerModule.Core.Services;
5+
6+
public interface ICustomerPreferenceCrudService : ICrudService<CustomerPreference>;

‎src/VirtoCommerce.CustomerModule.Core/Services/ICustomerPreferenceSearchService.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
using VirtoCommerce.CustomerModule.Core.Model;
2+
using VirtoCommerce.Platform.Core.GenericCrud;
3+
4+
namespace VirtoCommerce.CustomerModule.Core.Services;
5+
6+
public interface ICustomerPreferenceSearchService : ISearchService<CustomerPreferenceSearchCriteria, CustomerPreferenceSearchResult, CustomerPreference>;

‎src/VirtoCommerce.CustomerModule.Core/Services/ICustomerPreferenceService.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System.Collections.Generic;
2+
using System.Threading.Tasks;
3+
4+
namespace VirtoCommerce.CustomerModule.Core.Services;
5+
6+
public interface ICustomerPreferenceService
7+
{
8+
Task<string> GetValue(string userId, IList<string> nameParts);
9+
Task<string> GetValue(string userId, string name);
10+
Task SaveValue(string userId, IList<string> nameParts, string value);
11+
Task SaveValue(string userId, string name, string value);
12+
};

0 commit comments

Comments
 (0)