refactor(ng): track ngrx entity

Add library for ngrx entity state
for track entity.
Fix most played tracks graphql.

angular.json

@@ -1754,6 +1754,39 @@
           }
         }
       }
+    },
+    "ng-radio-infrastructure-track-persistence-ngrx-entity": {
+      "projectType": "library",
+      "root": "libs/ng/radio/infrastructure-track-persistence-ngrx-entity",
+      "sourceRoot": "libs/ng/radio/infrastructure-track-persistence-ngrx-entity/src",
+      "prefix": "sdj",
+      "architect": {
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "libs/ng/radio/infrastructure-track-persistence-ngrx-entity/tsconfig.lib.json",
+              "libs/ng/radio/infrastructure-track-persistence-ngrx-entity/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**",
+              "!libs/ng/radio/infrastructure-track-persistence-ngrx-entity/**/*"
+            ]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "options": {
+            "jestConfig": "libs/ng/radio/infrastructure-track-persistence-ngrx-entity/jest.config.js",
+            "passWithNoTests": true
+          }
+        }
+      },
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      }
     }
   },
   "cli": {

apps/ng/src/app/app.component.spec.ts

@@ -1,14 +1,16 @@
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
-      declarations: [AppComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [RouterTestingModule],
+        declarations: [AppComponent],
+      }).compileComponents();
+    })
+  );
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);

libs/backend/auth/core/application-services/src/lib/queries/login/login.handler.spec.ts

@@ -1,8 +1,8 @@
 import { JwtService } from '@nestjs/jwt';
 import { Test, TestingModule } from '@nestjs/testing';
 import { SlackApiService } from '@sdj/shared/domain';
-import { LoginHandler } from './login.handler';
 import { createSpyObj } from 'jest-createspyobj';
+import { LoginHandler } from './login.handler';
 
 describe('LoginHandler', () => {
   let handler: LoginHandler;

libs/backend/radio/ui-rest/src/lib/controllers/track.resolver.ts

@@ -1,4 +1,4 @@
-import { Args, Query, Resolver } from '@nestjs/graphql';
+import { Args, Parent, Query, ResolveField, Resolver } from '@nestjs/graphql';
 import {
   Track,
   TrackRepositoryInterface,
@@ -14,4 +14,9 @@ export class TrackResolver {
   ): Promise<Track[]> {
     return this.trackRepository.findMostPlayedTracks(channelId);
   }
+
+  @ResolveField('playedCount', () => Number)
+  async getPlayedCount(@Parent() track: Track): Promise<number> {
+    return track.playedCount();
+  }
 }

libs/ng/auth/core/application-services/src/lib/ng-auth-core-application-services.module.spec.ts

@@ -1,12 +1,14 @@
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { NgAuthCoreApplicationServicesModule } from './ng-auth-core-application-services.module';
 
 describe('NgAuthCoreApplicationServicesModule', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [NgAuthCoreApplicationServicesModule],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NgAuthCoreApplicationServicesModule],
+      }).compileComponents();
+    })
+  );
 
   it('should create', () => {
     expect(NgAuthCoreApplicationServicesModule).toBeDefined();

libs/ng/main/shell/src/lib/components/navbar/navbar.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatToolbarModule } from '@angular/material/toolbar';
@@ -9,12 +9,14 @@ describe('NavbarComponent', () => {
   let component: NavbarComponent;
   let fixture: ComponentFixture<NavbarComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [MatIconModule, MatMenuModule, MatToolbarModule],
-      declarations: [NavbarComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [MatIconModule, MatMenuModule, MatToolbarModule],
+        declarations: [NavbarComponent],
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NavbarComponent);

libs/ng/main/shell/src/lib/components/sidenav/sidenav.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 
@@ -8,12 +8,14 @@ describe('SidenavComponent', () => {
   let component: SidenavComponent;
   let fixture: ComponentFixture<SidenavComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [MatIconModule, MatListModule],
-      declarations: [SidenavComponent],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [MatIconModule, MatListModule],
+        declarations: [SidenavComponent],
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SidenavComponent);

libs/ng/main/shell/src/lib/containers/main/main.component.spec.ts

@@ -1,5 +1,5 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -15,25 +15,27 @@ describe('MainComponent', () => {
   let component: MainComponent;
   let fixture: ComponentFixture<MainComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        MatSidenavModule,
-        RouterTestingModule,
-        HttpClientTestingModule,
-        NoopAnimationsModule,
-      ],
-      declarations: [
-        MainComponent,
-        MockComponent(NavbarComponent),
-        MockComponent(SidenavComponent),
-      ],
-      providers: [{ provide: ChannelFacade, useValue: {} }],
-    }).compileComponents();
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          MatSidenavModule,
+          RouterTestingModule,
+          HttpClientTestingModule,
+          NoopAnimationsModule,
+        ],
+        declarations: [
+          MainComponent,
+          MockComponent(NavbarComponent),
+          MockComponent(SidenavComponent),
+        ],
+        providers: [{ provide: ChannelFacade, useValue: {} }],
+      }).compileComponents();
 
