Fix: refactor order, remove open orders element on ws event

src/containers/OpenOrders/OpenOrders.test.tsx

@@ -22,11 +22,11 @@ const openOrdersData: OrderCommon[] = [
     {
         id: 131,
         side: 'sell',
-        price: 104.4313,
+        price: '104.4313',
         created_at: '2019-01-31T21:14:04+01:00',
-        remaining_volume: 0,
-        origin_volume: 10,
-        executed_volume: 10,
+        remaining_volume: '0',
+        origin_volume: '10',
+        executed_volume: '10',
         state: 'wait',
         market: 'ethusd',
     },

src/modules/public/ranger/sagas/rangerSaga.test.ts

@@ -582,6 +582,7 @@ describe('Ranger module', () => {
                 at: 1546605232,
                 market: 'eurbtc',
                 kind: 'bid',
+                side: 'buy',
                 price: '1.17',
                 state: 'wait',
                 remaining_volume: '0.1',
@@ -652,6 +653,7 @@ describe('Ranger module', () => {
                 at: 1546605232,
                 market: 'eurbtc',
                 kind: 'bid',
+                side: 'buy',
                 price: '1.17',
                 state: 'done',
                 remaining_volume: '0.0',

src/modules/types.ts

@@ -13,62 +13,30 @@ export type OrderType = 'limit' | 'market';
 export type OrderKind = 'bid' | 'ask';
 
 export interface OrderCommon {
-    price: number;
-    created_at: string;
+    price: string;
     state: OrderStatus;
-    remaining_volume: number;
-    origin_volume: number;
-    executed_volume: number;
+    remaining_volume: string;
+    origin_volume: string;
+    executed_volume?: string;
     side: OrderSide;
     market: string;
     ord_type?: OrderType;
-    avg_price?: number;
+    avg_price?: string;
     volume?: number;
+    created_at?: string;
     updated_at?: string;
     confirmed?: boolean;
     uuid?: string;
     id?: number;
+    kind?: OrderKind;
+    trades_count?: number;
 }
 
-/*
-** example: {"id":10666,"side":"buy","ord_type":"limit","price":"0.003","avg_price":"0.003","state":"wait","market":"kyneth","created_at":"2019-02-15T09:46:21+01:00","volume":"10.0","remaining_volume":"9.9","executed_volume":"0.1","trades_count":1}
-*/
-export interface OrderAPI {
-    side: OrderSide;
-    ord_type: OrderType;
-    price: string;
-    state: OrderStatus;
-    market: string;
-    created_at: string;
-    remaining_volume: string;
-    executed_volume: string;
-    origin_volume: string;
-    avg_price: string;
-    updated_at?: string;
-    confirmed?: boolean;
-    uuid?: string;
-    id?: number;
-}
-
-/*
-** example: {"order":{"id":10666,"at":1550220381,"market":"kyneth","kind":"bid","price":"0.003","state":"wait","volume":"9.9","origin_volume":"10.0"}}
-*/
-export interface OrderEvent {
+export interface OrderEvent extends OrderCommon {
     at: number;
-    market: string;
-    kind: OrderKind;
-    price: string;
-    state: OrderStatus;
-    origin_volume: string;
-    remaining_volume: string;
-    ord_type?: OrderType;
-    updated_at?: string;
-    confirmed?: boolean;
-    uuid?: string;
-    id?: number;
+    order_type?: OrderType;
 }
 
-
 export interface MarketUpdateEvent {
     asks: Array<[number, number]>;
     bids: Array<[number, number]>;

src/modules/user/openOrders/actions.test.ts

@@ -1,4 +1,4 @@
-import { OrderAPI, OrderCommon, OrderEvent } from '../../types';
+import { OrderCommon, OrderEvent } from '../../types';
 import * as actions from './actions';
 import { OPEN_ORDERS_APPEND, OPEN_ORDERS_CANCEL_DATA, OPEN_ORDERS_CANCEL_ERROR, OPEN_ORDERS_CANCEL_FETCH, OPEN_ORDERS_DATA, OPEN_ORDERS_ERROR, OPEN_ORDERS_FETCH, OPEN_ORDERS_RESET, OPEN_ORDERS_UPDATE } from './constants';
 
@@ -33,7 +33,7 @@ describe('Open Orders actions', () => {
     });
 
     it('should check userOpenOrdersAppend action creator', () => {
-        const payload: OrderAPI = {
+        const payload: OrderCommon = {
             id: 162,
             confirmed: true,
             side: 'buy',
@@ -52,7 +52,7 @@ describe('Open Orders actions', () => {
     });
 
     it('should check userOpenOrdersAppend UUID action creator', () => {
-        const payload: OrderAPI = {
+        const payload: OrderCommon = {
             uuid: '3ea3e2e4-5d29-11ea-a122-0242ac140008',
             confirmed: false,
             side: 'buy',
@@ -75,6 +75,7 @@ describe('Open Orders actions', () => {
             id: 1,
             at: 123123123,
             market: 'ethusd',
+            side: 'buy',
             kind: 'bid',
             price: '0.3',
             state: 'wait',
@@ -94,12 +95,12 @@ describe('Open Orders actions', () => {
         const orderToCancel: OrderCommon = {
             id: 162,
             side: 'buy',
-            price: 0.3,
+            price: '0.3',
             state:'wait',
             created_at: '2018-11-29T16:54:46+01:00',
-            remaining_volume: 123.1234,
-            origin_volume: 123.1234,
-            executed_volume: 0,
+            remaining_volume: '123.1234',
+            origin_volume: '123.1234',
+            executed_volume: '0',
             market: 'ethusd',
         };
 

src/modules/user/openOrders/actions.ts

@@ -1,5 +1,5 @@
 import { Market } from '../../public/markets';
-import { OrderAPI, OrderCommon, OrderEvent } from '../../types';
+import { OrderCommon, OrderEvent } from '../../types';
 import {
     OPEN_ORDERS_APPEND,
     OPEN_ORDERS_CANCEL_DATA,
@@ -22,7 +22,7 @@ export interface UserOpenOrdersFetch {
 
 export interface UserOpenOrdersData {
     type: typeof OPEN_ORDERS_DATA;
-    payload: OrderAPI[];
+    payload: OrderCommon[];
 }
 
 export interface UserOpenOrdersError {
@@ -36,7 +36,7 @@ export interface UserOpenOrdersUpdate {
 
 export interface UserOpenOrdersAppend {
     type: typeof OPEN_ORDERS_APPEND;
-    payload: OrderAPI;
+    payload: OrderCommon;
 }
 
 export interface UserOpenOrdersReset {

src/modules/user/openOrders/helpers.ts

@@ -1,71 +1,11 @@
-import { kindToMakerType } from '../../helpers';
-import { OrderAPI, OrderCommon, OrderEvent } from '../../types';
-
-export const convertOrderAPI = (order: OrderAPI): OrderCommon => {
-    const {
-        id,
-        uuid,
-        side,
-        price,
-        state,
-        created_at,
-        remaining_volume,
-        origin_volume,
-        executed_volume,
-        market,
-        ord_type,
-        avg_price,
-        updated_at,
-        confirmed,
-    } = order;
-
-    return {
-        id,
-        uuid,
-        side,
-        price: Number(price),
-        state,
-        created_at,
-        origin_volume: Number(origin_volume),
-        remaining_volume: Number(remaining_volume),
-        executed_volume: Number(executed_volume),
-        market,
-        ord_type,
-        avg_price: Number(avg_price),
-        updated_at,
-        confirmed,
-    };
-};
+import { OrderCommon, OrderEvent } from '../../types';
 
 export const convertOrderEvent = (orderEvent: OrderEvent): OrderCommon => {
-    const {
-        id,
-        uuid,
-        at,
-        kind,
-        price,
-        state,
-        remaining_volume,
-        origin_volume,
-        market, ord_type,
-        updated_at,
-        confirmed,
-    } = orderEvent;
+    const { at, ...order } = orderEvent;
 
     return {
-        id,
-        uuid,
-        side: kindToMakerType(kind),
-        price: Number(price),
-        state,
-        remaining_volume: Number(remaining_volume),
-        executed_volume: Number(origin_volume) - Number(remaining_volume),
-        origin_volume: Number(origin_volume),
-        created_at: new Date(Number(at) * 1000).toISOString(),
-        market,
-        ord_type,
-        updated_at,
-        confirmed,
+        ...order,
+        ord_type: order.order_type || order.ord_type,
     };
 };
 
@@ -86,11 +26,15 @@ export const insertOrUpdate = (list: OrderCommon[], order: OrderCommon): OrderCo
                 return item;
             });
         default:
-            return list.reduce((memo: OrderCommon[], item: OrderCommon): OrderCommon[] => {
+            return list.reduce((memo: OrderCommon[], item: OrderCommon, i: number): OrderCommon[] => {
                 if ((item.uuid && item.uuid !== uuid) || item.id !== id) {
                     memo.push(item);
                 }
 
+                if (item.uuid && item.uuid === uuid) {
+                    memo.splice(i, 1);
+                }
+
                 return memo;
             }, []);
     }

src/modules/user/openOrders/reducer.test.ts

@@ -1,7 +1,6 @@
-import { OrderAPI, OrderCommon, OrderEvent } from '../../types';
+import { OrderCommon, OrderEvent } from '../../types';
 import * as actions from './actions';
 import {
-    convertOrderAPI,
     convertOrderEvent,
     insertOrUpdate,
 } from './helpers';
@@ -58,7 +57,7 @@ describe('Open Orders reducer', () => {
     });
 
     describe('USER_OPEN_ORDERS_APPEND', () => {
-        const newOrder: OrderAPI = {
+        const newOrder: OrderCommon = {
             id: 162,
             confirmed: true,
             side: 'buy',
@@ -76,7 +75,7 @@ describe('Open Orders reducer', () => {
         it('inserts order', () => {
             const expectedState = {
                 ...initialOpenOrdersState,
-                list: [convertOrderAPI(newOrder)],
+                list: [newOrder],
             };
             expect(
                 openOrdersReducer(
@@ -88,7 +87,7 @@ describe('Open Orders reducer', () => {
     });
 
     describe('USER_OPEN_ORDERS_APPEND UUID', () => {
-        const newOrder: OrderAPI = {
+        const newOrder: OrderCommon = {
             uuid: '3ea3e2e4-5d29-11ea-a122-0242ac140008',
             confirmed: false,
             side: 'buy',
@@ -106,7 +105,7 @@ describe('Open Orders reducer', () => {
         it('inserts order', () => {
             const expectedState = {
                 ...initialOpenOrdersState,
-                list: [convertOrderAPI(newOrder)],
+                list: [newOrder],
             };
             expect(
                 openOrdersReducer(
@@ -123,6 +122,7 @@ describe('Open Orders reducer', () => {
             id: 162,
             at: 1550180631,
             market: 'ethusd',
+            side: 'buy',
             kind: 'bid',
             price: '0.3',
             state: 'wait',
@@ -134,6 +134,7 @@ describe('Open Orders reducer', () => {
             uuid: '3ea3e2e4-5d29-11ea-a122-0242ac140008',
             at: 1550180631,
             market: 'ethusd',
+            side: 'buy',
             kind: 'bid',
             price: '0.3',
             state: 'wait',
@@ -144,12 +145,12 @@ describe('Open Orders reducer', () => {
         const newOrderCommon: OrderCommon = {
             id: 162,
             side: 'buy',
-            price: 0.3,
+            price: '0.3',
             state:'wait',
             created_at: '2018-11-29T16:54:46+01:00',
-            remaining_volume: 123.1234,
-            origin_volume: 123.1234,
-            executed_volume: 0,
+            remaining_volume: '123.1234',
+            origin_volume: '123.1234',
+            executed_volume: '0',
             market: 'ethusd',
         };
 
@@ -266,12 +267,12 @@ describe('Open Orders reducer', () => {
         const orderToCancel: OrderCommon = {
             id: 162,
             side: 'buy',
-            price: 0.3,
+            price: '0.3',
             state:'wait',
             created_at: '2018-11-29T16:54:46+01:00',
-            remaining_volume: 123.1234,
-            origin_volume: 123.1234,
-            executed_volume: 0,
+            remaining_volume: '123.1234',
+            origin_volume: '123.1234',
+            executed_volume: '0',
             market: 'ethusd',
         };
 

src/modules/user/openOrders/reducer.ts

@@ -14,7 +14,6 @@ import {
     OPEN_ORDERS_UPDATE,
 } from './constants';
 import {
-    convertOrderAPI,
     convertOrderEvent,
     insertIfNotExisted,
     insertOrUpdate,
@@ -42,7 +41,7 @@ export const openOrdersReducer = (
         case OPEN_ORDERS_FETCH:
             return { ...state, fetching: true };
         case OPEN_ORDERS_DATA:
-            return { ...state, fetching: false, list: sliceArray(action.payload.map(convertOrderAPI), defaultStorageLimit()) };
+            return { ...state, fetching: false, list: sliceArray(action.payload, defaultStorageLimit()) };
         case OPEN_ORDERS_UPDATE:
             return {
                 ...state,
@@ -51,7 +50,7 @@ export const openOrdersReducer = (
         case OPEN_ORDERS_ERROR:
             return { ...state, fetching: false, list: [] };
         case OPEN_ORDERS_APPEND:
-            return { ...state, list: sliceArray(insertIfNotExisted(state.list, convertOrderAPI(action.payload)), defaultStorageLimit()) };
+            return { ...state, list: sliceArray(insertIfNotExisted(state.list, action.payload), defaultStorageLimit()) };
         case OPEN_ORDERS_RESET:
             return initialOpenOrdersState;
         case OPEN_ORDERS_CANCEL_FETCH: