Merge pull request #8 from PerfectFit-project/285-file-sharing

285 file sharing
PerfectFit-project · Nov 9, 2022 · ccd1f6b · ccd1f6b
2 parents 149e921 + 2853e81
commit ccd1f6b
Show file tree

Hide file tree

Showing 14 changed files with 329 additions and 52 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,8 +24,10 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: 15.x
-    - run: git config --global url."https://${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}@github.com/".insteadOf ssh://[email protected]/
-
+    - name: Add private key for goaliejs deployment
+      uses: webfactory/[email protected]
+      with:
+        ssh-private-key: ${{ secrets.GOALIEJS_PRIVATE_PULL_KEY }}
     - run: npm ci --prefix niceday-api
     - run: npm run build --if-present --prefix niceday-api
     - name: Test niceday-api

diff --git a/.github/workflows/ghcr_build_and_push_with_goaliejs.yml b/.github/workflows/ghcr_build_and_push_with_goaliejs.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: webfactory/ssh-agent@v0.5.4
+      - uses: webfactory/ssh-agent@v0.6.0
         with:
           ssh-private-key: ${{ secrets.goaliejskey }}
       - name: Fetch goaliejs

diff --git a/niceday-api/api/openapi.yaml b/niceday-api/api/openapi.yaml
@@ -23,6 +23,34 @@ paths:
         "200":
           description: Success
       x-swagger-router-controller: Messages
+  /files:
+    post:
+      tags:
+      - files
+      summary: Upload a file
+      operationId: uploadFile
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                receiver_id:
+                  type: string
+                  description: ID of the user we want to upload the file to
+                  example: 38527
+                file_path:
+                  type: string
+                  description: Local path to the file we want to upload
+                  example: C:/username/pathtofile
+                file:
+                  type: string
+                  format: binary
+
+      responses:
+        "200":
+          description: Success
+      x-swagger-router-controller: FileSharing
   /userdata/{userId}:
     get:
       summary: Get user data by ID
@@ -107,10 +135,22 @@ paths:
 
 components:
   schemas:
+    FileObject:
+      properties:
+        receiver_id:
+          type: integer
+          description: ID of the user we want to upload the file to
+          example: 38527
+        file_path:
+          type: string
+          description: Local path to the file we want to upload
+          example: C:/username/pathtofile
+      description: A file to upload.
+
     Message:
       required:
-      - recipient_id
-      - text
+        - recipient_id
+        - text
       type: object
       properties:
         recipient_id:

diff --git a/niceday-api/controllers/FileSharing.js b/niceday-api/controllers/FileSharing.js
@@ -0,0 +1,12 @@
+const utils = require('../utils/writer.jsx');
+const FileSharing = require('../service/FilesSharingService');
+
+module.exports.uploadFile = function uploadFile(req, res, next, body) {
+  FileSharing.uploadFile(req, body)
+    .then((response) => {
+      utils.writeJson(res, response);
+    })
+    .catch((response) => {
+      utils.writeJson(res, response);
+    });
+};
diff --git a/niceday-api/index.test.js b/niceday-api/index.test.js
@@ -37,8 +37,8 @@ describe('Tests on niceday-api server using mocked goalie-js', () => {
       SenseServerEnvironment: () => ({
         Alpha: undefined,
       }),
-      SenseNetwork: jest.fn().mockImplementation(() => ({
-        getContact: () => new Promise((resolve) => {
+      Contacts: jest.fn().mockImplementation(() => ({
+        getConnectedContacts: () => new Promise((resolve) => {
           resolve(MOCK_USER_DATA);
         }),
       })),