Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
EShop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
EShop
Commits
cd6f6254
Commit
cd6f6254
authored
May 02, 2020
by
gdlcf88
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Close #20: Record entity data when a product changed
parent
378d145a
Changes
25
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
2925 additions
and
16 deletions
+2925
-16
ProductDetailDto.cs
...bp/EShop/Products/ProductDetails/Dtos/ProductDetailDto.cs
+1
-0
ProductDto.cs
...tracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs
+1
-0
ProductDetailHistoryRecorder.cs
...ts/ProductDetailHistories/ProductDetailHistoryRecorder.cs
+44
-0
ProductHistoryRecorder.cs
...EShop/Products/ProductHistories/ProductHistoryRecorder.cs
+42
-0
ProductAppService.cs
...tion/EasyAbp/EShop/Products/Products/ProductAppService.cs
+3
-3
ProductsApplicationAutoMapperProfile.cs
...bp/EShop/Products/ProductsApplicationAutoMapperProfile.cs
+1
-0
IProductDetailHistoryRepository.cs
...ProductDetailHistories/IProductDetailHistoryRepository.cs
+9
-0
ProductDetailHistory.cs
...p/Products/ProductDetailHistories/ProductDetailHistory.cs
+29
-0
IProductHistoryRepository.cs
...op/Products/ProductHistories/IProductHistoryRepository.cs
+9
-0
ProductHistory.cs
...EasyAbp/EShop/Products/ProductHistories/ProductHistory.cs
+29
-0
AttributeOptionIdsSerializer.cs
...p/EShop/Products/Products/AttributeOptionIdsSerializer.cs
+10
-3
EShopProductsEntityFrameworkCoreModule.cs
...tyFrameworkCore/EShopProductsEntityFrameworkCoreModule.cs
+4
-0
IProductsDbContext.cs
.../EShop/Products/EntityFrameworkCore/IProductsDbContext.cs
+4
-0
ProductsDbContext.cs
...p/EShop/Products/EntityFrameworkCore/ProductsDbContext.cs
+4
-0
ProductsDbContextModelCreatingExtensions.cs
...FrameworkCore/ProductsDbContextModelCreatingExtensions.cs
+16
-0
ProductDetailHistoryRepository.cs
.../ProductDetailHistories/ProductDetailHistoryRepository.cs
+14
-0
ProductHistoryRepository.cs
...hop/Products/ProductHistories/ProductHistoryRepository.cs
+14
-0
CreateModal.cshtml.cs
.../EShop/Products/Products/ProductSku/CreateModal.cshtml.cs
+8
-10
ProductDetailHistoryDomainTests.cs
...ProductDetailHistories/ProductDetailHistoryDomainTests.cs
+23
-0
ProductHistoryDomainTests.cs
...omain.Tests/ProductHistories/ProductHistoryDomainTests.cs
+23
-0
ProductDetailHistoryRepositoryTests.cs
...uctDetailHistories/ProductDetailHistoryRepositoryTests.cs
+31
-0
ProductHistoryRepositoryTests.cs
...orkCore/ProductHistories/ProductHistoryRepositoryTests.cs
+31
-0
20200502071826_AddedHistoryEntities.Designer.cs
...igrations/20200502071826_AddedHistoryEntities.Designer.cs
+2465
-0
20200502071826_AddedHistoryEntities.cs
...rations/Migrations/20200502071826_AddedHistoryEntities.cs
+52
-0
EasyMallMigrationsDbContextModelSnapshot.cs
...ns/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs
+58
-0
No files found.
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/ProductDetails/Dtos/ProductDetailDto.cs
View file @
cd6f6254
...
...
@@ -3,6 +3,7 @@ using Volo.Abp.Application.Dtos;
namespace
EasyAbp.EShop.Products.ProductDetails.Dtos
{
[
Serializable
]
public
class
ProductDetailDto
:
EntityDto
<
Guid
>
{
public
string
Description
{
get
;
set
;
}
...
...
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application.Contracts/EasyAbp/EShop/Products/Products/Dtos/ProductDto.cs
View file @
cd6f6254
...
...
@@ -4,6 +4,7 @@ using Volo.Abp.Application.Dtos;
namespace
EasyAbp.EShop.Products.Products.Dtos
{
[
Serializable
]
public
class
ProductDto
:
FullAuditedEntityDto
<
Guid
>
{
public
Guid
ProductTypeId
{
get
;
set
;
}
...
...
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryRecorder.cs
0 → 100644
View file @
cd6f6254
using
System.Threading.Tasks
;
using
EasyAbp.EShop.Products.ProductDetails
;
using
EasyAbp.EShop.Products.ProductDetails.Dtos
;
using
EasyAbp.EShop.Products.ProductHistories
;
using
Volo.Abp.DependencyInjection
;
using
Volo.Abp.Domain.Entities.Events
;
using
Volo.Abp.EventBus
;
using
Volo.Abp.Guids
;
using
Volo.Abp.Json
;
using
Volo.Abp.ObjectMapping
;
namespace
EasyAbp.EShop.Products.ProductDetailHistories
{
public
class
ProductDetailHistoryRecorder
:
ILocalEventHandler
<
EntityChangedEventData
<
ProductDetail
>>,
ITransientDependency
{
private
readonly
IGuidGenerator
_guidGenerator
;
private
readonly
IObjectMapper
_objectMapper
;
private
readonly
IJsonSerializer
_jsonSerializer
;
private
readonly
IProductDetailHistoryRepository
_productDetailHistoryRepository
;
public
ProductDetailHistoryRecorder
(
IGuidGenerator
guidGenerator
,
IObjectMapper
objectMapper
,
IJsonSerializer
jsonSerializer
,
IProductDetailHistoryRepository
productDetailHistoryRepository
)
{
_guidGenerator
=
guidGenerator
;
_objectMapper
=
objectMapper
;
_jsonSerializer
=
jsonSerializer
;
_productDetailHistoryRepository
=
productDetailHistoryRepository
;
}
public
async
Task
HandleEventAsync
(
EntityChangedEventData
<
ProductDetail
>
eventData
)
{
var
modificationTime
=
eventData
.
Entity
.
LastModificationTime
??
eventData
.
Entity
.
CreationTime
;
var
serializedDto
=
_jsonSerializer
.
Serialize
(
_objectMapper
.
Map
<
ProductDetail
,
ProductDetailDto
>(
eventData
.
Entity
));
await
_productDetailHistoryRepository
.
InsertAsync
(
new
ProductDetailHistory
(
_guidGenerator
.
Create
(),
eventData
.
Entity
.
Id
,
modificationTime
,
serializedDto
));
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductHistories/ProductHistoryRecorder.cs
0 → 100644
View file @
cd6f6254
using
System.Threading.Tasks
;
using
EasyAbp.EShop.Products.Products
;
using
EasyAbp.EShop.Products.Products.Dtos
;
using
Volo.Abp.DependencyInjection
;
using
Volo.Abp.Domain.Entities.Events
;
using
Volo.Abp.EventBus
;
using
Volo.Abp.Guids
;
using
Volo.Abp.Json
;
using
Volo.Abp.ObjectMapping
;
namespace
EasyAbp.EShop.Products.ProductHistories
{
public
class
ProductHistoryRecorder
:
ILocalEventHandler
<
EntityChangedEventData
<
Product
>>,
ITransientDependency
{
private
readonly
IGuidGenerator
_guidGenerator
;
private
readonly
IObjectMapper
_objectMapper
;
private
readonly
IJsonSerializer
_jsonSerializer
;
private
readonly
IProductHistoryRepository
_productHistoryRepository
;
public
ProductHistoryRecorder
(
IGuidGenerator
guidGenerator
,
IObjectMapper
objectMapper
,
IJsonSerializer
jsonSerializer
,
IProductHistoryRepository
productHistoryRepository
)
{
_guidGenerator
=
guidGenerator
;
_objectMapper
=
objectMapper
;
_jsonSerializer
=
jsonSerializer
;
_productHistoryRepository
=
productHistoryRepository
;
}
public
async
Task
HandleEventAsync
(
EntityChangedEventData
<
Product
>
eventData
)
{
var
modificationTime
=
eventData
.
Entity
.
LastModificationTime
??
eventData
.
Entity
.
CreationTime
;
var
serializedDto
=
_jsonSerializer
.
Serialize
(
_objectMapper
.
Map
<
Product
,
ProductDto
>(
eventData
.
Entity
));
await
_productHistoryRepository
.
InsertAsync
(
new
ProductHistory
(
_guidGenerator
.
Create
(),
eventData
.
Entity
.
Id
,
modificationTime
,
serializedDto
));
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
View file @
cd6f6254
...
...
@@ -65,7 +65,7 @@ namespace EasyAbp.EShop.Products.Products
await
Repository
.
InsertAsync
(
product
,
autoSave
:
true
);
await
CheckProductDetail
Id
Async
(
product
.
Id
,
input
.
ProductDetailId
);
await
CheckProductDetail
Available
Async
(
product
.
Id
,
input
.
ProductDetailId
);
await
AddProductToStoreAsync
(
product
.
Id
,
input
.
StoreId
);
...
...
@@ -74,7 +74,7 @@ namespace EasyAbp.EShop.Products.Products
return
MapToGetOutputDto
(
product
);
}
pr
ivate
async
Task
CheckProductDetailId
Async
(
Guid
currentProductId
,
Guid
desiredProductDetailId
)
pr
otected
virtual
async
Task
CheckProductDetailAvailable
Async
(
Guid
currentProductId
,
Guid
desiredProductDetailId
)
{
var
otherOwner
=
await
_repository
.
FindAsync
(
x
=>
x
.
ProductDetailId
==
desiredProductDetailId
&&
x
.
Id
!=
currentProductId
);
...
...
@@ -109,7 +109,7 @@ namespace EasyAbp.EShop.Products.Products
await
Repository
.
UpdateAsync
(
product
,
autoSave
:
true
);
await
CheckProductDetail
Id
Async
(
product
.
Id
,
input
.
ProductDetailId
);
await
CheckProductDetail
Available
Async
(
product
.
Id
,
input
.
ProductDetailId
);
await
UpdateProductCategoriesAsync
(
product
.
Id
,
input
.
CategoryIds
);
...
...
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductsApplicationAutoMapperProfile.cs
View file @
cd6f6254
...
...
@@ -9,6 +9,7 @@ using EasyAbp.EShop.Products.ProductCategories.Dtos;
using
AutoMapper
;
using
EasyAbp.EShop.Products.ProductDetails
;
using
EasyAbp.EShop.Products.ProductDetails.Dtos
;
using
EasyAbp.EShop.Products.ProductDetailHistories
;
using
Volo.Abp.AutoMapper
;
namespace
EasyAbp.EShop.Products
...
...
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductDetailHistories/IProductDetailHistoryRepository.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
Volo.Abp.Domain.Repositories
;
namespace
EasyAbp.EShop.Products.ProductDetailHistories
{
public
interface
IProductDetailHistoryRepository
:
IRepository
<
ProductDetailHistory
,
Guid
>
{
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistory.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
JetBrains.Annotations
;
using
Volo.Abp.Domain.Entities
;
namespace
EasyAbp.EShop.Products.ProductDetailHistories
{
public
class
ProductDetailHistory
:
AggregateRoot
<
Guid
>
{
public
virtual
Guid
ProductDetailId
{
get
;
protected
set
;
}
public
virtual
DateTime
ModificationTime
{
get
;
protected
set
;
}
[
NotNull
]
public
virtual
string
SerializedDto
{
get
;
protected
set
;
}
protected
ProductDetailHistory
()
{}
public
ProductDetailHistory
(
Guid
id
,
Guid
productDetailId
,
DateTime
modificationTime
,
[
NotNull
]
string
serializedDto
)
:
base
(
id
)
{
ProductDetailId
=
productDetailId
;
ModificationTime
=
modificationTime
;
SerializedDto
=
serializedDto
;
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductHistories/IProductHistoryRepository.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
Volo.Abp.Domain.Repositories
;
namespace
EasyAbp.EShop.Products.ProductHistories
{
public
interface
IProductHistoryRepository
:
IRepository
<
ProductHistory
,
Guid
>
{
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/ProductHistories/ProductHistory.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
JetBrains.Annotations
;
using
Volo.Abp.Domain.Entities
;
namespace
EasyAbp.EShop.Products.ProductHistories
{
public
class
ProductHistory
:
AggregateRoot
<
Guid
>
{
public
virtual
Guid
ProductId
{
get
;
protected
set
;
}
public
virtual
DateTime
ModificationTime
{
get
;
protected
set
;
}
[
NotNull
]
public
virtual
string
SerializedDto
{
get
;
protected
set
;
}
protected
ProductHistory
()
{}
public
ProductHistory
(
Guid
id
,
Guid
productId
,
DateTime
modificationTime
,
[
NotNull
]
string
serializedDto
)
:
base
(
id
)
{
ProductId
=
productId
;
ModificationTime
=
modificationTime
;
SerializedDto
=
serializedDto
;
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Domain/EasyAbp/EShop/Products/Products/AttributeOptionIdsSerializer.cs
View file @
cd6f6254
...
...
@@ -2,13 +2,20 @@
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Newtonsoft.Json
;
using
Volo.Abp.DependencyInjection
;
using
Volo.Abp.Json
;
namespace
EasyAbp.EShop.Products.Products
{
public
class
AttributeOptionIdsSerializer
:
IAttributeOptionIdsSerializer
,
ITransientDependency
{
private
readonly
IJsonSerializer
_jsonSerializer
;
public
AttributeOptionIdsSerializer
(
IJsonSerializer
jsonSerializer
)
{
_jsonSerializer
=
jsonSerializer
;
}
public
async
Task
<
string
>
FormatAsync
(
string
serializedAttributeOptionIds
)
{
return
await
SerializeAsync
(
await
DeserializeAsync
(
serializedAttributeOptionIds
));
...
...
@@ -16,12 +23,12 @@ namespace EasyAbp.EShop.Products.Products
public
Task
<
string
>
SerializeAsync
(
IEnumerable
<
Guid
>
attributeOptionIds
)
{
return
Task
.
FromResult
(
JsonConvert
.
SerializeObject
(
attributeOptionIds
.
OrderBy
(
x
=>
x
)));
return
Task
.
FromResult
(
_jsonSerializer
.
Serialize
(
attributeOptionIds
.
OrderBy
(
x
=>
x
)));
}
public
Task
<
IEnumerable
<
Guid
>>
DeserializeAsync
(
string
serializedAttributeOptionIds
)
{
return
Task
.
FromResult
(
JsonConvert
.
DeserializeObject
<
IEnumerable
<
Guid
>>(
serializedAttributeOptionIds
));
return
Task
.
FromResult
(
_jsonSerializer
.
Deserialize
<
IEnumerable
<
Guid
>>(
serializedAttributeOptionIds
));
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/EntityFrameworkCore/EShopProductsEntityFrameworkCoreModule.cs
View file @
cd6f6254
using
EasyAbp.EShop.Products.ProductDetailHistories
;
using
EasyAbp.EShop.Products.ProductHistories
;
using
EasyAbp.EShop.Products.ProductStores
;
using
EasyAbp.EShop.Products.ProductCategories
;
using
EasyAbp.EShop.Products.ProductTypes
;
...
...
@@ -29,6 +31,8 @@ namespace EasyAbp.EShop.Products.EntityFrameworkCore
options
.
AddRepository
<
ProductType
,
ProductTypeRepository
>();
options
.
AddRepository
<
ProductCategory
,
ProductCategoryRepository
>();
options
.
AddRepository
<
ProductStore
,
ProductStoreRepository
>();
options
.
AddRepository
<
ProductHistory
,
ProductHistoryRepository
>();
options
.
AddRepository
<
ProductDetailHistory
,
ProductDetailHistoryRepository
>();
});
}
}
...
...
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/EntityFrameworkCore/IProductsDbContext.cs
View file @
cd6f6254
...
...
@@ -7,6 +7,8 @@ using EasyAbp.EShop.Products.ProductTypes;
using
EasyAbp.EShop.Products.ProductCategories
;
using
EasyAbp.EShop.Products.ProductDetails
;
using
EasyAbp.EShop.Products.ProductStores
;
using
EasyAbp.EShop.Products.ProductHistories
;
using
EasyAbp.EShop.Products.ProductDetailHistories
;
namespace
EasyAbp.EShop.Products.EntityFrameworkCore
{
...
...
@@ -25,5 +27,7 @@ namespace EasyAbp.EShop.Products.EntityFrameworkCore
DbSet
<
ProductType
>
ProductTypes
{
get
;
set
;
}
DbSet
<
ProductCategory
>
ProductCategories
{
get
;
set
;
}
DbSet
<
ProductStore
>
ProductStores
{
get
;
set
;
}
DbSet
<
ProductHistory
>
ProductHistories
{
get
;
set
;
}
DbSet
<
ProductDetailHistory
>
ProductDetailHistories
{
get
;
set
;
}
}
}
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/EntityFrameworkCore/ProductsDbContext.cs
View file @
cd6f6254
...
...
@@ -7,6 +7,8 @@ using EasyAbp.EShop.Products.ProductTypes;
using
EasyAbp.EShop.Products.ProductCategories
;
using
EasyAbp.EShop.Products.ProductDetails
;
using
EasyAbp.EShop.Products.ProductStores
;
using
EasyAbp.EShop.Products.ProductHistories
;
using
EasyAbp.EShop.Products.ProductDetailHistories
;
namespace
EasyAbp.EShop.Products.EntityFrameworkCore
{
...
...
@@ -25,6 +27,8 @@ namespace EasyAbp.EShop.Products.EntityFrameworkCore
public
DbSet
<
ProductType
>
ProductTypes
{
get
;
set
;
}
public
DbSet
<
ProductCategory
>
ProductCategories
{
get
;
set
;
}
public
DbSet
<
ProductStore
>
ProductStores
{
get
;
set
;
}
public
DbSet
<
ProductHistory
>
ProductHistories
{
get
;
set
;
}
public
DbSet
<
ProductDetailHistory
>
ProductDetailHistories
{
get
;
set
;
}
public
ProductsDbContext
(
DbContextOptions
<
ProductsDbContext
>
options
)
:
base
(
options
)
...
...
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/EntityFrameworkCore/ProductsDbContextModelCreatingExtensions.cs
View file @
cd6f6254
using
EasyAbp.EShop.Products.ProductDetailHistories
;
using
EasyAbp.EShop.Products.ProductHistories
;
using
EasyAbp.EShop.Products.ProductStores
;
using
EasyAbp.EShop.Products.ProductCategories
;
using
EasyAbp.EShop.Products.ProductTypes
;
...
...
@@ -110,6 +112,20 @@ namespace EasyAbp.EShop.Products.EntityFrameworkCore
b
.
ConfigureByConvention
();
/* Configure more properties here */
});
builder
.
Entity
<
ProductHistory
>(
b
=>
{
b
.
ToTable
(
options
.
TablePrefix
+
"ProductHistories"
,
options
.
Schema
);
b
.
ConfigureByConvention
();
/* Configure more properties here */
});
builder
.
Entity
<
ProductDetailHistory
>(
b
=>
{
b
.
ToTable
(
options
.
TablePrefix
+
"ProductDetailHistories"
,
options
.
Schema
);
b
.
ConfigureByConvention
();
/* Configure more properties here */
});
}
}
}
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductDetailHistories/ProductDetailHistoryRepository.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
EasyAbp.EShop.Products.EntityFrameworkCore
;
using
Volo.Abp.Domain.Repositories.EntityFrameworkCore
;
using
Volo.Abp.EntityFrameworkCore
;
namespace
EasyAbp.EShop.Products.ProductDetailHistories
{
public
class
ProductDetailHistoryRepository
:
EfCoreRepository
<
ProductsDbContext
,
ProductDetailHistory
,
Guid
>,
IProductDetailHistoryRepository
{
public
ProductDetailHistoryRepository
(
IDbContextProvider
<
ProductsDbContext
>
dbContextProvider
)
:
base
(
dbContextProvider
)
{
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.EntityFrameworkCore/EasyAbp/EShop/Products/ProductHistories/ProductHistoryRepository.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
EasyAbp.EShop.Products.EntityFrameworkCore
;
using
Volo.Abp.Domain.Repositories.EntityFrameworkCore
;
using
Volo.Abp.EntityFrameworkCore
;
namespace
EasyAbp.EShop.Products.ProductHistories
{
public
class
ProductHistoryRepository
:
EfCoreRepository
<
ProductsDbContext
,
ProductHistory
,
Guid
>,
IProductHistoryRepository
{
public
ProductHistoryRepository
(
IDbContextProvider
<
ProductsDbContext
>
dbContextProvider
)
:
base
(
dbContextProvider
)
{
}
}
}
\ No newline at end of file
modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/CreateModal.cshtml.cs
View file @
cd6f6254
...
...
@@ -2,18 +2,12 @@ using System;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
EasyAbp.EShop.Products.Categories
;
using
EasyAbp.EShop.Products.ProductDetails
;
using
EasyAbp.EShop.Products.ProductDetails.Dtos
;
using
EasyAbp.EShop.Products.Products
;
using
EasyAbp.EShop.Products.Products.Dtos
;
using
EasyAbp.EShop.Products.ProductTypes
;
using
EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.Product.ViewModels
;
using
EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku.ViewModels
;
using
Microsoft.AspNetCore.Mvc
;
using
Microsoft.AspNetCore.Mvc.Rendering
;
using
Newtonsoft.Json
;
using
Volo.Abp.Application.Dtos
;
using
Volo.Abp.Json
;
namespace
EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku
{
...
...
@@ -34,11 +28,15 @@ namespace EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku
public
Dictionary
<
string
,
Guid
>
SelectedAttributeOptionIdDict
{
get
;
set
;
}
public
Dictionary
<
string
,
ICollection
<
SelectListItem
>>
Attributes
{
get
;
set
;
}
private
readonly
IJsonSerializer
_jsonSerializer
;
private
readonly
IProductAppService
_productAppService
;
public
CreateModalModel
(
IProductAppService
productAppService
)
public
CreateModalModel
(
IJsonSerializer
jsonSerializer
,
IProductAppService
productAppService
)
{
_jsonSerializer
=
jsonSerializer
;
_productAppService
=
productAppService
;
}
...
...
@@ -60,7 +58,7 @@ namespace EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku
{
var
createDto
=
ObjectMapper
.
Map
<
CreateEditProductSkuViewModel
,
CreateProductSkuDto
>(
ProductSku
);
createDto
.
SerializedAttributeOptionIds
=
JsonConvert
.
SerializeObject
(
SelectedAttributeOptionIdDict
.
Values
);
createDto
.
SerializedAttributeOptionIds
=
_jsonSerializer
.
Serialize
(
SelectedAttributeOptionIdDict
.
Values
);
await
_productAppService
.
CreateSkuAsync
(
ProductId
,
StoreId
,
createDto
);
...
...
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/ProductDetailHistories/ProductDetailHistoryDomainTests.cs
0 → 100644
View file @
cd6f6254
using
System.Threading.Tasks
;
using
Shouldly
;
using
Xunit
;
namespace
EasyAbp.EShop.Products.ProductDetailHistories
{
public
class
ProductDetailHistoryDomainTests
:
ProductsDomainTestBase
{
public
ProductDetailHistoryDomainTests
()
{
}
[
Fact
]
public
async
Task
Test1
()
{
// Arrange
// Assert
// Assert
}
}
}
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/ProductHistories/ProductHistoryDomainTests.cs
0 → 100644
View file @
cd6f6254
using
System.Threading.Tasks
;
using
Shouldly
;
using
Xunit
;
namespace
EasyAbp.EShop.Products.ProductHistories
{
public
class
ProductHistoryDomainTests
:
ProductsDomainTestBase
{
public
ProductHistoryDomainTests
()
{
}
[
Fact
]
public
async
Task
Test1
()
{
// Arrange
// Assert
// Assert
}
}
}
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EntityFrameworkCore/ProductDetailHistories/ProductDetailHistoryRepositoryTests.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
System.Threading.Tasks
;
using
EasyAbp.EShop.Products.ProductDetailHistories
;
using
Volo.Abp.Domain.Repositories
;
using
Xunit
;
namespace
EasyAbp.EShop.Products.EntityFrameworkCore.ProductDetailHistories
{
public
class
ProductDetailHistoryRepositoryTests
:
ProductsEntityFrameworkCoreTestBase
{
private
readonly
IRepository
<
ProductDetailHistory
,
Guid
>
_productDetailHistoryRepository
;
public
ProductDetailHistoryRepositoryTests
()
{
_productDetailHistoryRepository
=
GetRequiredService
<
IRepository
<
ProductDetailHistory
,
Guid
>>();
}
[
Fact
]
public
async
Task
Test1
()
{
await
WithUnitOfWorkAsync
(
async
()
=>
{
// Arrange
// Act
//Assert
});
}
}
}
modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.EntityFrameworkCore.Tests/EntityFrameworkCore/ProductHistories/ProductHistoryRepositoryTests.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
System.Threading.Tasks
;
using
EasyAbp.EShop.Products.ProductHistories
;
using
Volo.Abp.Domain.Repositories
;
using
Xunit
;
namespace
EasyAbp.EShop.Products.EntityFrameworkCore.ProductHistories
{
public
class
ProductHistoryRepositoryTests
:
ProductsEntityFrameworkCoreTestBase
{
private
readonly
IRepository
<
ProductHistory
,
Guid
>
_productHistoryRepository
;
public
ProductHistoryRepositoryTests
()
{
_productHistoryRepository
=
GetRequiredService
<
IRepository
<
ProductHistory
,
Guid
>>();
}
[
Fact
]
public
async
Task
Test1
()
{
await
WithUnitOfWorkAsync
(
async
()
=>
{
// Arrange
// Act
//Assert
});
}
}
}
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200502071826_AddedHistoryEntities.Designer.cs
0 → 100644
View file @
cd6f6254
This diff is collapsed.
Click to expand it.
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200502071826_AddedHistoryEntities.cs
0 → 100644
View file @
cd6f6254
using
System
;
using
Microsoft.EntityFrameworkCore.Migrations
;
namespace
EasyMall.Migrations
{
public
partial
class
AddedHistoryEntities
:
Migration
{
protected
override
void
Up
(
MigrationBuilder
migrationBuilder
)
{
migrationBuilder
.
CreateTable
(
name
:
"ProductsProductDetailHistories"
,
columns
:
table
=>
new
{
Id
=
table
.
Column
<
Guid
>(
nullable
:
false
),
ExtraProperties
=
table
.
Column
<
string
>(
nullable
:
true
),
ConcurrencyStamp
=
table
.
Column
<
string
>(
nullable
:
true
),
ProductDetailId
=
table
.
Column
<
Guid
>(
nullable
:
false
),
ModificationTime
=
table
.
Column
<
DateTime
>(
nullable
:
false
),
SerializedDto
=
table
.
Column
<
string
>(
nullable
:
true
)
},
constraints
:
table
=>
{
table
.
PrimaryKey
(
"PK_ProductsProductDetailHistories"
,
x
=>
x
.
Id
);
});
migrationBuilder
.
CreateTable
(
name
:
"ProductsProductHistories"
,
columns
:
table
=>
new
{
Id
=
table
.
Column
<
Guid
>(
nullable
:
false
),
ExtraProperties
=
table
.
Column
<
string
>(
nullable
:
true
),
ConcurrencyStamp
=
table
.
Column
<
string
>(
nullable
:
true
),
ProductId
=
table
.
Column
<
Guid
>(
nullable
:
false
),
ModificationTime
=
table
.
Column
<
DateTime
>(
nullable
:
false
),
SerializedDto
=
table
.
Column
<
string
>(
nullable
:
true
)
},
constraints
:
table
=>
{
table
.
PrimaryKey
(
"PK_ProductsProductHistories"
,
x
=>
x
.
Id
);
});
}
protected
override
void
Down
(
MigrationBuilder
migrationBuilder
)
{
migrationBuilder
.
DropTable
(
name
:
"ProductsProductDetailHistories"
);
migrationBuilder
.
DropTable
(
name
:
"ProductsProductHistories"
);
}
}
}
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs
View file @
cd6f6254
...
...
@@ -137,6 +137,35 @@ namespace EasyMall.Migrations
b
.
ToTable
(
"ProductsProductCategories"
);
});
modelBuilder
.
Entity
(
"EasyAbp.EShop.Products.ProductDetailHistories.ProductDetailHistory"
,
b
=>
{
b
.
Property
<
Guid
>(
"Id"
)
.
ValueGeneratedOnAdd
()
.
HasColumnType
(
"uniqueidentifier"
);
b
.
Property
<
string
>(
"ConcurrencyStamp"
)
.
IsConcurrencyToken
()
.
HasColumnName
(
"ConcurrencyStamp"
)
.
HasColumnType
(
"nvarchar(max)"
);
b
.
Property
<
string
>(
"ExtraProperties"
)
.
HasColumnName
(
"ExtraProperties"
)
.
HasColumnType
(
"nvarchar(max)"
);
b
.
Property
<
DateTime
>(
"ModificationTime"
)
.
HasColumnType
(
"datetime2"
);
b
.
Property
<
Guid
>(
"ProductDetailId"
)
.
HasColumnType
(
"uniqueidentifier"
);
b
.
Property
<
string
>(
"SerializedDto"
)
.
HasColumnType
(
"nvarchar(max)"
);
b
.
HasKey
(
"Id"
);
b
.
ToTable
(
"ProductsProductDetailHistories"
);
});
modelBuilder
.
Entity
(
"EasyAbp.EShop.Products.ProductDetails.ProductDetail"
,
b
=>
{
b
.
Property
<
Guid
>(
"Id"
)
...
...
@@ -190,6 +219,35 @@ namespace EasyMall.Migrations
b
.
ToTable
(
"ProductsProductDetails"
);
});
modelBuilder
.
Entity
(
"EasyAbp.EShop.Products.ProductHistories.ProductHistory"
,
b
=>
{
b
.
Property
<
Guid
>(
"Id"
)
.
ValueGeneratedOnAdd
()
.
HasColumnType
(
"uniqueidentifier"
);
b
.
Property
<
string
>(
"ConcurrencyStamp"
)
.
IsConcurrencyToken
()
.
HasColumnName
(
"ConcurrencyStamp"
)
.
HasColumnType
(
"nvarchar(max)"
);
b
.
Property
<
string
>(
"ExtraProperties"
)
.
HasColumnName
(
"ExtraProperties"
)
.
HasColumnType
(
"nvarchar(max)"
);
b
.
Property
<
DateTime
>(
"ModificationTime"
)
.
HasColumnType
(
"datetime2"
);
b
.
Property
<
Guid
>(
"ProductId"
)
.
HasColumnType
(
"uniqueidentifier"
);
b
.
Property
<
string
>(
"SerializedDto"
)
.
HasColumnType
(
"nvarchar(max)"
);
b
.
HasKey
(
"Id"
);
b
.
ToTable
(
"ProductsProductHistories"
);
});
modelBuilder
.
Entity
(
"EasyAbp.EShop.Products.ProductStores.ProductStore"
,
b
=>
{
b
.
Property
<
Guid
>(
"Id"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment