diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index c7021809e..d2049f381 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -43,7 +43,11 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes'; import { OrderService } from './order.service'; -@Controller('order') +@Controller([ + 'activities', + /** @deprecated */ + 'order' +]) export class OrderController { public constructor( private readonly apiService: ApiService, diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts index 427386796..4d89cfbe1 100644 --- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts +++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts @@ -581,7 +581,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { }; this.dataService - .postOrder(activity) + .postActivity(activity) .pipe(takeUntil(this.unsubscribeSubject)) .subscribe(() => { this.router.navigate( diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts index cf7a41215..ca3f5b30d 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts @@ -334,7 +334,7 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit { .subscribe((activity: UpdateOrderDto) => { if (activity) { this.dataService - .putOrder(activity) + .putActivity(activity) .pipe(takeUntil(this.unsubscribeSubject)) .subscribe({ next: () => { @@ -385,7 +385,7 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit { .pipe(takeUntil(this.unsubscribeSubject)) .subscribe((transaction: CreateOrderDto | null) => { if (transaction) { - this.dataService.postOrder(transaction).subscribe({ + this.dataService.postActivity(transaction).subscribe({ next: () => { this.userService .get(true) diff --git a/libs/ui/src/lib/services/data.service.ts b/libs/ui/src/lib/services/data.service.ts index 37443cd20..62e7b6b4a 100644 --- a/libs/ui/src/lib/services/data.service.ts +++ b/libs/ui/src/lib/services/data.service.ts @@ -241,7 +241,7 @@ export class DataService { params = params.append('take', take); } - return this.http.get('/api/v1/order', { params }).pipe( + return this.http.get('/api/v1/activities', { params }).pipe( map(({ activities, count }) => { for (const activity of activities) { activity.createdAt = parseISO(activity.createdAt); @@ -253,14 +253,18 @@ export class DataService { } public fetchActivity(aActivityId: string) { - return this.http.get(`/api/v1/order/${aActivityId}`).pipe( - map((activity) => { - activity.createdAt = parseISO(activity.createdAt as unknown as string); - activity.date = parseISO(activity.date as unknown as string); + return this.http + .get(`/api/v1/activities/${aActivityId}`) + .pipe( + map((activity) => { + activity.createdAt = parseISO( + activity.createdAt as unknown as string + ); + activity.date = parseISO(activity.date as unknown as string); - return activity; - }) - ); + return activity; + }) + ); } public fetchDividends({ @@ -317,11 +321,11 @@ export class DataService { public deleteActivities({ filters }) { const params = this.buildFiltersAsQueryParams({ filters }); - return this.http.delete('/api/v1/order', { params }); + return this.http.delete('/api/v1/activities', { params }); } public deleteActivity(aId: string) { - return this.http.delete(`/api/v1/order/${aId}`); + return this.http.delete(`/api/v1/activities/${aId}`); } public deleteBenchmark({ dataSource, symbol }: AssetProfileIdentifier) { @@ -761,6 +765,10 @@ export class DataService { ); } + public postActivity(aOrder: CreateOrderDto) { + return this.http.post('/api/v1/activities', aOrder); + } + public postApiKey() { return this.http.post('/api/v1/api-keys', {}); } @@ -783,10 +791,6 @@ export class DataService { return this.http.post(url, marketData); } - public postOrder(aOrder: CreateOrderDto) { - return this.http.post('/api/v1/order', aOrder); - } - public postTag(aTag: CreateTagDto) { return this.http.post(`/api/v1/tags`, aTag); } @@ -807,6 +811,10 @@ export class DataService { return this.http.put(`/api/v1/account/${aAccount.id}`, aAccount); } + public putActivity(aOrder: UpdateOrderDto) { + return this.http.put(`/api/v1/activities/${aOrder.id}`, aOrder); + } + public putAdminSetting(key: string, aData: UpdatePropertyDto) { return this.http.put(`/api/v1/admin/settings/${key}`, aData); } @@ -822,10 +830,6 @@ export class DataService { ); } - public putOrder(aOrder: UpdateOrderDto) { - return this.http.put(`/api/v1/order/${aOrder.id}`, aOrder); - } - public putTag(aTag: UpdateTagDto) { return this.http.put(`/api/v1/tags/${aTag.id}`, aTag); }