Compare commits

...

4 Commits

Author SHA1 Message Date
f711b3be90
gitignore and nothing 2021-06-14 15:14:07 +02:00
9f47a5cfe1
fix 2021-03-01 18:04:00 +01:00
d69e4be6a9
inseret monthly forderungen 2021-02-22 17:16:44 +01:00
59625cac68
fix ci 2021-02-22 16:52:29 +01:00
6 changed files with 45 additions and 4 deletions

6
.gitignore vendored
View File

@ -1,2 +1,6 @@
__pycache__/ __pycache__/
ENV ENV
*~
~*
.*~

View File

@ -31,7 +31,6 @@ dockerize:
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
script: script:
- tar -xzf dist.tgz
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_TAG . - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$CI_COMMIT_TAG .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:latest

View File

@ -1,4 +1,4 @@
from dbpool import getConnection, getOne, getMany, putOne from dbpool import getConnection, getOne, getMany, putOne, call
import datetime import datetime
import decimal import decimal
import dateparser import dateparser
@ -122,3 +122,6 @@ INSERT INTO zahlung (datum_soll, datum_ist, mieter, betrag, kommentar)
except KeyError as e: except KeyError as e:
print("Some parameter missing: {}".format(e)) print("Some parameter missing: {}".format(e))
return str(e), 500 return str(e), 500
def insertAllForMonth():
return call("insert_monatl_miet_forderung")

View File

@ -94,4 +94,27 @@ def putOne(stmt, params, objName):
cur.close() cur.close()
if dbh: if dbh:
dbh.close() dbh.close()
def call(procName):
dbh = None
cur = None
try:
dbh = getConnection()
cur = dbh.cursor(dictionary=True)
cur.execute("CALL {}(null)".format(procName))
dbh.commit()
return "{} successfully called".format(procName), 202
except mariadb.Error as err:
dbh.rollback()
print("Database error in call {}: {}".format(procName, err))
return str(err), 500
except Exception as err:
dbh.rollback()
print("Some error in call {}: {}".format(procName, err))
return str(err), 500
finally:
print("return connection in call {}".format(procName))
if cur:
cur.close()
if dbh:
dbh.close()

View File

@ -4,3 +4,4 @@ wsgi-file = server.py
processes = 4 processes = 4
stats = :9191 stats = :9191

View File

@ -330,6 +330,17 @@ paths:
description: Zahlung successfully inserted description: Zahlung successfully inserted
500: 500:
description: Some server or database error description: Some server or database error
/hv/forderung/insertAllForMonth:
post:
tags: [ "Forderung" ]
operationId: ZahlungenForderungen.insertAllForMonth
summary: Insert the Forderungen for the insertAllForMonth
responses:
202:
description: Forderungen successfully inserted
500:
description: Some server or database error
components: components: