Merge pull request #14 from PerfectFit-project/248-onboarding

248 onboarding

Author: wbaccinelli

niceday-api/api/openapi.yaml

@@ -67,6 +67,21 @@ paths:
         "200":
           description: Success
       x-swagger-router-controller: UserData
+  /connectionrequests:
+    get:
+      summary: Get the pending connection requests
+      operationId: getConnectionRequests
+      responses:
+        "200":
+          description: Success
+          content:
+            application/json:
+              schema:
+                description: List of connection requests
+                type: array
+                items:
+                  $ref: '#/components/schemas/ConnectionRequest'
+      x-swagger-router-controller: ConnectionRequests
   /usertrackers/smoking/{userId}:
     get:
       summary: Get smoking tracker data for specific user
@@ -106,6 +121,26 @@ paths:
                 items:
                   $ref: '#/components/schemas/SmokingTrackerEntry'
       x-swagger-router-controller: UserTrackers
+  /acceptconnection:
+    post:
+      summary: Accept the connection request specified in the body
+      operationId: setAcceptConnection
+      requestBody:
+        content:
+          application/json:
+            schema:
+              required:
+                - invitation_id
+              type: object
+              properties:
+                invitation_id:
+                  type: string
+                  description: ID of the connection request
+                  example: "38527"
+      responses:
+        "200":
+          description: Success
+      x-swagger-router-controller: ConnectionRequests
   /usertrackers/statuses:
     post:
       summary: Enable or disable trackers for a user
@@ -319,3 +354,63 @@ components:
           description: after
           example: 60
 
+    ConnectionRequest:
+      description: Connection request object
+      type: object
+      properties:
+        id:
+          type: integer
+          description: User ID
+          example: 38527
+        hashId:
+          type: string
+          description: Uhashed ID
+          example: '9o0xZ0JGRauKnlY31dYJjA'
+        firstName: 
+          type: string
+          description: First Name
+          example: 'Name'
+        lastName: 
+          type: string
+          description: Last Name
+          example: 'Last Name'
+        bio: 
+          type: string
+          description: Bio
+          example: ''
+        location:
+          type: string
+          description: Location
+          example: ''
+        gender: 
+          type: string
+          description: Gender
+          example: 'NOT_DEFINED'
+        birthDate: 
+          type: string
+          description: birth date
+          example: '1970-01-01'
+        email: 
+          type: string
+          description: email
+          example: 'email@mail.com'
+        registerDate: 
+          type: string
+          description: Register Date
+          example: '2023-01-26T16:16:35.575Z'
+        image: 
+          type: string
+          description: User ID
+          example: 'https://image.jpg'
+        invitationCreatedAt: 
+          type: string
+          description: User ID
+          example: '2023-06-06T11:37:57.700Z'
+        invitationId: 
+          type: integer
+          description: Invitation ID
+          example: 18994,
+        proposedBy: 
+          type: string
+          description: User ID
+          example: ''

niceday-api/controllers/ConnectionRequests.js

@@ -0,0 +1,24 @@
+const utils = require('../utils/writer.jsx');
+const ConnectionRequest = require('../service/ConnectionRequestsService');
+
+// eslint-disable-next-line no-unused-vars
+module.exports.getConnectionRequests = function getConnectionRequests(req, res, next, body) {
+  ConnectionRequest.getConnectionRequests(req)
+    .then((response) => {
+      utils.writeJson(res, response);
+    })
+    .catch((response) => {
+      utils.writeJson(res, utils.respondWithCode(500, response));
+    });
+};
+
+// eslint-disable-next-line no-unused-vars
+module.exports.setAcceptConnection = function setAcceptConnection(req, res, next, body) {
+  ConnectionRequest.setAcceptConnection(req, body)
+    .then((response) => {
+      utils.writeJson(res, response);
+    })
+    .catch((response) => {
+      utils.writeJson(res, utils.respondWithCode(500, response));
+    });
+};

niceday-api/index.test.js

@@ -17,6 +17,14 @@ const MOCK_TRACKER_REMINDER_RESPONSE = {
   owner: NICEDAY_TEST_USER_ID,
   startTime: '2022-05-17T15:10:00.000Z',
 };
