Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feat: TT-481 change customers project visibility
  • Loading branch information
mikevillarruel committed Dec 29, 2021
commit da0f0ee0b0395777672983ec09a0442d96736c4f
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<tr class="d-flex" *ngFor="let project of projects">
<td class="col-sm-4">{{ project.id }}</td>
<td class="col-sm-3">{{ project.name }}</td>
<td class="col-sm-2">{{ project.project_type.name }}</td>
<td class="col-sm-2">{{ project.project_type?.name }}</td>
<td class="col-sm-1 text-center">
<button type="button" class="btn btn-sm btn-primary" (click)="updateProject(project)">
<i class="fa fa-pencil fa-xs"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,38 @@ describe('ProjectService', () => {
updateProjectRequest.flush(project);
});

it('update project using PUT from url locally', () => {
const project: Project = { id: '1', name: 'new name', description: 'description', project_type_id: '123', status: 'active'};
service.url = 'projects';
service.isDevelopment = true;
service.updateProject(project).subscribe((response) => {
expect(response.name).toBe('new name');
});
const updateProjectRequest = httpMock.expectOne(`${service.url}/${project.id}`);
expect(updateProjectRequest.request.method).toBe('PUT');
updateProjectRequest.flush(project);
});

it('delete project using DELETE from baseUrl', () => {
const url = `${service.url}/1`;
service.isDevelopment = false;
service.deleteProject(projectsList[0].id).subscribe((projectsInResponse) => {
expect(projectsInResponse.filter((project) => project.id !== projectsList[0].id).length).toEqual(2);
});
const deleteActivitiesRequest = httpMock.expectOne(url);
expect(deleteActivitiesRequest.request.method).toBe('DELETE');
deleteActivitiesRequest.flush(projectsList);
});

it('update status project using PUT from baseUrl locally', () => {
const url = `${service.url}/1`;
service.isDevelopment = true;
service.deleteProject(projectsList[0].id).subscribe((projectsInResponse) => {
expect(projectsInResponse.filter((project) => project.id !== projectsList[0].id).length).toEqual(2);
});
const deleteActivitiesRequest = httpMock.expectOne(url);
expect(deleteActivitiesRequest.request.method).toBe('PUT');
deleteActivitiesRequest.flush(projectsList);
});

});
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Project } from '../../../../../shared/models';
export class ProjectService {
projects: Project[] = [];
url = `${environment.timeTrackerApiUrl}/projects`;
isDevelopment = !environment.production;

constructor(private http: HttpClient) {}

Expand All @@ -32,10 +33,17 @@ export class ProjectService {

updateProject(projectData): Observable<any> {
const { id } = projectData;
if (this.isDevelopment) {
if (projectData.status === 'active') {
projectData.status = 1;
}
}
return this.http.put(`${this.url}/${id}`, projectData);
}

deleteProject(projectId: string): Observable<any> {
return this.http.delete(`${this.url}/${projectId}`);
return this.isDevelopment
? this.http.put(`${this.url}/${projectId}`, { status: 0 })
: this.http.delete(`${this.url}/${projectId}`);
}
}