Solved merge conflicts

Author: grafitto

packages/client/README.md

@@ -89,6 +89,23 @@ const entity = {
 const updatedEntity = await project.entities.patch(entity);
 ```
 
+ Dates created with the `Date()` function are expanded as `text`. and those created with `new Date()` are correctly expanded to `datetime`.
+
+#### `project.entities.put(entity: Entity)`
+
+Updates an entity by completely replacing its data.
+
+```javascript
+const entity = {
+  _id: 'someid', // The id of the entity to be updated
+  data: {
+    name: 'My name'
+  }
+}
+
+const changedEntity = await project.entities.put(entity);
+
+```
 #### `project.entities.get(id: string)`
 
 Fetches an entity by ID.

packages/client/src/api/api.ts

@@ -3,7 +3,7 @@ import axios, { AxiosInstance } from 'axios';
 export function getApiClient (baseUrl: string, apiKey: string): AxiosInstance {
   const axiosInstance = axios.create({
     baseURL: baseUrl
-  })
-  axiosInstance.defaults.headers['Authorization'] = `apikey ${apiKey}`
-  return axiosInstance
+  });
+  axiosInstance.defaults.headers['Authorization'] = `apikey ${apiKey}`;
+  return axiosInstance;
 }

packages/client/src/client/client.ts

@@ -23,7 +23,7 @@ export class Client {
     }, opts);
     let baseUrl = _opts.environment === 'production' ? PRODUCTION_URL : STAGING_URL;
     baseUrl = _opts.baseUrl || baseUrl;
-    const apiKey = `${_opts.keyId}:${_opts.keySecret}` 
+    const apiKey = `${_opts.keyId}:${_opts.keySecret}`;
     this._apiClient = getApiClient(baseUrl, apiKey);
   }
 

packages/client/src/project/entities.ts

@@ -23,6 +23,16 @@ export function getProjectEntities (projectId: string, apiClient: AxiosInstance)
       const returnedEntity = res.data;
       return wrapEntity(returnedEntity);
     },
+    async put(entity: Entity): Promise<WrappedEntity> {
+      const _entity = { ...entity }; // Make a shallow copy
+      const entityId = _entity._id;
+      delete _entity._id;
+      const expandedEntity = expandEntity(_entity);
+      const res = await apiClient.put<ApiEntity>(
+        `/projects/${projectId}/entities/${entityId}`, expandedEntity);
+      const returnedEntity = res.data;
+      return wrapEntity(returnedEntity);
+    },
     async create(entity: Entity): Promise<WrappedEntity> {
       const expandedEntity = expandEntity(entity);
       const res = await apiClient.post<ApiEntity>(

packages/client/src/project/tests/entities.test.ts

@@ -131,13 +131,40 @@ describe('Project Entities', () => {
       }
       it('should call PATCH /projects/:pid/entities/:eid endpoint with entity', async () => {
         const entity = { ...userEntity };
-        entity['_id'] = 'entity1';
-        const expectedEntity = dataHelpers.expandEntity(entity);
-        const frozen = Object.freeze(entity);
-        await callMockUpdate(frozen);
-        expect(apiClient.patch).toHaveBeenCalledWith(
-          '/projects/project1/entities/entity1', expectedEntity);
+          entity['_id'] = 'entity1';
+          const expectedEntity = dataHelpers.expandEntity(entity);
+          const frozen = Object.freeze(entity);
+          await callMockUpdate(frozen);
+          expect(apiClient.patch).toHaveBeenCalledWith(
+            '/projects/project1/entities/entity1', expectedEntity);
       });
     });
+      describe('put', () => {
+        const userEntity = {
+          data: {
+            name: 'someone 1'
+          },
+          tags: []
+        };
+        let apiClient: AxiosInstance;
+        async function callMockPut (entity: any): Promise<dataHelpers.WrappedEntity> {
+          apiClient = api.getApiClient('http://baseurl', 'somekey');
+          jest.spyOn(apiClient, 'put').mockReturnValue(Promise.resolve({ data: 
+            { entity } }));
+          jest.spyOn(dataHelpers, 'wrapEntity');
+          const project = getProjectApi('project1', apiClient);
+          const ent = await project.entities.put(entity);
+          return ent;
+        }
+        it('should call PUT /projects/:pid/entities/:eid endpoint with entity', async () => {
+          const entity = { ...userEntity };
+          entity['_id'] = 'entity1';
+          const expectedEntity = dataHelpers.expandEntity(entity);
+          const frozen = Object.freeze(entity);
+          await callMockPut(frozen);
+          expect(apiClient.put).toHaveBeenCalledWith(
+            '/projects/project1/entities/entity1', expectedEntity);
+        });
+    });
   }); 
 });

packages/client/src/types.ts

@@ -11,6 +11,7 @@ export interface ProjectEntities {
   query(query?: Query): Promise<WrappedEntity[]>;
   create(entity: Entity): Promise<WrappedEntity>;
   update(entity: Entity): Promise<WrappedEntity>;
+  put(entity: Entity): Promise<WrappedEntity>;
 }
 
 export interface ProjectFiles {