87 save customers #139
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <div class="container"> | ||
| <form style="width: 600px;" [formGroup]="customerForm" (ngSubmit)="onSubmit(customerForm.value)"> | ||
| <div class="form-group"> | ||
| <div | ||
| *ngIf="showAlert && messageToShow !== ''" | ||
| [ngClass]="{'bg-secondary': messageToShow == 'Customer create successfully!', 'bg-primary': messageToShow != 'Customer create successfully!'}" | ||
| class="alert alert-dismissible fade fade-in show text-white" | ||
| role="alert" | ||
| > | ||
| <strong>{{ messageToShow }}</strong> | ||
| </div> | ||
|
|
||
| <input | ||
| class="form-control form-control-sm" | ||
| id="name" | ||
| type="text" | ||
| formControlName="name" | ||
| placeholder="Customer name" | ||
| [class.is-invalid]="customerForm.invalid && customerForm.touched" | ||
| required | ||
| /> | ||
| <span | ||
| class="badge badge-pill badge-light text-danger" | ||
| *ngIf="(customerForm.dirty || customerForm.touched) && customerForm.invalid" | ||
| >Activity name is required</span | ||
| > | ||
| <textarea | ||
| class="form-control form-control-sm mt-2" | ||
| id="description" | ||
| rows="3" | ||
| formControlName="description" | ||
| placeholder="Customer description" | ||
| ></textarea> | ||
| <button type="submit" class="btn btn-sm btn-primary" [disabled]="!customerForm.valid">Save</button> | ||
| <button (click)="resetCustomerForm()" id="cancel" type="button" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2"> | ||
| Cancel | ||
| </button> | ||
| </div> | ||
| </form> | ||
| </div> | ||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { CreateCustomerComponent } from './create-customer'; | ||
| import { MockStore, provideMockStore } from '@ngrx/store/testing'; | ||
| import { CustomerState, CreateCustomer } from 'src/app/modules/customer-management/store'; | ||
| import { FormBuilder } from '@angular/forms'; | ||
|
||
| import { Customer } from 'src/app/modules/shared/models/customer.model'; | ||
|
||
|
|
||
| describe('CreateCustomerComponent', () => { | ||
| let component: CreateCustomerComponent; | ||
| let fixture: ComponentFixture<CreateCustomerComponent>; | ||
| let store: MockStore<CustomerState>; | ||
|
|
||
| const state = { | ||
| data: [], | ||
| isLoading: false, | ||
| message: '', | ||
| }; | ||
|
|
||
| const customerData: Customer = { | ||
| name: 'aa', | ||
| description: 'bb', | ||
| tenant_id: 'cc', | ||
| }; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [CreateCustomerComponent], | ||
| providers: [FormBuilder, provideMockStore({ initialState: state })], | ||
| }).compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(CreateCustomerComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
|
|
||
| store = TestBed.inject(MockStore); | ||
| store.setState(state); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| fixture.destroy(); | ||
| }); | ||
|
|
||
| it('component should be created', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should call resetCustomerForm', () => { | ||
| spyOn(component.customerForm, 'reset'); | ||
|
|
||
| component.resetCustomerForm(); | ||
|
|
||
| expect(component.customerForm.reset).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('onSubmit and dispatch CreateCustomer action', () => { | ||
| spyOn(store, 'dispatch'); | ||
|
|
||
| component.onSubmit(customerData); | ||
|
|
||
| expect(store.dispatch).toHaveBeenCalledTimes(1); | ||
| expect(store.dispatch).toHaveBeenCalledWith(new CreateCustomer(customerData)); | ||
| }); | ||
|
|
||
| it('should call resetCustomerForm', () => { | ||
| spyOn(component.customerForm, 'reset'); | ||
|
|
||
| component.resetCustomerForm(); | ||
|
|
||
| expect(component.customerForm.reset).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should be enable tabs and show message Customer create successfully! ', () => { | ||
| component.isActiveItemTabs = false; | ||
| component.messageToShow = ''; | ||
|
|
||
| spyOn(store, 'dispatch'); | ||
|
|
||
| component.ngOnInit(); | ||
|
|
||
| component.onSubmit(customerData); | ||
|
|
||
| component.setStatusOnScreen('Customer create successfully!'); | ||
|
|
||
| expect(component.messageToShow).toEqual('Customer create successfully!'); | ||
|
||
| expect(component.isActiveItemTabs).toBeTrue(); | ||
| }); | ||
|
|
||
| it('should be disabled tabs and show message Something went wrong creating customer! ', () => { | ||
|
||
| component.isActiveItemTabs = false; | ||
| component.messageToShow = ''; | ||
|
|
||
| spyOn(store, 'dispatch'); | ||
|
|
||
| component.ngOnInit(); | ||
|
|
||
| component.onSubmit(customerData); | ||
|
|
||
| component.setStatusOnScreen('Something went wrong creating customer!'); | ||
|
|
||
| expect(component.messageToShow).toEqual('Something went wrong creating customer!'); | ||
| expect(component.isActiveItemTabs).toBeFalse(); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import { Component, Input, Output, EventEmitter, OnDestroy, OnInit } from '@angular/core'; | ||
| import { Store, select } from '@ngrx/store'; | ||
| import { CustomerState, CreateCustomer } from 'src/app/modules/customer-management/store'; | ||
| import { FormGroup, FormBuilder, Validators } from '@angular/forms'; | ||
|
Contributor
There was a problem hiding this comment. Please sort imports by module. |
||
| import { Subscription } from 'rxjs'; | ||
| import { getStatusMessage } from 'src/app/modules/customer-management/store/customer-management.selectors'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-create-customer', | ||
| templateUrl: './create-customer.html', | ||
| styleUrls: ['./create-customer.scss'], | ||
| }) | ||
| export class CreateCustomerComponent implements OnInit, OnDestroy { | ||
| customerForm: FormGroup; | ||
| @Input() isActiveItemTabs: boolean; | ||
|
||
| @Output() changeValueIsActiveItemTabs = new EventEmitter<boolean>(); | ||
| showAlert = false; | ||
| messageToShow = ''; | ||
| saveSubscription: Subscription; | ||
|
|
||
| constructor(private formBuilder: FormBuilder, private store: Store<CustomerState>) { | ||
| this.customerForm = this.formBuilder.group({ | ||
| name: ['', Validators.required], | ||
| description: [''], | ||
| }); | ||
| } | ||
|
|
||
| ngOnInit() { | ||
| const messages$ = this.store.pipe(select(getStatusMessage)); | ||
| this.saveSubscription = messages$.subscribe((valueMessage) => { | ||
| this.setStatusOnScreen(valueMessage); | ||
| console.log(valueMessage); | ||
|
||
| }); | ||
| } | ||
|
|
||
| ngOnDestroy() { | ||
| this.isActiveItemTabs = false; | ||
| this.saveSubscription.unsubscribe(); | ||
| } | ||
|
|
||
| onSubmit(customerData) { | ||
| this.store.dispatch(new CreateCustomer(customerData)); | ||
| this.showAlert = true; | ||
| } | ||
|
|
||
| setStatusOnScreen(message: string) { | ||
| if (message === 'Customer create successfully!') { | ||
| this.messageToShow = message; | ||
| this.isActiveItemTabs = true; | ||
| this.changeValueIsActiveItemTabs.emit(this.isActiveItemTabs); | ||
| } else if (message === 'Something went wrong creating customer!') { | ||
| this.messageToShow = message; | ||
| this.isActiveItemTabs = false; | ||
| this.changeValueIsActiveItemTabs.emit(this.isActiveItemTabs); | ||
| } | ||
| } | ||
|
|
||
| resetCustomerForm() { | ||
| this.showAlert = false; | ||
| this.customerForm.reset(); | ||
| } | ||
| } | ||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import { TestBed, inject } from '@angular/core/testing'; | ||
|
|
||
| import { CustomerService } from './customer.service'; | ||
| import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; | ||
|
||
| import { Customer } from '../../shared/models/customer.model'; | ||
|
|
||
| describe('CustomerService', () => { | ||
| let service: CustomerService; | ||
| let httpMock: HttpTestingController; | ||
|
|
||
| beforeEach(() => { | ||
| TestBed.configureTestingModule({ imports: [HttpClientTestingModule] }); | ||
| service = TestBed.inject(CustomerService); | ||
| httpMock = TestBed.inject(HttpTestingController); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| httpMock.verify(); | ||
| }); | ||
|
|
||
| it('services are ready to be used', inject( | ||
| [HttpClientTestingModule, CustomerService], | ||
| (httpClient: HttpClientTestingModule, customerService: CustomerService) => { | ||
| expect(customerService).toBeTruthy(); | ||
| expect(httpClient).toBeTruthy(); | ||
| } | ||
| )); | ||
|
|
||
| it('create customer using POST from baseUrl', () => { | ||
| const customer: Customer[] = [{ name: 'aa', description: 'bb', tenant_id: 'cc' }]; | ||
|
|
||
| service.baseUrl = 'customers'; | ||
|
|
||
| service.createCustomer(customer).subscribe((response) => { | ||
| expect(response.length).toBe(1); | ||
| }); | ||
|
|
||
| const createCustomerRequest = httpMock.expectOne(service.baseUrl); | ||
| expect(createCustomerRequest.request.method).toBe('POST'); | ||
| createCustomerRequest.flush(customer); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { HttpClient } from '@angular/common/http'; | ||
| import { environment } from './../../../../environments/environment'; | ||
| import { Observable } from 'rxjs'; | ||
|
|
||
| @Injectable({ | ||
| providedIn: 'root', | ||
| }) | ||
| export class CustomerService { | ||
| baseUrl = `${environment.timeTrackerApiUrl}/customers`; | ||
|
|
||
| constructor(private http: HttpClient) {} | ||
|
|
||
| createCustomer(customerData): Observable<any> { | ||
| const body = { | ||
| ...customerData, | ||
| tenant_id: '4225ab1e-1033-4a5f-8650-0dd4950f38c8', | ||
|
||
| }; | ||
| return this.http.post(this.baseUrl, body); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import * as actions from './customer-management.actions'; | ||
|
|
||
| describe('CustomerManagmentActions', () => { | ||
| it('CreateCustomer type is CustomerManagementActionTypes.CREATE_CUSTOMER', () => { | ||
| const createActivity = new actions.CreateCustomer({ | ||
| name: 'aa', | ||
| description: 'bb', | ||
| tenant_id: 'cc', | ||
| }); | ||
| expect(createActivity.type).toEqual(actions.CustomerManagementActionTypes.CREATE_CUSTOMER); | ||
| }); | ||
|
|
||
| it('CreateCustomerSuccess type is CustomerManagementActionTypes.CREATE_CUSTOMER_SUCCES', () => { | ||
| const createActivitySuccess = new actions.CreateCustomerSuccess({ | ||
| name: 'aa', | ||
| description: 'bb', | ||
| tenant_id: 'cc', | ||
| }); | ||
| expect(createActivitySuccess.type).toEqual(actions.CustomerManagementActionTypes.CREATE_CUSTOMER_SUCCESS); | ||
| }); | ||
|
|
||
| it('CreateCustomerFail type is CustomerManagementActionTypes.CREATE_CUSTOMER_FAIL', () => { | ||
| const createActivityFail = new actions.CreateCustomerFail('error'); | ||
| expect(createActivityFail.type).toEqual(actions.CustomerManagementActionTypes.CREATE_CUSTOMER_FAIL); | ||
| }); | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo:
Customer created successfully!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done