Пофиксил баг

Все пошло не так

This reverts commit 0ba3b5f037.

.drone.yml

@@ -0,0 +1,22 @@
+kind: pipeline
+type: exec
+name: build
+
+steps:
+  - name: build
+    commands:
+      - docker-compose -p pycms build 
+
+  - name: test
+    commands:
+      - docker-compose -p pycms up --build --abort-on-container-exit
+
+  - name: push
+    commands:
+      - docker-compose -p pycms push
+  - name: run
+    commands:
+      - docker-compose -p pycms down 
+      - docker-compose -p pycms up -d
+
+

Dockerfile

@@ -0,0 +1,9 @@
+FROM python:latest
+
+ADD . /app
+
+WORKDIR /app
+
+RUN pip3 install --upgrade pip && pip3 install -r requirements.txt
+EXPOSE 8080
+CMD python3 main.py

config.ini

@@ -0,0 +1,8 @@
+[DB]
+host = db
+port = 27017
+name = pycms
+[App]
+host = 0.0.0.0
+port = 8080
+debug = True

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3'
+services:
+        server:
+                build: .
+                ports:
+                        - 8080:8080
+                depends_on:
+                        - db
+                volumes:
+                        - ./config.ini:/app/config.ini
+        db:
+                image: mongo
+        tests:
+                build: .
+                command: bash ./test.sh
+                depends_on:
+                        - db
+                        - server

main.py

@@ -1,60 +1,138 @@
 #!/usr/bin/python3
 from bottle import abort, route, run, request
 import pymongo
-
+import time
-mongoclient = pymongo.MongoClient('localhost', 27017)
+# TODO: auth to /admin
-database = mongoclient['pycms']
+# TODO: timestamps to posts
-posts = database['posts']
+# TODO: author to posts and multiple users
+# TODO: add bottle's params to config
 
 
-class Init:
+class Config:
-    def readConfig():
+    """
+    posts - table with posts
+    config structure:
+        DB:
+            - host
+            - port
+            - dbname
+        App:
+            - host
+            - port
+            - debug
+    """
+    def __init__(self):
         """
-        Read config file, if not exists - call Init.createConfig()
+        Init config
         """
-        pass
+        self.readConfig()
 
-    def createConfig():
+        mongoclient = pymongo.MongoClient(self.host, self.port)
+        if self.dbname not in mongoclient.list_database_names():
+            print('DB not found, creating')
+        database = mongoclient[self.dbname]
+
+        if 'posts' not in database.list_collection_names():
+            print('Table not found, creating')
+        posts = database['posts']
+        self.posts = posts
+
+    def readConfig(self):
+        """
+        Read config file, if not exists - call self.createConfig()
+        """
+        import configparser
+        config = configparser.ConfigParser()
+        if not config.read('config.ini'):
+            self.createConfig(config)
+
+        db = config['DB']
+        self.host = db['host']
+        self.port = int(db['port'])
+        self.dbname = db['name']
+
+        app = config['App']
+        self.apphost = app['host']
+        self.appport = int(app['port'])
+        self.appdebug = bool(app['debug'])
+
+    def createConfig(self, config):
         """
         Create config file
         """
-        pass
+        config['DB'] = {}
+        db = config['DB']
+        db['host'] = 'localhost'
+        db['port'] = '27017'
+        db['name'] = 'pycms'
 
-    def setupConnect():
+        config['App'] = {}
-        """
+        app = config['App']
-        Setup MongoDB connection
+        app['port'] = '8080'
-        """
+        app['debug'] = 'True'
-        pass
+        app['host'] = '0.0.0.0'
+
+        with open('config.ini', 'w') as cfgfile:
+            config.write(cfgfile)
 
 
-class Back:
+class Back():
     """
     All actions that will be triggered by http
     """
-    def getRootPost():
+    def getRootPost(self):
         try:
             return posts.find_one({'name': '_root_'})['text']
         except TypeError:
             return abort(404, 'No such page')
 
