Deposit files works for invenio

.invenio/.gitignore

 __pycache__
+
+features.csv
\ No newline at end of file

.invenio/api_authentication/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9097"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/api_container/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9091"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/api_database/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9092"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/api_document/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9099"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/api_identifier/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9096"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/api_query/api/table_data_endpoint_api.py

@@ -259,7 +259,7 @@ class TableDataEndpointApi(object):
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD',
+            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET',
             path_params,
             query_params,
             header_params,
@@ -380,7 +380,7 @@ class TableDataEndpointApi(object):
         auth_settings = []  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET',
+            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD',
             path_params,
             query_params,
             header_params,

.invenio/api_query/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9093"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/api_table/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "http://localhost:9094"
+        self.host = "http://localhost:9095"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 

.invenio/analyze.ipynb → .invenio/deposit.ipynb

@@ -2,15 +2,11 @@
  "cells": [
   {
    "cell_type": "markdown",
+   "source": [],
    "metadata": {
-    "collapsed": true,
-    "pycharm": {
-     "name": "#%% md\n"
-    }
+    "collapsed": false
    },
-   "source": [
-    "# Test"
-   ]
+   "outputs": []
   }
  ],
  "metadata": {

.invenio/dev.py

 #!/usr/bin/env python3
-import json
-
+import re
+import csv
 import requests
 
-from api_authentication.api.authentication_endpoint_api import AuthenticationEndpointApi
-from api_authentication.api.user_endpoint_api import UserEndpointApi
-from api_container.api.container_endpoint_api import ContainerEndpointApi
-from api_database.api.container_database_endpoint_api import ContainerDatabaseEndpointApi
+doi = '10.5281/zenodo.5649276'
+headers = {
+    'Authorize': 'Bearer djCvqkoOW69keHajybZiwE8bBjyir2QSZOLKpAtc4S1Wp17KXgcHmMoWJwft' 
+}
 
-authentication = AuthenticationEndpointApi()
-user = UserEndpointApi()
-container = ContainerEndpointApi()
-database = ContainerDatabaseEndpointApi()
+# Resolve DOI
+response = requests.get('https://doi.org/' + doi)
+id = re.findall('/([a-z0-9-]+)$', response.url)[0]
+host = re.findall('^https?:\/\/([a-z0-9]+\.[a-z]+)', response.url)[0]
+print("Resolved DOI to", host, "and record id", id)
 
-# # Create account
-# response = user.register({
-#     'username': 'mweise',
-#     'password': 'fda',
-#     'email': 'martin.weise@tuwien.ac.at'
-# })
-# print('Created account with username %s' % response.username)
-#
-# # Create authentication
-# response = authentication.authenticate_user1({
-#     'username': 'mweise',
-#     'password': 'fda'
-# })
-# container.api_client.default_headers = {
-#     'Authorization': 'Bearer ' + response.token
-# }
-# database.api_client.default_headers = {
-#     'Authorization': 'Bearer ' + response.token
-# }
-#
-# # Create container
-# response = container.create1({
-#     'name': 'MIR ' + str(uuid.uuid1()),
-#     'repository': 'mariadb',
-#     'tag': '10.5'
-# })
-# cid = response.id
-# print('Created container with id %d' % cid)
-#
-# # Start container
-# response = container.modify({
-#     'action': 'START'
-# }, cid)
-# time.sleep(5)
-# print('Started container with id %d' % cid)
-#
-# # Create database
-# response = database.create({
-#     'name': 'MIR ' + str(uuid.uuid1()),
-#     'description': 'Music Information Retrieval',
-#     'is_public': True
-# }, cid)
-# dbid = response.id
-# print('Created database with id %d' % dbid)
+# Find files
+url = 'https://' + host + '/api/records/' + id
+response = requests.get(url, headers=headers)
+record = response.json()
 
-# Analyse Table
-response = requests.post('http://localhost:5000/api/analyse/determinedt', json={
-    'filepath': '/tmp/test.csv',
-})
-data = json.loads(response.content)
-print('Determined data types')
-print(response)
+# Write some .csv
+i = 0
+with open('./features.csv', 'w') as f:
+    writer = csv.writer(f)
+    writer.writerow(['key', 'size', 'link'])
+    for file in record['files']:
+        requests.get(file['links']['self'])
+        print("... feature extract from", file['links']['self'])
+        writer.writerow([file['key'], file['size'], file['links']['self']])
+        i += 1
+        if i > 10:
+            break
+print("Generated a feature .csv")

.invenio/feature_extract.ipynb

+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "collapsed": true,
+    "pycharm": {
+     "name": "#%% md\n"
+    }
+   },
+   "source": [
+    "# Feature Extraction & Deposit\n",
+    "\n",
+    "In this notebook we define an example of creating a database from a .csv and perform feature extraction of audio files. The APIs are auto-generated from the Swagger Endpoint documentations using [`generate.sh`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-docs/-/blob/master/swagger/generate.sh). Steps we perform:\n",
+    "\n",
+    "  1. Download a music file from a public repository\n",
+    "  2. Perform feature extraction\n",
+    "  3. Create an account at DBRepo\n",
+    "  4. Create an authentication token\n",
+    "  5. Create a mariadb container\n",
+    "  6. Start the mariadb container\n",
+    "  7. Create a database within the mariadb container\n",
+    "  8. Import the feature .csv (manually)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 20,
+   "outputs": [],
+   "source": [
+    "import os.path\n",
+    "import uuid\n",
+    "import time\n",
+    "import re\n",
+    "import csv\n",
+    "import requests as rq\n",
+    "from api_authentication.api.authentication_endpoint_api import AuthenticationEndpointApi\n",
+    "from api_authentication.api.user_endpoint_api import UserEndpointApi\n",
+    "from api_container.api.container_endpoint_api import ContainerEndpointApi\n",
+    "from api_database.api.container_database_endpoint_api import ContainerDatabaseEndpointApi\n",
+    "from api_table.api.table_endpoint_api import TableEndpointApi\n",
+    "\n",
+    "authentication = AuthenticationEndpointApi()\n",
+    "user = UserEndpointApi()\n",
+    "container = ContainerEndpointApi()\n",
+    "database = ContainerDatabaseEndpointApi()\n",
+    "table = TableEndpointApi()\n",
+    "\n",
+    "doi = \"10.5281/zenodo.5649276\"\n",
+    "email = \"some@example.com\""
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 1. Download wav\n",
+    "\n",
+    "Resolve the DOI to URI"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 21,
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Resolved DOI to zenodo.org and record id 5649276\n"
+     ]
+    }
+   ],
+   "source": [
+    "response = rq.get(\"https://doi.org/\" + doi)\n",
+    "id = re.findall(\"/([a-z0-9-]+)$\", response.url)[0]\n",
+    "host = re.findall(\"^https?:\\/\\/([a-z0-9]+\\.[a-z]+)\", response.url)[0]\n",
+    "print(\"Resolved DOI to\", host, \"and record id\", id)"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 2. Perform feature extraction"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 22,
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0044_20200518133554_1_m4a_1.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0044_20200518133554_2_m4a_1.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200611134530_1_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200611134530_2_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200612072315_1_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200612072315_2_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200613082517_1_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200613082517_2_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200614080017_1_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200614080017_2_m4a_0.wav\n",
+      "... feature extract from https://zenodo.org/api/files/22d69a63-2aff-47ae-b818-be78a23e9889/colive.0066_20200615070238_1_m4a_0.wav\n",
+      "Generated a feature .csv in your home directory\n"
+     ]
+    }
+   ],
+   "source": [
+    "response = rq.get(\"https://\" + host + \"/api/records/\" + id)\n",
+    "record = response.json()\n",
+    "\n",
+    "i = 0\n",
+    "with open(os.path.expanduser(\"~/features.csv\"), \"w\") as f:\n",
+    "    writer = csv.writer(f)\n",
+    "    writer.writerow([\"key\", \"size\", \"link\"])\n",
+    "    for file in record[\"files\"]:\n",
+    "        rq.get(file[\"links\"][\"self\"])\n",
+    "        print(\"... feature extract from\", file[\"links\"][\"self\"])\n",
+    "        writer.writerow([file[\"key\"], file[\"size\"], file[\"links\"][\"self\"]])\n",
+    "        i += 1\n",
+    "        if i > 10:\n",
+    "            break\n",
+    "print(\"Generated a feature .csv in your home directory\")"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 3. Create an account at DBRepo"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 23,
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'authorities': [{'authority': 'ROLE_RESEARCHER'}],\n",
+      " 'containers': None,\n",
+      " 'databases': None,\n",
+      " 'email': 'martinweiseat@gmail.com',\n",
+      " 'firstname': None,\n",
+      " 'id': 2,\n",
+      " 'identifiers': None,\n",
+      " 'lastname': None,\n",
+      " 'titles_after': None,\n",
+      " 'titles_before': None,\n",
+      " 'username': 'user'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "response = user.register({\n",
+    "    \"username\": \"user\",\n",
+    "    \"password\": \"user\",\n",
+    "    \"email\": email\n",
+    "})\n",
+    "print(response)"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 4. Create an authentication token"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 24,
+   "outputs": [],
+   "source": [
+    "response = authentication.authenticate_user1({\n",
+    "    \"username\": \"user\",\n",
+    "    \"password\": \"user\"\n",
+    "})\n",
+    "container.api_client.default_headers = {\"Authorization\": \"Bearer \" + response.token}\n",
+    "database.api_client.default_headers = {\"Authorization\": \"Bearer \" + response.token}\n",
+    "table.api_client.default_headers = {\"Authorization\": \"Bearer \" + response.token}"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 5. Create a mariadb container"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 25,
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'hash': 'f5a649a71aae3748e62228721c44627ffc866f665d677bb890c37b9111590ffa',\n",
+      " 'id': 2,\n",
+      " 'internal_name': 'fda-userdb-mir-1010b964-f6fa-11ec-9f77-64bc58900b78',\n",
+      " 'is_public': None,\n",
+      " 'name': 'MIR 1010b964-f6fa-11ec-9f77-64bc58900b78'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "response = container.create1({\n",
+    "    \"name\": \"MIR \" + str(uuid.uuid1()),\n",
+    "    \"repository\": \"mariadb\",\n",
+    "    \"tag\": \"10.5\"\n",
+    "})\n",
+    "container_id = response.id\n",
+    "print(response)"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 6. Start the mariadb container"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 26,
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'hash': 'f5a649a71aae3748e62228721c44627ffc866f665d677bb890c37b9111590ffa',\n",
+      " 'id': 2,\n",
+      " 'internal_name': 'fda-userdb-mir-1010b964-f6fa-11ec-9f77-64bc58900b78',\n",
+      " 'is_public': None,\n",
+      " 'name': 'MIR 1010b964-f6fa-11ec-9f77-64bc58900b78'}\n"
+     ]
+    }
+   ],
+   "source": [
+    "response = container.modify({\n",
+    "    \"action\": \"START\"\n",
+    "}, container_id)\n",
+    "time.sleep(5)\n",
+    "print(response)"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 7. Create a database within the mariadb container"
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 27,
+   "outputs": [],
+   "source": [
+    "response = database.create({\n",
+    "    \"name\": \"MIR \" + str(uuid.uuid1()),\n",
+    "    \"description\": \"Music Information Retrieval\",\n",
+    "    \"is_public\": True\n",
+    "}, container_id)\n",
+    "database_id = response.id"
+   ],
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   }
+  },
+  {
+   "cell_type": "markdown",
+   "source": [
+    "## 8. Import the feature .csv\n",
+    "\n",
+    "Now open [http://localhost:3000/](http://localhost:3000/) and import the .csv file by clicking the database. After successful creation of the table, come back here."
+   ],
+   "metadata": {
+    "collapsed": false
+   }
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 2
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython2",
+   "version": "2.7.6"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}
\ No newline at end of file

.invenio/requirements.txt

-invenio-client==0.1.0
-six==1.16.0
+requests==2.28.0
\ No newline at end of file
\ No newline at end of file

fda-document-service/rest-service/src/main/java/at/tuwien/endpoints/DocumentEndpoint.java

 package at.tuwien.endpoints;
 
 import at.tuwien.api.document.record.CreateDraftDto;
-import at.tuwien.api.document.record.DraftDto;
+import at.tuwien.api.document.record.RecordDto;
 import at.tuwien.exception.DraftRecordCreateException;
 import at.tuwien.service.DocumentService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,9 +20,8 @@ import java.security.Principal;
 
 
 @Log4j2
-@RestController
 @CrossOrigin(origins = "*")
-@ControllerAdvice
+@RestController
 @RequestMapping("/api/document")
 public class DocumentEndpoint {
 
@@ -37,9 +36,9 @@ public class DocumentEndpoint {
     @PreAuthorize("hasRole('ROLE_RESEARCHER')")
     @Transactional(readOnly = true)
     @Operation(summary = "Create a draft", security = @SecurityRequirement(name = "bearerAuth"))
-    public ResponseEntity<DraftDto> create(@NotNull @Valid @RequestBody CreateDraftDto data,
+    public ResponseEntity<RecordDto> create(@NotNull @Valid @RequestBody CreateDraftDto data,
                                            @NotNull Principal principal) throws DraftRecordCreateException {
-        final DraftDto document = documentService.create(data, principal);
+        final RecordDto document = documentService.create(data, principal);
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(document);
     }
@@ -48,22 +47,33 @@ public class DocumentEndpoint {
     @PreAuthorize("hasRole('ROLE_RESEARCHER')")
     @Transactional(readOnly = true)
     @Operation(summary = "Find a draft", security = @SecurityRequirement(name = "bearerAuth"))
-    public ResponseEntity<DraftDto> find(@NotNull @PathVariable("id") String documentId,
+    public ResponseEntity<RecordDto> find(@NotNull @PathVariable("id") String documentId,
                                          @NotNull Principal principal) throws DraftRecordCreateException {
-        final DraftDto document = documentService.findById(documentId, principal);
+        final RecordDto document = documentService.findById(documentId, principal);
         log.info("Found draft record with id {}", documentId);
         log.debug("found draft record {}", document);
         return ResponseEntity.status(HttpStatus.OK)
                 .body(document);
     }
 
+    @PutMapping("/{id}/publish")
+    @PreAuthorize("hasRole('ROLE_RESEARCHER')")
+    @Transactional(readOnly = true)
+    @Operation(summary = "Publish a draft", security = @SecurityRequirement(name = "bearerAuth"))
+    public ResponseEntity<RecordDto> publish(@NotNull @PathVariable("id") String documentId,
+                                         @NotNull Principal principal) throws DraftRecordCreateException {
+        final RecordDto document = documentService.publish(documentId, principal);
+        return ResponseEntity.status(HttpStatus.ACCEPTED)
+                .body(document);
+    }
+
     @PostMapping("/{id}")
     @PreAuthorize("hasRole('ROLE_RESEARCHER')")
     @Transactional(readOnly = true)
     @Operation(summary = "Reserve draft DOI", security = @SecurityRequirement(name = "bearerAuth"))
-    public ResponseEntity<DraftDto> reserve(@NotNull @PathVariable("id") String documentId,
+    public ResponseEntity<RecordDto> reserve(@NotNull @PathVariable("id") String documentId,
                                             @NotNull Principal principal) throws DraftRecordCreateException {
-        final DraftDto document = documentService.reserveDoi(documentId, principal);
+        final RecordDto document = documentService.reserveDoi(documentId, principal);
         return ResponseEntity.status(HttpStatus.CREATED)
                 .body(document);
     }

fda-document-service/rest-service/src/main/java/at/tuwien/endpoints/FileEndpoint.java

 package at.tuwien.endpoints;
 
-import at.tuwien.api.document.file.FileStartDto;
+import at.tuwien.api.document.file.FileDto;
+import at.tuwien.exception.FileUploadException;
+import at.tuwien.exception.CommitFileUploadException;
 import at.tuwien.exception.DraftRecordCreateException;
 import at.tuwien.service.FileService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -12,6 +14,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotNull;
 import java.security.Principal;
@@ -20,7 +23,6 @@ import java.security.Principal;
 @Log4j2
 @RestController
 @CrossOrigin(origins = "*")
-@ControllerAdvice
 @RequestMapping("/api/document/{id}/file")
 public class FileEndpoint {
 
@@ -34,11 +36,14 @@ public class FileEndpoint {
     @PostMapping
     @PreAuthorize("hasRole('ROLE_RESEARCHER')")
     @Transactional(readOnly = true)
-    @Operation(summary = "Start draft files", security = @SecurityRequirement(name = "bearerAuth"))
-    public ResponseEntity<FileStartDto> start(@NotNull @PathVariable("id") String documentId,
-                                           @NotNull Principal principal) throws DraftRecordCreateException {
-        final FileStartDto document = fileService.start(documentId, principal);
-        return ResponseEntity.status(HttpStatus.CREATED)
+    @Operation(summary = "Upload file", security = @SecurityRequirement(name = "bearerAuth"))
+    public ResponseEntity<FileDto> uploadFile(@NotNull @PathVariable("id") String documentId,
+                                              @NotNull @RequestParam("file") MultipartFile file,
+                                              @NotNull Principal principal)
+            throws DraftRecordCreateException, CommitFileUploadException, FileUploadException,
+            org.apache.tomcat.util.http.fileupload.FileUploadException {
+        final FileDto document = fileService.uploadFile(documentId, file, principal);
+        return ResponseEntity.status(HttpStatus.ACCEPTED)
                 .body(document);
     }
 

fda-document-service/rest-service/src/main/resources/application-docker.yml

@@ -30,5 +30,6 @@ eureka:
 fda:
   mount.path: /tmp
   ready.path: /ready
+  gateway.endpoint: http://fda-gateway-service:9095
   document.endpoint: https://test.researchdata.tuwien.ac.at
 dev.token: "${TOKEN}"
\ No newline at end of file

fda-document-service/rest-service/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
     username: postgres
     password: postgres
   jpa:
-    show-sql: false
+    show-sql: true
     database-platform: org.hibernate.dialect.PostgreSQLDialect
     hibernate:
       ddl-auto: validate
@@ -16,7 +16,6 @@ spring:
     name: fda-document-service
   cloud:
     loadbalancer.ribbon.enabled: false
-springdoc.swagger-ui.enabled: true
 server.port: 9099
 logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
@@ -31,5 +30,6 @@ eureka:
 fda:
   mount.path: /tmp
   ready.path: ./ready
+  gateway.endpoint: http://localhost:9095
   document.endpoint: https://test.researchdata.tuwien.ac.at
 dev.token: "${TOKEN}"
\ No newline at end of file

fda-document-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java

@@ -2,6 +2,8 @@ package at.tuwien;
 
 import at.tuwien.api.document.metadata.*;
 import at.tuwien.api.document.record.*;
+import at.tuwien.api.user.UserDetailsDto;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.test.context.TestPropertySource;
 
 import java.time.Instant;
@@ -11,30 +13,58 @@ import java.util.List;
 @TestPropertySource(locations = "classpath:application.properties")
 public abstract class BaseUnitTest {
 
+    public final static Long USER_1_ID = 1L;
     public final static String USER_1_USERNAME = "junit";
 
+    public final static UserDetails USER_1_DETAILS = UserDetailsDto.builder()
+            .id(USER_1_ID)
+            .username(USER_1_USERNAME)
+            .build();
+
     public final static AccessTypeDto DOCUMENT_1_RECORD_TYPE = AccessTypeDto.PUBLIC;
     public final static FileTypeDto DOCUMENT_1_FILE_TYPE = FileTypeDto.PUBLIC;
 
+    public final static AccessTypeDto DOCUMENT_2_RECORD_TYPE = AccessTypeDto.PUBLIC;
+    public final static FileTypeDto DOCUMENT_2_FILE_TYPE = FileTypeDto.RESTRICTED;
+
     public final static AccessOptionsDto DOCUMENT_1_ACCESS_OPTIONS = AccessOptionsDto.builder()
             .record(DOCUMENT_1_RECORD_TYPE)
             .files(DOCUMENT_1_FILE_TYPE)
             .build();
 
-    public final static Boolean DOCUMENT_1_FILES_ENABLED = true;
+    public final static AccessOptionsDto DOCUMENT_2_ACCESS_OPTIONS = AccessOptionsDto.builder()
+            .record(DOCUMENT_2_RECORD_TYPE)
+            .files(DOCUMENT_2_FILE_TYPE)
+            .build();
+
+    public final static Boolean DOCUMENT_1_FILES_ENABLED = false;
+
+    public final static Boolean DOCUMENT_2_FILES_ENABLED = true;
 
     public final static FilesOptionsDto DOCUMENT_1_FILES_OPTIONS = FilesOptionsDto.builder()
             .enabled(DOCUMENT_1_FILES_ENABLED)
             .build();
 
-    public final static String DOCUMENT_1_TITLE = "Test Draft";
+    public final static FilesOptionsDto DOCUMENT_2_FILES_OPTIONS = FilesOptionsDto.builder()
+            .enabled(DOCUMENT_2_FILES_ENABLED)
+            .build();
+
+    public final static String DOCUMENT_1_TITLE = "Public Test-Record";
     public final static String DOCUMENT_1_RESOURCE_TYPE_TYPE = "other";
     public final static Date DOCUMENT_1_PUBLICATION_DATE = Date.from(Instant.now());
 
+    public final static String DOCUMENT_2_TITLE = "Restricted Test-Record";
+    public final static String DOCUMENT_2_RESOURCE_TYPE_TYPE = "other";
+    public final static Date DOCUMENT_2_PUBLICATION_DATE = Date.from(Instant.now());
+
     public final static ResourceTypeDto DOCUMENT_1_RESOURCE_TYPE = ResourceTypeDto.builder()
             .id(DOCUMENT_1_RESOURCE_TYPE_TYPE)
             .build();
 
+    public final static ResourceTypeDto DOCUMENT_2_RESOURCE_TYPE = ResourceTypeDto.builder()
+            .id(DOCUMENT_2_RESOURCE_TYPE_TYPE)
+            .build();
+
     public final static String IDENTIFIER_1_IDENTIFIER = "0000-0003-4216-302X";
     public final static IdentifierTypeDto IDENTIFIER_1_TYPE = IdentifierTypeDto.ORCID;
 
@@ -72,10 +102,23 @@ public abstract class BaseUnitTest {
             .creators(List.of(CREATOR_1))
             .build();
 
+    public final static MetadataDto DOCUMENT_2_METADATA = MetadataDto.builder()
+            .title(DOCUMENT_2_TITLE)
+            .resourceType(DOCUMENT_2_RESOURCE_TYPE)
+            .publicationDate(DOCUMENT_2_PUBLICATION_DATE)
+            .creators(List.of(CREATOR_1))
+            .build();
+
     public final static CreateDraftDto DOCUMENT_1_CREATE_DRAFT = CreateDraftDto.builder()
             .access(DOCUMENT_1_ACCESS_OPTIONS)
             .files(DOCUMENT_1_FILES_OPTIONS)
             .metadata(DOCUMENT_1_METADATA)
             .build();
 
+    public final static CreateDraftDto DOCUMENT_2_CREATE_DRAFT = CreateDraftDto.builder()
+            .access(DOCUMENT_2_ACCESS_OPTIONS)
+            .files(DOCUMENT_2_FILES_OPTIONS)
+            .metadata(DOCUMENT_2_METADATA)
+            .build();
+
 }

fda-document-service/rest-service/src/test/java/at/tuwien/endpoint/DocumentEndpointUnitTest.java

 package at.tuwien.endpoint;
 
 import at.tuwien.BaseUnitTest;
+import at.tuwien.api.document.record.CreateDraftDto;
+import at.tuwien.api.document.record.RecordDto;
+import at.tuwien.endpoints.DocumentEndpoint;
+import at.tuwien.exception.DraftRecordCreateException;
+import at.tuwien.gateway.AuthenticationServiceGateway;
+import org.apache.http.auth.BasicUserPrincipal;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+import java.security.Principal;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 public class DocumentEndpointUnitTest extends BaseUnitTest {
 
+    @Autowired
+    private DocumentEndpoint documentEndpoint;
+
+    @MockBean
+    private AuthenticationServiceGateway authenticationServiceGateway;
+
+
+    @Test
+    @WithMockUser(username = USER_1_USERNAME, authorities = {"ROLE_RESEARCHER"})
+    public void create_succeed() throws DraftRecordCreateException {
+        final CreateDraftDto request = DOCUMENT_1_CREATE_DRAFT;
+        final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
+
+        /* mock */
+        when(authenticationServiceGateway.validate(anyString()))
+                .thenReturn(USER_1_DETAILS);
+
+        /* test */
+        final ResponseEntity<RecordDto> response = documentEndpoint.create(request, principal);
+        assertEquals(HttpStatus.CREATED, response.getStatusCode());
+    }
 
 }

fda-document-service/rest-service/src/test/java/at/tuwien/service/DocumentServiceIntegrationTest.java

@@ -2,7 +2,7 @@ package at.tuwien.service;
 
 import at.tuwien.BaseUnitTest;
 import at.tuwien.api.document.record.CreateDraftDto;
-import at.tuwien.api.document.record.DraftDto;
+import at.tuwien.api.document.record.RecordDto;
 import at.tuwien.exception.DraftRecordCreateException;
 import lombok.extern.log4j.Log4j2;
 import org.apache.http.auth.BasicUserPrincipal;
@@ -35,7 +35,7 @@ public class DocumentServiceIntegrationTest extends BaseUnitTest {
         /* mock */
 
         /* test */
-        final DraftDto response = documentService.create(request, principal);
+        final RecordDto response = documentService.create(request, principal);
         assertEquals(DOCUMENT_1_TITLE, response.getMetadata().getTitle());
     }
 
@@ -47,8 +47,8 @@ public class DocumentServiceIntegrationTest extends BaseUnitTest {
         /* mock */
 
         /* test */
-        final DraftDto document = documentService.create(request, principal);
-        final DraftDto response = documentService.reserveDoi(document.getId(), principal);
+        final RecordDto document = documentService.create(request, principal);
+        final RecordDto response = documentService.reserveDoi(document.getId(), principal);
         assertNotNull(response.getPids().getDoi());
     }