-    const channelFacade = TestBed.inject(ChannelFacade);
-    (channelFacade.selectedChannel$ as any) = hot('');
-  }));
+      const channelFacade = TestBed.inject(ChannelFacade);
+      (channelFacade.selectedChannel$ as any) = hot('');
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MainComponent);

libs/ng/main/shell/src/lib/ng-main-shell.module.spec.ts

@@ -1,12 +1,14 @@
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { NgMainShellModule } from './ng-main-shell.module';
 
 describe('NgMainShellModule', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [NgMainShellModule],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NgMainShellModule],
+      }).compileComponents();
+    })
+  );
 
   it('should create', () => {
     expect(NgMainShellModule).toBeDefined();

libs/ng/radio/core/application-services/src/index.ts

@@ -1,11 +1,11 @@
 export * from './lib/ng-radio-core-application-services.module';
 export * from './lib/external-radio.facade';
-export * from './lib/ports/radio-data-service.port';
+export * from './lib/ports/data-services/radio-data-service.port';
 export * from './lib/radio.facade';
 export * from './lib/channel/ngrx-channel.facade';
-export * from './lib/ports/channel-data.service';
-export * from './lib/ports/queued-track.repository';
-export * from './lib/ports/radio-data-service.port';
-export * from './lib/ports/track-data.service';
+export * from './lib/ports/data-services/channel-data.service';
+export * from './lib/ports/data-services/queued-track.repository';
+export * from './lib/ports/data-services/radio-data-service.port';
+export * from './lib/ports/data-services/track-data.service';
+export * from './lib/ports/persistance/track-persistence.service';
 export * from './lib/queued-track/queued-track.facade';
-export * from './lib/track/track.facade';

libs/ng/radio/core/application-services/src/lib/channel/queries/load-channels/load-channels.handler.ts

@@ -8,7 +8,7 @@ import { merge, Observable } from 'rxjs';
 import { map, switchMap, withLatestFrom } from 'rxjs/operators';
 import { ChannelPartialState } from '../../+state/channel.reducer';
 import { channelQuery } from '../../+state/channel.selectors';
-import { ChannelDataService } from '../../../ports/channel-data.service';
+import { ChannelDataService } from '../../../ports/data-services/channel-data.service';
 import { ChannelsReceivedEvent } from '../../events/channels-received.event';
 import { LoadChannelsQuery } from './load-channels.query';
 

libs/ng/radio/core/application-services/src/lib/ng-radio-core-application-services.module.spec.ts

@@ -1,12 +1,14 @@
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { NgRadioCoreApplicationServicesModule } from './ng-radio-core-application-services.module';
 
 describe('NgRadioCoreApplicationServicesModule', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [NgRadioCoreApplicationServicesModule],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NgRadioCoreApplicationServicesModule],
+      }).compileComponents();
+    })
+  );
 
   it('should create', () => {
     expect(NgRadioCoreApplicationServicesModule).toBeDefined();

libs/ng/radio/core/application-services/src/lib/ng-radio-core-application-services.module.ts

@@ -12,7 +12,6 @@ import { RadioFacade } from './radio.facade';
 import * as fromRadio from './radio/+state/radio.reducer';
 import { JoinHandler } from './radio/commands/join/join.handler';
 import { GetAudioSourceHandler } from './radio/queries/get-audio-source.handler';
-import { NgCoreTrackApplicationServicesModule } from './track/ng-core-track-application-services.module';
 
 const HANDLERS = [JoinHandler, GetAudioSourceHandler];
 const CHANNEL_HANDLERS = [LoadChannelsHandler];
@@ -29,7 +28,6 @@ const CHANNEL_HANDLERS = [LoadChannelsHandler];
   ],
   imports: [
     NgCoreQueuedTrackApplicationServicesModule,
-    NgCoreTrackApplicationServicesModule,
     EffectsModule.forFeature(HANDLERS),
     StoreModule.forFeature(fromRadio.RADIO_FEATURE_KEY, fromRadio.reducer),
     EffectsModule.forFeature(CHANNEL_HANDLERS),

libs/ng/radio/core/application-services/src/lib/ports/persistance/track-persistence.service.ts

@@ -0,0 +1,6 @@
+import { Track } from '@sdj/ng/radio/core/domain';
+import { Observable } from 'rxjs';
+
+export abstract class TrackPersistenceService {
+  abstract save(tracks: Track[]): Observable<void>;
+}

libs/ng/radio/core/application-services/src/lib/queued-track/ng-core-queued-track-application-services.module.spec.ts

@@ -1,12 +1,14 @@
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { NgCoreQueuedTrackApplicationServicesModule } from './ng-core-queued-track-application-services.module';
 
 describe('NgCoreQueuedTrackApplicationServicesModule', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [NgCoreQueuedTrackApplicationServicesModule],
-    }).compileComponents();
-  }));
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NgCoreQueuedTrackApplicationServicesModule],
+      }).compileComponents();
+    })
+  );
 
   it('should create', () => {
     expect(NgCoreQueuedTrackApplicationServicesModule).toBeDefined();

libs/ng/radio/core/application-services/src/lib/queued-track/queued-track.facade.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { QueuedTrack } from '@sdj/ng/radio/core/domain';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { QueuedTrackRepository } from '../ports/queued-track.repository';
+import { QueuedTrackRepository } from '../ports/data-services/queued-track.repository';
 
 @Injectable()
 export class QueuedTrackFacade {

libs/ng/radio/core/application-services/src/lib/radio/queries/get-audio-source.handler.spec.ts

@@ -9,7 +9,7 @@ import { createSpyObj } from 'jest-createspyobj';
 import { cold, hot } from 'jest-marbles';
 import { Observable } from 'rxjs';
 import { ExternalRadioFacade } from '../../external-radio.facade';
-import { RadioDataService } from '../../ports/radio-data-service.port';
+import { RadioDataService } from '../../ports/data-services/radio-data-service.port';
 import { AudioSourceChangedEvent } from '../events/audio-source-changed/audio-source-changed.event';
 import { GetAudioSourceHandler } from './get-audio-source.handler';
 import { GetAudioSourceQuery } from './get-audio-source.query';

libs/ng/radio/core/application-services/src/lib/radio/queries/get-audio-source.handler.ts

@@ -13,7 +13,7 @@ import { filter, first, map, switchMap, withLatestFrom } from 'rxjs/operators';
 import { RadioPartialState } from '../+state/radio.reducer';
 import { radioQuery } from '../+state/radio.selectors';
 import { ExternalRadioFacade } from '../../external-radio.facade';
-import { RadioDataService } from '../../ports/radio-data-service.port';
+import { RadioDataService } from '../../ports/data-services/radio-data-service.port';
 import { AudioSourceChangedEvent } from '../events/audio-source-changed/audio-source-changed.event';
 import { AudioSourceChangedEventPayload } from '../events/audio-source-changed/audio-source-changed.event-payload';
 import { GetAudioSourceQuery } from './get-audio-source.query';