+const MOCK_REQUEST_ID = '18981';
+const MOCK_PENDING_REQUESTS = [
+  {
+    id: NICEDAY_TEST_USER_ID,
+    invitationId: MOCK_REQUEST_ID,
+  },
+];
+const MOCK_ACCEPT_REQUESTS = {};
 
 // Contains all tests which require a mocked Senseserver
 describe('Tests on niceday-api server using mocked goalie-js', () => {
@@ -41,6 +49,12 @@ describe('Tests on niceday-api server using mocked goalie-js', () => {
         getConnectedContacts: () => new Promise((resolve) => {
           resolve(MOCK_USER_DATA);
         }),
+        getRequestedContacts: () => new Promise((resolve) => {
+          resolve(MOCK_PENDING_REQUESTS);
+        }),
+        acceptInvitation: () => new Promise((resolve) => {
+          resolve(MOCK_ACCEPT_REQUESTS);
+        }),
       })),
       Authentication: jest.fn().mockImplementation(() => ({
         login: () => new Promise((resolve) => {
@@ -136,9 +150,9 @@ describe('Tests on niceday-api server using mocked goalie-js', () => {
   });
 
   it('Test getting smoking tracker data with /usertrackers/smoking/ endpoint', () => {
-  /*
-    Sends a GET to the /usertrackers/smoking endpoint.
-  */
+    /*
+      Sends a GET to the /usertrackers/smoking endpoint.
+    */
 
     const urlreq = `http://localhost:${NICEDAY_TEST_SERVERPORT}/usertrackers/smoking/${NICEDAY_TEST_USER_ID}?`;
     const params = new URLSearchParams({
@@ -187,4 +201,43 @@ describe('Tests on niceday-api server using mocked goalie-js', () => {
         throw new Error(`Error during fetch: ${error}`);
       });
   });
+
+  it('Test getting pending contact request with /connectionrequests endpoint', () => {
+    /*
+      Sends a GET to the /connectionrequests endpoint.
+    */
+
+    const urlreq = `http://localhost:${NICEDAY_TEST_SERVERPORT}/connectionrequests`;
+    return fetch(urlreq)
+      .then((response) => response.json())
+      .then((responseBody) => {
+        expect(responseBody).toEqual(MOCK_PENDING_REQUESTS);
+      })
+      .catch((error) => {
+        throw new Error(`Error during fetch: ${error}`);
+      });
+  });
+
+  it('Test accepting contact request /acceptconnection endpoint', () => {
+    /*
+      Sends a POST to the /acceptconnection endpoint.
+    */
+
+    const urlreq = `http://localhost:${NICEDAY_TEST_SERVERPORT}/acceptconnection`;
+    const data = JSON.stringify({
+      invitation_id: MOCK_REQUEST_ID,
+    });
+    return fetch(urlreq, {
+      method: 'post',
+      headers: { 'Content-Type': 'application/json' },
+      body: data,
+    })
+      .then((response) => response.json())
+      .then((responseBody) => {
+        expect(responseBody).toEqual(MOCK_ACCEPT_REQUESTS);
+      })
+      .catch((error) => {
+        throw new Error(`Error during fetch: ${error}`);
+      });
+  });
 });

niceday-api/service/ConnectionRequestsService.js

@@ -0,0 +1,45 @@
+const { Contacts, SenseServer } = require('@sense-os/goalie-js');
+require('isomorphic-fetch');
+
+const { ENVIRONMENT } = process.env;
+let selectedServer;
+
+if (ENVIRONMENT === 'dev') {
+  selectedServer = SenseServer.Alpha;
+} else {
+  selectedServer = SenseServer.Production;
+}
+
+const contacts = new Contacts(selectedServer);
+
+/**
+ * Get the pending connection requests.
+ * Returns the JSON as received from the SenseServer.
+ * @param req - The node.js express request object
+ * @param body - The node.js express body object.
+ * */
+exports.getConnectionRequests = (req) => new Promise((resolve, reject) => {
+  contacts.getRequestedContacts(req.app.get('token'))
+    .then((result) => {
+      resolve(result);
+    })
+    .catch((error) => {
+      reject(Error(`Error during connections requests retrieval: ${error}`));
+    });
+});
+
+/**
+ * Accept the pending connection request indentified by the id in the request body.
+ * Returns the JSON as received from the SenseServer.
+ * @param req - The node.js express request object
+ * @param body - The node.js express body object. Should contain invitation id.
+ * */
+exports.setAcceptConnection = (req, body) => new Promise((resolve, reject) => {
+  contacts.acceptInvitation(req.app.get('token'), body.invitation_id)
+    .then((result) => {
+      resolve(result);
+    })
+    .catch((error) => {
+      reject(Error(`Error during connections requests acceptance: ${error}`));
+    });
+});