-    def getPost(name):
+    def getPost(self, name):
         try:
             return posts.find_one({'name': name})['text']
         except TypeError:
             return abort(404, 'No such page')
 
-    def updatePost(name, body):
+    def getAllPosts(self):
+        # TODO: clear up output, remove '_id' and 'body',
+        # now there should be only
+        dict_posts = list()
+        for i in posts.find():
+            dict_posts.append(i)
+        return str(dict_posts)
+
+    def updatePost(self, name, body):
         # If post exists, update it
         if posts.find_one({'name': name}):
-            newPost = {'$set': {'text': body}}
+            newPostJson = {'$set': {'text': body}}
-            return str(posts.update_one({'name': name}, newPost))
+            newPost = posts.update_one({'name': name}, newPostJson)
+            result = dict(
+                status=200, state='updated', count=newPost.matched_count
+            )
         # Else - create new
         else:
-            newPost = {'name': name, 'text': body}
+            newPostJson = {'name': name, 'text': body,
-            return str(posts.insert_one(newPost).inserted_id)
+                           'create_timestamp': str(time.time())}
+            newPost = posts.insert_one(newPostJson).inserted_id
+            result = dict(status=200, state='new')
+        return str(result)
 
-    def deletePost(name):
+    def deletePost(self, name):
-        return posts.delete_one({'name': name})
+        delete = posts.delete_one({'name': name}).deleted_count
+        if not delete:
+            result = dict(status=500, count=delete)
+        else:
+            result = dict(status=200, count=delete)
+        return str(result)
+
+
+class Metrics:
+    def alive():
+        return str("alive 1")
+
+
+@route('/metrics')
+def metrics():
+    return Metrics.alive()
 
 
 @route('/post/<name>')
@@ -62,25 +140,24 @@ def post(name):
     '''
     Get post
     '''
-    return Back.getPost(name)
+    return str(back.getPost(name))
 
 
-@route('/post/<name>', method='POST')
+@route('/admin/post/<name>', method='POST')
 def postUpd(name):
     '''
     Insert/Update post
     '''
     body = request.forms.get('body')
-    return Back.updatePost(name=name, body=body)
+    return back.updatePost(name=name, body=body)
 
 
-@route('/post/<name>', method='DELETE')
+@route('/admin/post/<name>', method='DELETE')
 def postDel(name):
     '''
     Delete post by name
     '''
-    # return str(posts.delete_one({'name':name}))
+    return str(back.deletePost(name))
-    return str(Back.deletePost(name))
 
 
 @route('/post')
@@ -88,17 +165,18 @@ def all_posts():
     '''
     Returns all posts
     '''
-    dict_posts = list()
+    return back.getAllPosts()
-    for i in posts.find():
-        dict_posts.append(i)
-
-    return str(dict_posts)
 
 
 @route('/')
 def index():
-    return Back.getRootPost()
+    return back.getRootPost()
 
 
 if __name__ == '__main__':
-    run(host='0.0.0.0', port=8081, reloader=True, debug=True)
+    print("Init")
+    cfg = Config()
+    print("Configured")
+    back = Back()
+    posts = cfg.posts
+    run(host=cfg.apphost, port=cfg.appport, reloader=cfg.appdebug, debug=cfg.appdebug)

requirements.txt

@@ -0,0 +1,2 @@
+bottle==0.12.19
+pymongo==3.12.0

test.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+curl_cmd='curl -s -w :%{http_code}'
+#curl_cmd='curl -s -w "%{http_code}\t%{stdout}" -o /dev/null'
+url='server:8080'
+$curl_cmd -X POST $url/admin/post/test -F 'body=testpage' && echo ": Create success" || echo ': create fail'
+
+$curl_cmd $url/post/test && echo ": get Success" || echo ': get fail'
+
+$curl_cmd -X POST $url/admin/post/test -F 'body=testpage2' && echo ": Update success" || echo ': update fail'
+
+$curl_cmd -X DELETE $url/admin/post/test && echo ": delete success" || echo ': delete fail'
+
+$curl_cmd $url/metrics && echo ": metrics available" || echo ': metrics unavailable'