Browse Source

Deprecate order endpoints in favor of activities endpoints

pull/6446/head
Thomas Kaul 1 month ago
parent
commit
2c6fccfd22
  1. 6
      apps/api/src/app/order/order.controller.ts
  2. 2
      apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
  3. 4
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  4. 30
      libs/ui/src/lib/services/data.service.ts

6
apps/api/src/app/order/order.controller.ts

@ -43,7 +43,11 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';
import { OrderService } from './order.service'; import { OrderService } from './order.service';
@Controller('order') @Controller([
'activities',
/** @deprecated */
'order'
])
export class OrderController { export class OrderController {
public constructor( public constructor(
private readonly apiService: ApiService, private readonly apiService: ApiService,

2
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 this.dataService
.postOrder(activity) .postActivity(activity)
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => { .subscribe(() => {
this.router.navigate( this.router.navigate(

4
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -334,7 +334,7 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit {
.subscribe((activity: UpdateOrderDto) => { .subscribe((activity: UpdateOrderDto) => {
if (activity) { if (activity) {
this.dataService this.dataService
.putOrder(activity) .putActivity(activity)
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe({ .subscribe({
next: () => { next: () => {
@ -385,7 +385,7 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit {
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe((transaction: CreateOrderDto | null) => { .subscribe((transaction: CreateOrderDto | null) => {
if (transaction) { if (transaction) {
this.dataService.postOrder(transaction).subscribe({ this.dataService.postActivity(transaction).subscribe({
next: () => { next: () => {
this.userService this.userService
.get(true) .get(true)

30
libs/ui/src/lib/services/data.service.ts

@ -241,7 +241,7 @@ export class DataService {
params = params.append('take', take); params = params.append('take', take);
} }
return this.http.get<any>('/api/v1/order', { params }).pipe( return this.http.get<any>('/api/v1/activities', { params }).pipe(
map(({ activities, count }) => { map(({ activities, count }) => {
for (const activity of activities) { for (const activity of activities) {
activity.createdAt = parseISO(activity.createdAt); activity.createdAt = parseISO(activity.createdAt);
@ -253,9 +253,13 @@ export class DataService {
} }
public fetchActivity(aActivityId: string) { public fetchActivity(aActivityId: string) {
return this.http.get<ActivityResponse>(`/api/v1/order/${aActivityId}`).pipe( return this.http
.get<ActivityResponse>(`/api/v1/activities/${aActivityId}`)
.pipe(
map((activity) => { map((activity) => {
activity.createdAt = parseISO(activity.createdAt as unknown as string); activity.createdAt = parseISO(
activity.createdAt as unknown as string
);
activity.date = parseISO(activity.date as unknown as string); activity.date = parseISO(activity.date as unknown as string);
return activity; return activity;
@ -317,11 +321,11 @@ export class DataService {
public deleteActivities({ filters }) { public deleteActivities({ filters }) {
const params = this.buildFiltersAsQueryParams({ filters }); const params = this.buildFiltersAsQueryParams({ filters });
return this.http.delete<any>('/api/v1/order', { params }); return this.http.delete<any>('/api/v1/activities', { params });
} }
public deleteActivity(aId: string) { public deleteActivity(aId: string) {
return this.http.delete<any>(`/api/v1/order/${aId}`); return this.http.delete<any>(`/api/v1/activities/${aId}`);
} }
public deleteBenchmark({ dataSource, symbol }: AssetProfileIdentifier) { public deleteBenchmark({ dataSource, symbol }: AssetProfileIdentifier) {
@ -761,6 +765,10 @@ export class DataService {
); );
} }
public postActivity(aOrder: CreateOrderDto) {
return this.http.post<OrderModel>('/api/v1/activities', aOrder);
}
public postApiKey() { public postApiKey() {
return this.http.post<ApiKeyResponse>('/api/v1/api-keys', {}); return this.http.post<ApiKeyResponse>('/api/v1/api-keys', {});
} }
@ -783,10 +791,6 @@ export class DataService {
return this.http.post<MarketData>(url, marketData); return this.http.post<MarketData>(url, marketData);
} }
public postOrder(aOrder: CreateOrderDto) {
return this.http.post<OrderModel>('/api/v1/order', aOrder);
}
public postTag(aTag: CreateTagDto) { public postTag(aTag: CreateTagDto) {
return this.http.post<Tag>(`/api/v1/tags`, aTag); return this.http.post<Tag>(`/api/v1/tags`, aTag);
} }
@ -807,6 +811,10 @@ export class DataService {
return this.http.put<UserItem>(`/api/v1/account/${aAccount.id}`, aAccount); return this.http.put<UserItem>(`/api/v1/account/${aAccount.id}`, aAccount);
} }
public putActivity(aOrder: UpdateOrderDto) {
return this.http.put<UserItem>(`/api/v1/activities/${aOrder.id}`, aOrder);
}
public putAdminSetting(key: string, aData: UpdatePropertyDto) { public putAdminSetting(key: string, aData: UpdatePropertyDto) {
return this.http.put<void>(`/api/v1/admin/settings/${key}`, aData); return this.http.put<void>(`/api/v1/admin/settings/${key}`, aData);
} }
@ -822,10 +830,6 @@ export class DataService {
); );
} }
public putOrder(aOrder: UpdateOrderDto) {
return this.http.put<UserItem>(`/api/v1/order/${aOrder.id}`, aOrder);
}
public putTag(aTag: UpdateTagDto) { public putTag(aTag: UpdateTagDto) {
return this.http.put<Tag>(`/api/v1/tags/${aTag.id}`, aTag); return this.http.put<Tag>(`/api/v1/tags/${aTag.id}`, aTag);
} }

Loading…
Cancel
Save