Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -0,0 +1,39 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml
+
+# This is a sample GitLab CI/CD configuration file that should run without any modifications.
+# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts,
+# it uses echo commands to simulate the pipeline execution.
+#
+# A pipeline is composed of independent jobs that run scripts, grouped into stages.
+# Stages run in sequential order, but jobs within stages run in parallel.
+#
+# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages
+
+stages:          # List of stages for jobs, and their order of execution
+  - build
+  - test
+  - deploy
+
+build-job:       # This job runs in the build stage, which runs first.
+  stage: build
+  script:
+    - echo "Compiling the code..."
+    - docker build .
+    - echo "Compile complete."
+
+test-job:   # This job also runs in the test stage.
+  stage: test    # It can run at the same time as unit-test-job (in parallel).
+  script:
+    - echo "Linting code... This will take about 10 seconds."
+    - docker-compose up --build --abort-on-container-exit
+    - echo "No lint issues found."
+
+deploy-job:      # This job runs in the deploy stage.
+  stage: deploy  # It only runs when *both* jobs in the test stage complete successfully.
+  script:
+    - echo "Deploying application..."
+    - echo "Application successfully deployed."

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

README.md

@@ -20,3 +20,19 @@ Index page:
 }
 
 ```
+
+# Routes:
+
+GET /post — список статей.
+GET /post/name — отдельная статья.
+POST /admin/posts — создать статью.
+PUT /admin/posts — обновить статью.
+DELETE /admin/posts/:id — удалить статью.
+
+Все маршруты, которые начинаются с «/admin» требуют аутентификацию пользователя. Для stateless-сервиса очень удобно использовать Basic-аутентификацию, т.к. каждый запрос содержит логин и пароль пользователя.
+
+# TODO:
+
+* Переписать маршруты под админку
+* Добавить авторизацию
+* Добавить конфигурацию

config.ini

@@ -0,0 +1,5 @@
+[DB]
+host = db
+port = 27017
+name = pycms
+

docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3'
+services:
+        server:
+                build: .
+                ports:
+                        - 8080:8080
+                volumes:
+                        - ./config.ini:/app/config.ini
+                depends_on:
+                        - db
+        db:
+                image: mongo

main.py

@@ -1,10 +1,107 @@
 #!/usr/bin/python3
-from bottle import abort, route, run, template, debug, request
+from bottle import abort, route, run, request
 import pymongo
+import time
+# TODO: auth to /admin
+# TODO: timestamps to posts
+# TODO: author to posts and multiple users
+# TODO: add bottle's params to config
 
-mongoclient = pymongo.MongoClient('localhost', 27017)
-database = mongoclient['pycms']
-posts = database['posts']
+
+class Config:
+    """
+    posts - table with posts
+    config structure:
+        DB:
+            - host
+            - port
+            - dbname
+    """
+    def __init__(self):
+        """
+        Init config
+        """
+        self.readConfig()
+
+        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]
+
+        # TODO: Create table if not exists
+        if 'posts' not in database.list_collection_names():
+            print('Table not fount, 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']
+
+    def createConfig(self, config):
+        """
+        Create config file
+        """
+        config['DB'] = {}
+        db = config['DB']
+        db['host'] = 'localhost'
+        db['port'] = '27017'
+        db['name'] = 'pycms'
+
+        with open('config.ini', 'w') as cfgfile:
+            config.write(cfgfile)
+
+
+class Back():
+    """
+    All actions that will be triggered by http
+    """
+    def getRootPost(self):
+        try:
+            return posts.find_one({'name': '_root_'})['text']
+        except TypeError:
+            return abort(404, 'No such page')
+
+    def getPost(self, name):
+        try:
+            return posts.find_one({'name': name})['text']
+        except TypeError:
+            return abort(404, 'No such page')
+
+    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):
+        # TODO: return RESTful error/success result
+        # If post exists, update it
+        if posts.find_one({'name': name}):
+            newPost = {'$set': {'text': body}}
+            return str(posts.update_one({'name': name}, newPost))
+        # Else - create new
+        else:
+            newPost = {'name': name, 'text': body,
+                       'create_timestamp': str(time.time())}
+            return str(posts.insert_one(newPost).inserted_id)
+
+    def deletePost(self, name):
+        # TODO: return RESTful error/success result
+        return bool(posts.delete_one({'name': name}).deleted_count)
 
 
 @route('/post/<name>')
@@ -12,68 +109,43 @@ def post(name):
     '''
     Get post
     '''
-    try:
-        return posts.find_one({'name':name})['text']
-    except TypeError:
-        return abort(404, 'No such page')
+    return str(back.getPost(name))
 
 
-@route('/post/<name>', method='POST')
-def post(name):
+@route('/admin/post/<name>', method='POST')
+def postUpd(name):
     '''
     Insert/Update post
     '''
     body = request.forms.get('body')
-    # If post exists, update it
-    if posts.find_one({'name': name}):
-        newPost = {'$set': {'text': body}}
-        return str(posts.update_one({'name': name}, newPost))
-    # Else - create new
-    else:
-        newPost = {'name': name, 'text': body}
-        return str(posts.insert_one(newPost).inserted_id)
+    return back.updatePost(name=name, body=body)
 
 
-@route('/post/<name>', method='DELETE')
-def post(name):
+@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))
 
-@route('/posts')
+
+@route('/post')
 def all_posts():
     '''
     Returns all posts
     '''
-    dict_posts = list()
-    for i in posts.find():
-        dict_posts.append(i)
-
-    return str(dict_posts)
+    return back.getAllPosts()
 
 
 @route('/')
 def index():
-    try:
-        return posts.find_one({'name':'/'})['text']
-    except TypeError:
-        return abort(404, 'No such page')
+    return back.getRootPost()
 
-@route('/', method='POST')
-def post():
-    '''
-    Insert/Update post
-    '''
-    body = request.forms.get('body')
-    # If post exists, update it
-    if posts.find_one({'name': '/'}):
-        newPost = {'$set': {'text': body}}
-        return str(posts.update_one({'name': '/'}, newPost))
-    # Else - create new
-    else:
-        newPost = {'name': '/', 'text': body}
-        return str(posts.insert_one(newPost).inserted_id)
 
 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='0.0.0.0', port=8080, reloader=True, debug=True)

requirements.txt

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