5 Commits

Author SHA1 Message Date
93ff836e08 The real drone yml
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2022-08-28 13:20:12 +03:00
cd47d4aa84 The real drone yml
Some checks reported errors
continuous-integration/drone/push Build was killed
2022-08-28 13:04:13 +03:00
2785d3d6b6 Пофиксил баг
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2021-11-01 06:07:41 +03:00
f4732836ad Сделал нормальные JSON ответы
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-01 06:05:33 +03:00
b0bd579357 Верну тишину
All checks were successful
continuous-integration/drone/push Build is passing
2021-11-01 05:56:22 +03:00
3 changed files with 26 additions and 20 deletions

View File

@@ -6,17 +6,20 @@ steps:
- name: build - name: build
commands: commands:
- docker-compose -p pycms build - 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 - docker-compose -p pycms push
- name: run
commands:
- docker-compose -p pycms down
- docker-compose -p pycms up -d
---
name: test
type: docker
kind: pipeline
steps:
- name: run db
image: mongo
detach: true
- name: run_tests
image: pycms_server
commands:
- bash ./test.sh
depends_on:
- build

17
main.py
View File

@@ -101,19 +101,22 @@ class Back():
return str(dict_posts) return str(dict_posts)
def updatePost(self, name, body): def updatePost(self, name, body):
# TODO: return RESTful error/success result
# If post exists, update it # If post exists, update it
if posts.find_one({'name': name}): 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 - create new
else: else:
newPost = {'name': name, 'text': body, newPostJson = {'name': name, 'text': body,
'create_timestamp': str(time.time())} 'create_timestamp': str(time.time())}
return str(posts.insert_one(newPost).inserted_id) newPost = posts.insert_one(newPostJson).inserted_id
result = dict(status=200, state='new')
return str(result)
def deletePost(self, name): def deletePost(self, name):
# TODO: return RESTful error/success result
delete = posts.delete_one({'name': name}).deleted_count delete = posts.delete_one({'name': name}).deleted_count
if not delete: if not delete:
result = dict(status=500, count=delete) result = dict(status=500, count=delete)

View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
curl_cmd='curl -w :%{http_code}' curl_cmd='curl -s -w :%{http_code}'
#curl_cmd='curl -s -w "%{http_code}\t%{stdout}" -o /dev/null' #curl_cmd='curl -s -w "%{http_code}\t%{stdout}" -o /dev/null'
url='server:8080' url='server:8080'
$curl_cmd -X POST $url/admin/post/test -F 'body=testpage' && echo ": Create success" || echo ': create fail' $curl_cmd -X POST $url/admin/post/test -F 'body=testpage' && echo ": Create success" || echo ': create fail'