feat(category): make category page configuration model generic

libs/category/src/actions/category.actions.ts

@@ -33,10 +33,10 @@ export class DaffCategoryLoad<T extends DaffCategoryRequest> implements Action {
  * 
  * @param response - DaffGetCategoryResponse object
  */
-export class DaffCategoryLoadSuccess<T extends DaffGenericCategory<T>, U extends DaffCategoryPageConfigurationState> implements Action {
+export class DaffCategoryLoadSuccess<T extends DaffCategoryRequest, V extends DaffGenericCategory<V>, U extends DaffCategoryPageConfigurationState<T>> implements Action {
   readonly type = DaffCategoryActionTypes.CategoryLoadSuccessAction;
 
-  constructor(public response: DaffGetCategoryResponse<T, U>) { }
+  constructor(public response: DaffGetCategoryResponse<T, V, U>) { }
 }
 
 /**
@@ -113,10 +113,10 @@ export class DaffToggleCategoryFilter implements Action {
 export type DaffCategoryActions<
 	T extends DaffCategoryRequest, 
 	U extends DaffGenericCategory<U>, 
-	V extends DaffCategoryPageConfigurationState
+	V extends DaffCategoryPageConfigurationState<T>
 > =
   | DaffCategoryLoad<T>
-  | DaffCategoryLoadSuccess<U, V>
+  | DaffCategoryLoadSuccess<T, U, V>
   | DaffCategoryLoadFailure
 	| DaffChangeCategoryPageSize
 	| DaffChangeCategoryCurrentPage

libs/category/src/drivers/interfaces/category-service.interface.ts

@@ -7,8 +7,8 @@ import { DaffGenericCategory } from '../../models/generic-category';
 
 export interface DaffCategoryServiceInterface<
 	T extends DaffCategoryRequest, 
-	U extends DaffGenericCategory<U>,
-	V extends DaffCategoryPageConfigurationState
+	V extends DaffGenericCategory<V>,
+	U extends DaffCategoryPageConfigurationState<T>
 > {
-  get(categoryRequest: T): Observable<DaffGetCategoryResponse<U, V>>;
+  get(categoryRequest: T): Observable<DaffGetCategoryResponse<T, V, U>>;
 }

libs/category/src/drivers/magento/category.service.ts

@@ -26,7 +26,7 @@ import { DaffCategoryPageConfigurationState } from '../../models/category-page-c
 @Injectable({
   providedIn: 'root'
 })
-export class DaffMagentoCategoryService implements DaffCategoryServiceInterface<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState> {
+export class DaffMagentoCategoryService implements DaffCategoryServiceInterface<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>> {
 
   constructor(
     private apollo: Apollo,
@@ -40,7 +40,7 @@ export class DaffMagentoCategoryService implements DaffCategoryServiceInterface<
    * Gets a category based on parameters. Default current_page is 1, and default page_size is 20.
    * @param categoryRequest A DaffCategoryRequest object.
    */
-  get(categoryRequest: DaffCategoryRequest): Observable<DaffGetCategoryResponse<DaffCategory, DaffCategoryPageConfigurationState>> {
+  get(categoryRequest: DaffCategoryRequest): Observable<DaffGetCategoryResponse<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>>> {
     return combineLatest([
       this.apollo.query<MagentoGetACategoryResponse>({
 				query: MagentoGetCategoryQuery,

libs/category/src/drivers/magento/transformers/category-page-config-transformer.service.spec.ts

@@ -13,6 +13,7 @@ import { MagentoSortFields } from '../models/sort-fields';
 import { MagentoCompleteCategoryResponse } from '../models/complete-category-response';
 import { DaffCategoryFromToFilterSeparator } from 'libs/category/src/models/requests/filter-request';
 import { DaffCategoryFilterType } from '../../../models/category-filter-base';
+import { DaffCategoryRequest } from '../../../models/requests/category-request';
 
 describe('DaffMagentoCategoryPageConfigTransformerService', () => {
 
@@ -21,7 +22,7 @@ describe('DaffMagentoCategoryPageConfigTransformerService', () => {
   const stubCategory: DaffCategory = categoryFactory.create();
 
   const categoryPageConfigurationStateFactory: DaffCategoryPageConfigurationStateFactory = new DaffCategoryPageConfigurationStateFactory();
-  const stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState = categoryPageConfigurationStateFactory.create();
+  const stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState<DaffCategoryRequest> = categoryPageConfigurationStateFactory.create();
   delete stubCategoryPageConfigurationState.filter_requests;
   delete stubCategoryPageConfigurationState.applied_sort_direction;
   delete stubCategoryPageConfigurationState.applied_sort_option;

libs/category/src/drivers/magento/transformers/category-page-config-transformer.service.ts

@@ -7,13 +7,14 @@ import { MagentoSortFields } from '../models/sort-fields';
 import { MagentoCompleteCategoryResponse } from '../models/complete-category-response';
 import { DaffCategoryFromToFilterSeparator } from '../../../models/requests/filter-request';
 import { DaffCategoryFilterType } from '../../../models/category-filter-base';
+import { DaffCategoryRequest } from '../../../models/requests/category-request';
 
 @Injectable({
   providedIn: 'root'
 })
 export class DaffMagentoCategoryPageConfigTransformerService {
 
-  transform(categoryResponse: MagentoCompleteCategoryResponse): DaffCategoryPageConfigurationState {
+  transform(categoryResponse: MagentoCompleteCategoryResponse): DaffCategoryPageConfigurationState<DaffCategoryRequest> {
 		return {
       id: categoryResponse.category.id,
       page_size: categoryResponse.page_info.page_size,

libs/category/src/drivers/magento/transformers/category-response-transform.service.spec.ts

@@ -14,14 +14,15 @@ import { MagentoPageInfo } from '../models/page-info';
 import { MagentoSortFields } from '../models/sort-fields';
 import { DaffMagentoCategoryTransformerService } from './category-transformer.service';
 import { MagentoCompleteCategoryResponse } from '../models/complete-category-response';
+import { DaffCategoryRequest } from '../../../models/requests/category-request';
 
 describe('DaffMagentoCategoryResponseTransformService', () => {
 
   let service: DaffMagentoCategoryResponseTransformService;
   const categoryFactory: DaffCategoryFactory = new DaffCategoryFactory();
   const stubCategory: DaffCategory = categoryFactory.create();
   const categoryPageConfigurationStateFactory: DaffCategoryPageConfigurationStateFactory = new DaffCategoryPageConfigurationStateFactory();
-  const stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState = categoryPageConfigurationStateFactory.create();
+  const stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState<DaffCategoryRequest> = categoryPageConfigurationStateFactory.create();
   const productFactory: DaffProductFactory = new DaffProductFactory();
   const stubProducts: DaffProduct[] = productFactory.createMany(4);
 

libs/category/src/drivers/magento/transformers/category-response-transform.service.ts

@@ -8,6 +8,7 @@ import { DaffGetCategoryResponse } from '../../../models/get-category-response';
 import { DaffMagentoCategoryTransformerService } from './category-transformer.service';
 import { DaffCategory } from '../../../models/category';
 import { DaffCategoryPageConfigurationState } from '../../../models/category-page-configuration-state';
+import { DaffCategoryRequest } from '../../../models/requests/category-request';
 
 @Injectable({
   providedIn: 'root'
@@ -20,7 +21,7 @@ export class DaffMagentoCategoryResponseTransformService {
     private magentoProductTransformerService: DaffMagentoProductTransformerService
   ) {}
 
-  transform(completeCategory: MagentoCompleteCategoryResponse): DaffGetCategoryResponse<DaffCategory, DaffCategoryPageConfigurationState> {
+  transform(completeCategory: MagentoCompleteCategoryResponse): DaffGetCategoryResponse<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>> {
     return {
 			...{ magentoCompleteCategoryResponse: completeCategory },
       category: this.magentoCategoryTransformerService.transform(completeCategory.category),

libs/category/src/drivers/magento/transformers/custom-metadata-attributes-methods.spec.ts

@@ -7,11 +7,12 @@ import { DaffCategoryPageConfigurationState } from '../../../models/category-pag
 import { MagentoCustomAttributeMetadataResponse } from '../models/custom-attribute-metadata-response';
 import { MagentoAggregation } from '../models/aggregation';
 import { MagentoGetCategoryAggregationsResponse } from '../models/get-category-aggregations-response';
+import { DaffCategoryRequest } from '../../../models/requests/category-request';
 
 describe('Custom Metadata Attributes Methods', () => {
 
   const categoryPageConfigurationStateFactory: DaffCategoryPageConfigurationStateFactory = new DaffCategoryPageConfigurationStateFactory();
-  const stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState = categoryPageConfigurationStateFactory.create();
+  const stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState<DaffCategoryRequest> = categoryPageConfigurationStateFactory.create();
   delete stubCategoryPageConfigurationState.filter_requests;
   delete stubCategoryPageConfigurationState.applied_sort_direction;
   delete stubCategoryPageConfigurationState.applied_sort_option;

libs/category/src/effects/category.effects.spec.ts

@@ -29,26 +29,26 @@ import { DaffCategoryFilterEqualRequest } from '../models/requests/filter-reques
 import { DaffCategoryFilterType } from '../models/category-filter-base';
 import { daffCategoryReducers } from '../reducers/category-reducers';
 
-class MockCategoryDriver implements DaffCategoryServiceInterface<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState> {
+class MockCategoryDriver implements DaffCategoryServiceInterface<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>> {
 	get(categoryRequest: any): Observable<any> {
 		return null;
 	}
 }
 
 describe('DaffCategoryEffects', () => {
   let actions$: Observable<any>;
-  let effects: DaffCategoryEffects<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState>;
+  let effects: DaffCategoryEffects<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>>;
   let stubCategory: DaffCategory;
-  let stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState;
+  let stubCategoryPageConfigurationState: DaffCategoryPageConfigurationState<DaffCategoryRequest>;
   let stubProducts: DaffProduct[];
-  let daffCategoryDriver: DaffCategoryServiceInterface<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState>;
+  let daffCategoryDriver: DaffCategoryServiceInterface<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>>;
   const daffCategoryDriverSpy = jasmine.createSpyObj('DaffCategoryDriver', ['get']);
   let store: MockStore<any>;
 
   let categoryFactory: DaffCategoryFactory;
   let categoryPageConfigurationStateFactory: DaffCategoryPageConfigurationStateFactory;
 	let productFactory: DaffProductFactory;
-	let categoryLoadSuccessAction: DaffCategoryLoadSuccess<DaffCategory, DaffCategoryPageConfigurationState>;
+	let categoryLoadSuccessAction: DaffCategoryLoadSuccess<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>>;
 	let productGridLoadSuccessAction: DaffProductGridLoadSuccess;
 
   beforeEach(() => {

libs/category/src/effects/category.effects.ts

@@ -30,17 +30,17 @@ import { DaffGenericCategory } from '../models/generic-category';
 @Injectable()
 export class DaffCategoryEffects<
 	T extends DaffCategoryRequest,
-	U extends DaffGenericCategory<U>,
-	V extends DaffCategoryPageConfigurationState
+	V extends DaffGenericCategory<V>,
+	U extends DaffCategoryPageConfigurationState<T>
 > {
 
   constructor(
     private actions$: Actions,
-    @Inject(DaffCategoryDriver) private driver: DaffCategoryServiceInterface<T, U, V>,
+    @Inject(DaffCategoryDriver) private driver: DaffCategoryServiceInterface<T, V, U>,
     private store: Store<any>
 	){}
 
-	private categorySelectors = getDaffCategorySelectors<U, V>();
+	private categorySelectors = getDaffCategorySelectors<T, V, U>();
 
   @Effect()
   loadCategory$ : Observable<any> = this.actions$.pipe(
@@ -183,7 +183,7 @@ export class DaffCategoryEffects<
 
   private processCategoryGetRequest(payload: T) {
     return this.driver.get(payload).pipe(
-      switchMap((resp: DaffGetCategoryResponse<U, V>) => [
+      switchMap((resp: DaffGetCategoryResponse<T, V, U>) => [
         new DaffProductGridLoadSuccess(resp.products),
         new DaffCategoryLoadSuccess(resp)
       ]),

libs/category/src/facades/category.facade.spec.ts

@@ -13,15 +13,16 @@ import { daffCategoryReducers } from '../reducers/category-reducers';
 import { DaffCategory } from '../models/category';
 import { DaffCategoryPageConfigurationState } from '../models/category-page-configuration-state';
 import { DaffCategoryFilterType } from '../models/category-filter-base';
+import { DaffCategoryRequest } from '../models/requests/category-request';
 
 describe('DaffCategoryFacade', () => {
   let store: MockStore<any>;
-  let facade: DaffCategoryFacade<DaffCategory, DaffCategoryPageConfigurationState>;
+  let facade: DaffCategoryFacade<DaffCategoryRequest, DaffCategory, DaffCategoryPageConfigurationState<DaffCategoryRequest>>;
   const categoryFactory: DaffCategoryFactory = new DaffCategoryFactory();
   const categoryPageConfigurationFactory: DaffCategoryPageConfigurationStateFactory = new DaffCategoryPageConfigurationStateFactory();
   const productFactory: DaffProductFactory = new DaffProductFactory();
   let category: DaffCategory;
-  let categoryPageConfigurationState: DaffCategoryPageConfigurationState;
+  let categoryPageConfigurationState: DaffCategoryPageConfigurationState<DaffCategoryRequest>;
 	let product: DaffProductUnion;
 
   beforeEach(() => {

libs/category/src/facades/category.facade.ts

@@ -11,7 +11,7 @@ import { DaffCategoryReducersState } from '../reducers/category-reducers.interfa
 import { DaffCategoryPageConfigurationState } from '../models/category-page-configuration-state';
 import { DaffCategoryFilter } from '../models/category-filter';
 import { DaffCategorySortOption } from '../models/category-sort-option';
-import { DaffSortDirectionEnum } from '../models/requests/category-request';
+import { DaffSortDirectionEnum, DaffCategoryRequest } from '../models/requests/category-request';
 import { DaffCategoryAppliedFilter } from '../models/category-applied-filter';
 import { DaffGenericCategory } from '../models/generic-category';
 
@@ -21,17 +21,17 @@ import { DaffGenericCategory } from '../models/generic-category';
 @Injectable({
   providedIn: DaffCategoryModule
 })
-export class DaffCategoryFacade<T extends DaffGenericCategory<T>, V extends DaffCategoryPageConfigurationState> implements DaffStoreFacade<Action> {
-	private categorySelectors = getDaffCategorySelectors<T, V>();
+export class DaffCategoryFacade<T extends DaffCategoryRequest, V extends DaffGenericCategory<V>, U extends DaffCategoryPageConfigurationState<T>> implements DaffStoreFacade<Action> {
+	private categorySelectors = getDaffCategorySelectors<T, V, U>();
 
 	/**
    * The currently selected category.
    */
-  category$: Observable<T>;
+  category$: Observable<V>;
   /**
    * The page configuration state for the selected category.
    */
-  pageConfigurationState$: Observable<V>;
+  pageConfigurationState$: Observable<U>;
   /**
    * The current page of products for the selected category.
    */
@@ -93,7 +93,7 @@ export class DaffCategoryFacade<T extends DaffGenericCategory<T>, V extends Daff
 	 * Get a category by the provided Id.
 	 * @param id 
 	 */
-	getCategoryById(id: string): Observable<T> {
+	getCategoryById(id: string): Observable<V> {
 		return this.store.pipe(select(this.categorySelectors.selectCategory, {id: id}));
 	}
 
@@ -113,7 +113,7 @@ export class DaffCategoryFacade<T extends DaffGenericCategory<T>, V extends Daff
 		return this.store.pipe(select(this.categorySelectors.selectTotalProductsByCategory, {id: categoryId}))
 	}
 
-  constructor(private store: Store<DaffCategoryReducersState<T, V>>) {
+  constructor(private store: Store<DaffCategoryReducersState<T, V, U>>) {
     this.category$ = this.store.pipe(select(this.categorySelectors.selectSelectedCategory));
 		this.products$ = this.store.pipe(select(this.categorySelectors.selectCategoryPageProducts));
 		this.totalProducts$ = this.store.pipe(select(this.categorySelectors.selectCategoryPageTotalProducts));

libs/category/src/models/category-page-configuration-state.ts

@@ -2,7 +2,7 @@ import { DaffCategoryFilter } from './category-filter';
 import { DaffCategorySortOption } from './category-sort-option';
 import { DaffCategoryRequest } from './requests/category-request';
 
-export interface DaffCategoryPageConfigurationState extends DaffCategoryRequest {
+export type DaffCategoryPageConfigurationState<T extends DaffCategoryRequest> = T & {
 	filters: DaffCategoryFilter[];
   sort_options: DaffCategorySortOption[];
 	total_pages: number;

libs/category/src/models/get-category-response.ts

@@ -2,12 +2,14 @@ import { DaffProductUnion } from '@daffodil/product';
 
 import { DaffCategoryPageConfigurationState } from './category-page-configuration-state';
 import { DaffGenericCategory } from './generic-category';
+import { DaffCategoryRequest } from './requests/category-request';
 
 export interface DaffGetCategoryResponse<
-	T extends DaffGenericCategory<T>, 
-	U extends DaffCategoryPageConfigurationState
+	T extends DaffCategoryRequest,
+	V extends DaffGenericCategory<V>, 
+	U extends DaffCategoryPageConfigurationState<T>
 > {
   products: DaffProductUnion[];
-  category: T;
+  category: V;
   categoryPageConfigurationState: U;
 }

libs/category/src/reducers/category-entities/category-entities.reducer.ts

@@ -6,13 +6,13 @@ import { DaffCategoryRequest } from '../../models/requests/category-request';
 import { DaffCategoryPageConfigurationState } from '../../models/category-page-configuration-state';
 import { DaffGenericCategory } from '../../models/generic-category';
 
-export function daffCategoryEntitiesReducer<T extends DaffCategoryRequest, U extends DaffGenericCategory<U>, V extends DaffCategoryPageConfigurationState>(
-  state = daffCategoryEntitiesAdapter<U>().getInitialState(), 
-	action: DaffCategoryActions<T, U, V>
-): EntityState<U> {
+export function daffCategoryEntitiesReducer<T extends DaffCategoryRequest, V extends DaffGenericCategory<V>, U extends DaffCategoryPageConfigurationState<T>>(
+  state = daffCategoryEntitiesAdapter<V>().getInitialState(), 
+	action: DaffCategoryActions<T, V, U>
+): EntityState<V> {
   switch (action.type) {
     case DaffCategoryActionTypes.CategoryLoadSuccessAction:
-      return daffCategoryEntitiesAdapter<U>().upsertOne(
+      return daffCategoryEntitiesAdapter<V>().upsertOne(
         { 
           id: action.response.category.id, 
           ...action.response.category

libs/category/src/reducers/category-reducers.interface.ts

@@ -3,8 +3,9 @@ import { EntityState } from '@ngrx/entity';
 import { DaffCategoryReducerState } from '../reducers/category/category-reducer-state.interface';
 import { DaffCategoryPageConfigurationState } from '../models/category-page-configuration-state';
 import { DaffGenericCategory } from '../models/generic-category';
+import { DaffCategoryRequest } from '../models/requests/category-request';
 
-export interface DaffCategoryReducersState<T extends DaffGenericCategory<T>, U extends DaffCategoryPageConfigurationState> {
-  category: DaffCategoryReducerState<U>;
-  categoryEntities: EntityState<T>;
+export interface DaffCategoryReducersState<T extends DaffCategoryRequest, V extends DaffGenericCategory<V>, U extends DaffCategoryPageConfigurationState<T>> {
+  category: DaffCategoryReducerState<T, U>;
+  categoryEntities: EntityState<V>;
 }

libs/category/src/reducers/category/category-reducer-state.interface.ts

@@ -1,7 +1,8 @@
 import { DaffCategoryPageConfigurationState } from '../../models/category-page-configuration-state';
+import { DaffCategoryRequest } from '../../models/requests/category-request';
 
-export interface DaffCategoryReducerState<T extends DaffCategoryPageConfigurationState> {
-  categoryPageConfigurationState: T,
+export interface DaffCategoryReducerState<T extends DaffCategoryRequest, V extends DaffCategoryPageConfigurationState<T>> {
+	categoryPageConfigurationState: V,
   categoryLoading: boolean,
   productsLoading: boolean,
   errors: string[]