fix: TT-155 resolve comments & fix user.selectors.spec

Author: thegreatyamori

.gitignore

@@ -43,6 +43,7 @@ testem.log
 .keys.json
 keys.ts
 src/environments/keys.ts
+debug.log
 
 # System Files
 .DS_Store

debug.log

@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { AzureAdB2CService } from '../../../login/services/azure.ad.b2c.service';
 
-
 @Component({
   selector: 'app-user',
   templateUrl: './user.component.html',

src/app/modules/shared/components/user/user.component.ts

@@ -1,7 +1,7 @@
 export interface User {
   name: string;
   email: string;
-  roles?: string[];  
+  roles?: string[];
   groups?: string[];
   id: string;
   tenant_id?: string;

src/app/modules/user/models/user.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-
 import { Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
+import { User } from '../models/user';
 
 @Injectable({
   providedIn: 'root',
@@ -14,8 +14,7 @@ export class UserService {
 
   baseUrl = `${environment.timeTrackerApiUrl}/users`;
 
-  loadUser(userId): Observable<any> {
-    return this.http.get(`${this.baseUrl}/${userId}`);
+  loadUser(userId: string): Observable<User> {
+    return this.http.get<User>(`${this.baseUrl}/${userId}`);
   }
-
 }

src/app/modules/user/services/user.service.ts

@@ -3,19 +3,19 @@ import { LoadUser, LoadUserFail, LoadUserSuccess } from './user.actions';
 import { User } from '../models/user';
 
 describe('userReducer', () => {
-  const initState = {
+  const initialState = {
     name: '',
     email: '',
     roles: [],
     groups: [],
-  }
+  };
 
-  it('on LoadUser, state equal to initState', () => {
+  it('on LoadUser, state equal to initialState', () => {
     const userId = 'dummy_id_load';
     const action = new LoadUser(userId);
-    const state = userReducer(initState, action);
+    const state = userReducer(initialState, action);
 
-    expect(state).toEqual(initState);
+    expect(state).toEqual(initialState);
   });
 
   it('on LoadUserSuccess, userFound is saved in store', () => {
@@ -30,15 +30,15 @@ describe('userReducer', () => {
     };
 
     const action = new LoadUserSuccess(userFound);
-    const state = userReducer(initState, action);
+    const state = userReducer(initialState, action);
 
     expect(state).toEqual(userFound);
   });
 
-  it('on LoadUserFail, state equal to initState', () => {
+  it('on LoadUserFail, state equal to initialState', () => {
     const action = new LoadUserFail('error');
-    const state = userReducer(initState, action);
+    const state = userReducer(initialState, action);
 
-    expect(state).toEqual(initState);
+    expect(state).toEqual(initialState);
   });
 });

src/app/modules/user/store/user.reducer.spec.ts

@@ -1,21 +1,22 @@
-import { getUserInfo } from './user.selectors';
+import { getUserGroups, getUserInfo } from './user.selectors';
 import { User } from '../models/user';
 
 describe('UserSelectors', () => {
-  const userInfo: User = {
-      name: 'Unknown Name',
-      email: '[email protected]',
-      roles: [],
-      groups: [],
-      id: 'dummy_tenant_id_load',
-      tenant_id: null,
-      deleted: null
-    };
+  const userState: User = {
+    name: 'Unknown Name',
+    email: '[email protected]',
+    roles: [],
+    groups: [],
+    id: 'dummy_tenant_id_load',
+    tenant_id: null,
+    deleted: null,
+  };
 
-  it('should select user info', () => {
-    const result = getUserInfo.projector(userInfo);
-
-    expect(userInfo.email).toEqual('[email protected]');
+  it('should select user from store', () => {
+    expect(getUserInfo.projector(userState)).toEqual(userState);
   });
 
+  it('should select user groups from store', () => {
+    expect(getUserGroups.projector(userState)).toEqual(userState.groups);
+  });
 });