Merge pull request #133 from tubone24/create_sqllite

add test
tubone24 · Jul 28, 2019 · c2f5ad9 · c2f5ad9
2 parents ad69f11 + 9afeae4
commit c2f5ad9
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 2 deletions.
diff --git a/doc_src/_static/schema.yml b/doc_src/_static/schema.yml
@@ -40,6 +40,13 @@ components:
         version:
           type: string
       type: object
+    ListUploadFiles:
+      properties:
+        fileList:
+          items:
+            type: object
+          type: array
+      type: object
     UploadIdResp:
       properties:
         release_date:
@@ -70,7 +77,7 @@ info:
     name: MIT
     url: https://opensource.org/licenses/MIT
   title: Ebook-homebrew
-  version: 2.0.3
+  version: 2.0.7
 openapi: 3.0.2
 paths:
   /status:
@@ -83,6 +90,16 @@ paths:
               schema:
                 $ref: '#/components/schemas/HealthCheck'
           description: OK
+  /data/upload/list:
+    get:
+      description: Get file list
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ListUploadFiles'
+          description: OK
   /data/upload:
     post:
       requestBody:

diff --git a/ebook_homebrew/models/rest_models.py b/ebook_homebrew/models/rest_models.py
@@ -12,6 +12,13 @@ def __init__(self, status, version):
         self.version = version
 
 
+class ListUploadFiles:
+    """ListUploadFiles Model"""
+
+    def __init__(self, file_list):
+        self.fileList = file_list
+
+
 class UploadModel:
     """Upload_id Model"""
 

diff --git a/ebook_homebrew/rest.py b/ebook_homebrew/rest.py
@@ -13,7 +13,13 @@
 
 from .convert import Image2PDF
 from .utils.logging import get_logger
-from .models.rest_models import UploadModel, ErrorModel, FileNotFoundModel, StatusModel
+from .models.rest_models import (
+    UploadModel,
+    ErrorModel,
+    FileNotFoundModel,
+    StatusModel,
+    ListUploadFiles,
+)
 from .rdb import UploadedFile
 from .__init__ import __version__
 
@@ -51,6 +57,11 @@ class HealthCheckSchema(Schema):
     version = fields.Str()
 
 
+@api.schema("ListUploadFiles")
+class ListUploadFilesSchema(Schema):
+    fileList = fields.List(fields.Dict(fields.Str()))
+
+
 @api.schema("UploadImagesReq")
 class UploadImagesReqSchema(Schema):
     contentType = fields.Str(required=True)
@@ -107,6 +118,26 @@ def status(_, resp):
     resp.media = HealthCheckSchema().dump(StatusModel("ok", __version__)).data
 
 
+@api.route("/data/upload/list")
+def list_upload_files(_, resp):
+    """Responce File List.
+    ---
+    get:
+        description: Get file list
+        responses:
+            "200":
+                description: OK
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/ListUploadFiles"
+    """
+    _logger.debug("List File")
+    upload_file = UploadedFile()
+    file_list = upload_file.get_all_uploaded_file()
+    resp.media = ListUploadFilesSchema().dump(ListUploadFiles(file_list)).data
+
+
 @api.route("/data/upload")
 async def upload_image_file(req, resp):
     """Upload Image files.

diff --git a/tests/ut/assets/schema.yml b/tests/ut/assets/schema.yml
@@ -40,6 +40,13 @@ components:
         version:
           type: string
       type: object
+    ListUploadFiles:
+      properties:
+        fileList:
+          items:
+            type: object
+          type: array
+      type: object
     UploadIdResp:
       properties:
         release_date:
@@ -83,6 +90,16 @@ paths:
               schema:
                 $ref: '#/components/schemas/HealthCheck'
           description: OK
+  /data/upload/list:
+    get:
+      description: Get file list
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ListUploadFiles'
+          description: OK
   /data/upload:
     post:
       requestBody:

diff --git a/tests/ut/test_rest.py b/tests/ut/test_rest.py
@@ -48,6 +48,26 @@ def test_status(api):
     assert actual == expect
 
 
+def test_list_upload_files(api):
+    file_list = {"id": 1,
+                 "name": "test",
+                 "file_path": "/tmp/test",
+                 "file_type": "image/png",
+                 "last_index": 0,
+                 "created_at": "2019-07-28 16:21:14",
+                 "updated_at": "2019-07-28 16:21:14"}
+    mock_uploadedfile = MagicMock()
+    mock_get_all_uploaded_file = MagicMock(return_value=[file_list])
+    mock_uploadedfile.get_all_uploaded_file = mock_get_all_uploaded_file
+    with patch.object(target, "UploadedFile", return_value=mock_uploadedfile):
+        r = api.requests.get("/data/upload/list")
+        json_response = json.loads(r.text)
+        assert "fileList" in json_response
+        actual = json_response["fileList"]
+        expect = [file_list]
+        assert actual == expect
+
+
 def test_upload_image_file(api, image_b64, tmpdir):
     event = json.dumps({"fileName": "test.pdf",
                         "contentType": "image/png",