gitignore and nothing

.gitignore

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

.gitlab-ci.yml

@@ -0,0 +1,37 @@
+stages:
+  - check
+  - dockerize
+
+variables:
+  IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
+
+  
+check:
+  image: registry.hottis.de/dockerized/base-build-env:latest
+  stage: check
+  tags:
+    - hottis
+    - linux
+    - docker
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - checksemver.py -v
+        --versionToValidate "$CI_COMMIT_TAG"
+        --validateMessage
+        --messageToValidate "$CI_COMMIT_MESSAGE"
+
+dockerize:
+  image: registry.hottis.de/dockerized/docker-bash:latest
+  stage: dockerize
+  tags:
+    - hottis
+    - linux
+    - docker
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - 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 push $IMAGE_NAME:latest
+    - docker push $IMAGE_NAME:$CI_COMMIT_TAG

Dockerfile

@@ -20,9 +20,7 @@ RUN \
     pip3 install connexion && \
     pip3 install connexion[swagger-ui] && \
     pip3 install uwsgi && \
-    pip3 install flask-cors && \
+    pip3 install flask-cors
-    pip3 install python-jose[cryptography] && \
-    pip3 install six
 
 RUN \
     mkdir -p ${APP_DIR} && \

Mieter.py

@@ -21,6 +21,29 @@ SELECT m.id as id,
         w.id = m.wohnung
     """, [], "Mieter")
 
+def get_mieters_active():
+    return getMany("""
+SELECT m.id as id, 
+       o.id as objekt,
+       w.id as wohnung,
+       w.shortname as wohnung_shortname, 
+       o.shortname as objekt_shortname,
+       COALESCE(m.anrede, '-') as anrede,
+       COALESCE(m.vorname, '-') as vorname,
+       m.nachname as nachname,
+       COALESCE(m.strasse, '-') as strasse,
+       COALESCE(m.plz, '-') as plz,
+       COALESCE(m.ort, '-') as ort,
+       COALESCE(m.telefon, '-') as telefon,
+       m.einzug as einzug,
+       COALESCE(m.auszug, '-') as auszug
+  FROM wohnung w, objekt o, mieter m
+  WHERE o.id = w.objekt AND
+        w.id = m.wohnung AND
+        m.einzug <= curdate() and
+        (m.auszug is null or m.auszug > curdate())
+    """, [], "Mieter")
+
 def get_mieter(id=None):
     return getOne("""
 SELECT m.id as id, 

ZahlungenForderungen.py

@@ -1,4 +1,4 @@
-from dbpool import getConnection, getOne, getMany, putOne
+from dbpool import getConnection, getOne, getMany, putOne, call
 import datetime
 import decimal
 import dateparser
@@ -106,11 +106,22 @@ WHERE mieter = ? AND
     "zahlungen": float(sumZ)
   }
 
-def put_zahlung(zahlung):
+def put_zahlung(**args):
-  print("Input of put_zahlung: {} {}".format(type(zahlung), zahlung))
+  try:
-  datum_soll = dateparser.parse(zahlung["datum_soll"], languages=["de"])
+    body = args["body"]
-  datum_ist = dateparser.parse(zahlung["datum_ist"], languages=["de"])
+    datum_soll_raw = body["datum_soll"]
-  return putOne("""
+    datum_ist_raw = body["datum_ist"]
+
+    print("Input of put_zahlung: {}".format(body))
+    datum_soll = dateparser.parse(datum_soll_raw, languages=["de"])
+    datum_ist = dateparser.parse(datum_ist_raw, languages=["de"])
+    return putOne("""
 INSERT INTO zahlung (datum_soll, datum_ist, mieter, betrag, kommentar)
   VALUES(?, ?, ?, ?, ?)
-""", [ datum_soll, datum_ist, zahlung["mieter"], zahlung["betrag"], zahlung["kommentar"] ], "Zahlung")
+""", [ datum_soll, datum_ist, body["mieter"], body["betrag"], body["kommentar"] ], "Zahlung")
+  except KeyError as e:
+    print("Some parameter missing: {}".format(e))
+    return str(e), 500
+
+def insertAllForMonth():
+  return call("insert_monatl_miet_forderung")

auth.py

@@ -1,44 +0,0 @@
-
-import time
-
-import connexion
-import six
-from werkzeug.exceptions import Unauthorized
-
-from jose import JWTError, jwt
-
-JWT_ISSUER = 'de.hottis.hausverwaltung'
-JWT_SECRET = 'streng_geheim'
-JWT_LIFETIME_SECONDS = 600
-JWT_ALGORITHM = 'HS256'
-
-
-def generate_token(user_id):
-    timestamp = _current_timestamp()
-    payload = {
-        "iss": JWT_ISSUER,
-        "iat": int(timestamp),
-        "exp": int(timestamp + JWT_LIFETIME_SECONDS),
-        "sub": str(user_id),
-    }
-
-    return jwt.encode(payload, JWT_SECRET, algorithm=JWT_ALGORITHM)
-
-
-def decode_token(token):
-    try:
-        return jwt.decode(token, JWT_SECRET, algorithms=[JWT_ALGORITHM])
-    except JWTError as e:
-        six.raise_from(Unauthorized, e)
-
-
-def get_secret(user, token_info) -> str:
-    return '''
-    You are user_id {user} and the secret is 'wbevuec'.
-    Decoded token claims: {token_info}.
-    '''.format(user=user, token_info=token_info)
-
-
-def _current_timestamp() -> int:
-    return int(time.time())
-

build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IMAGE_NAME="registry.hottis.de/hv/hv-service"
-VERSION=0.0.3
+VERSION=0.0.4
 
 docker build -t ${IMAGE_NAME}:${VERSION} .
 docker push ${IMAGE_NAME}:${VERSION}

dbpool.py

@@ -83,6 +83,7 @@ def putOne(stmt, params, objName):
     except mariadb.Error as err:
         dbh.rollback()
         print("Database error in putOne({}): {}".format(objName, err))
+        return str(err), 500
     except Exception as err:
         dbh.rollback()
         print("Error in putOne({}): {}".format(objName, err))
@@ -93,4 +94,27 @@ def putOne(stmt, params, objName):
             cur.close()
         if dbh:
             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()

server.ini

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

swagger.yaml

@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
-  title: Hausverwaltung-JWT
+  title: Hausverwaltung
-  version: "0.2"
+  version: "0.1"
 
 paths:
   /hv/objekte:
@@ -12,10 +12,12 @@ paths:
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Objekt'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Objekt'
         404:
           description: No Objekte available
         500:
@@ -28,13 +30,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Objekt'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Objekt'
         404:
           description: Objekt not found
         500:
@@ -47,10 +52,12 @@ paths:
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Wohnung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Wohnung'
         404:
           description: No Wohnung available
         500:
@@ -63,15 +70,18 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Wohnung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Wohnung'
         404:
           description: No Wohnung available
         500:
@@ -84,13 +94,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Wohnung'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Wohnung'
         404:
           description: Wohnung not found
         500:
@@ -103,10 +116,30 @@ paths:
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Mieter'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Mieter'
+        404:
+          description: No Mieter available
+        500:
+          description: Some server error
+  /hv/mieters/active:
+    get:
+      tags: [ "Mieter" ]
+      operationId: Mieter.get_mieters_active
+      summary: Returns all currently active Mieters
+      responses:
+        200:
+          description: Successful response.
+          content:
+            'application/json':
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Mieter'
         404:
           description: No Mieter available
         500:
@@ -119,13 +152,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Mieter'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Mieter'
         404:
           description: Mieter not found
         500:
@@ -138,13 +174,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Forderung'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Forderung'
         404:
           description: Forderung not found
         500:
@@ -157,15 +196,18 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Forderung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Forderung'
         404:
           description: No Forderung available
         500:
@@ -178,13 +220,16 @@ paths:
       parameters:
         - name: id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            $ref: '#/components/Zahlung'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Zahlung'
         404:
           description: Zahlung not found
         500:
@@ -197,15 +242,18 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response.
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/Zahlung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Zahlung'
         404:
           description: No Zahlung available
         500:
@@ -218,19 +266,23 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
         - name: year
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response
-          schema:
+          content:
-            type: array
+            'application/json':
-            items:
+              schema:
-              $ref: '#/components/ZahlungForderung'
+                type: array
+                items:
+                  $ref: '#/components/schemas/ZahlungForderung'
         404:
           description: No ZahlungForderung available
         500:
@@ -243,17 +295,21 @@ paths:
       parameters:
         - name: mieter_id
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
         - name: year
           in: path
-          type: integer
           required: true
+          schema:
+            type: integer
       responses:
         200:
           description: Successful response
-          schema:
+          content:
-            $ref: '#/components/Saldo'
+            'application/json':
+              schema:
+                $ref: '#/components/schemas/Saldo'
         404:
           description: Neither Forderungen nor Zahlungen available
         500:
@@ -263,173 +319,147 @@ paths:
       tags: [ "Zahlung" ]
       operationId: ZahlungenForderungen.put_zahlung
       summary: Inserts a new Zahlung
-      parameters:
+      requestBody:
-        - name: zahlung
+        description: Zahlung
-          in: body
+        content:
-          schema:
+          application/json:
-            $ref: '#/components/Zahlung'
+            schema:
+              $ref: '#/components/schemas/Zahlung'
       responses:
         202:
           description: Zahlung successfully inserted
         500:
           description: Some server or database error
-  /auth/{user_id}:
+  /hv/forderung/insertAllForMonth:
-    get:
+    post:
-      tags: [ "jwt" ]
+      tags: [ "Forderung" ]
-      summary: Return JWT token
+      operationId: ZahlungenForderungen.insertAllForMonth
-      operationId: auth.generate_token
+      summary: Insert the Forderungen for the insertAllForMonth
-      parameters:
-      - name: user_id
-        description: User unique identifier
-        in: path
-        required: true
-        example: 12
-        schema:
-          type: integer
       responses:
-        '200':
+        202:
-          description: JWT token
+          description: Forderungen successfully inserted
-          content:
+        500:
-            'text/plain':
+          description: Some server or database error
-              schema:
+
-                type: string
+
-  /secret:
-    get:
-      tags: [ "jwt" ]
-      summary: Return secret string
-      operationId: auth.get_secret
-      responses:
-        '200':
-          description: secret response
-          content:
-            'text/plain':
-              schema:
-                type: string
-      security:
-      - jwt: ['secret']
 
 components:
-  Objekt:
+  schemas:
-    description: Objekt type
+    Objekt:
-    type: object
+      description: Objekt type
-    properties:
+      type: object
-      id: 
+      properties:
-        type: integer
+        id: 
-      shortname: 
+          type: integer
-        type: string
+        shortname: 
-      flaeche:
+          type: string
-        type: number
+        flaeche:
-  Wohnung:
+          type: number
-    description: Wohnung type
+    Wohnung:
-    type: object
+      description: Wohnung type
-    properties:
+      type: object
-      id: 
+      properties:
-        type: integer
+        id: 
-      objekt: 
+          type: integer
-        type: integer
+        objekt: 
-      shortname: 
+          type: integer
-        type: string
+        shortname: 
-      flaeche:
+          type: string
-        type: number
+        flaeche:
-      objekt_shortname:
+          type: number
-        type: string
+        objekt_shortname:
-  Mieter:
+          type: string
-    description: Mieter type
+    Mieter:
-    type: object
+      description: Mieter type
-    properties:
+      type: object
-      id: 
+      properties:
-        type: integer
+        id: 
-      objekt: 
+          type: integer
-        type: integer
+        objekt: 
-      wohnung: 
+          type: integer
-        type: integer
+        wohnung: 
-      wohnung_shortname:
+          type: integer
-        type: string
+        wohnung_shortname:
-      objekt_shortname:
+          type: string
-        type: string
+        objekt_shortname:
-      anrede:
+          type: string
-        type: string
+        anrede:
-      vorname:
+          type: string
-        type: string
+        vorname:
-      nachname:
+          type: string
-        type: string
+        nachname:
-      strasse:
+          type: string
-        type: string
+        strasse:
-      plz:
+          type: string
-        type: string
+        plz:
-      ort:
+          type: string
-        type: string
+        ort:
-      telefon:
+          type: string
-        type: string
+        telefon:
-      einzug:
+          type: string
-        type: string
+        einzug:
-      auszug:
+          type: string
-        type: string
+        auszug:
-  Forderung:
+          type: string
-    description: Forderung type
+    Forderung:
-    type: object
+      description: Forderung type
-    properties:
+      type: object
-      id:
+      properties:
-        type: integer
+        id:
-      mieter:
+          type: integer
-        type: integer
+        mieter:
-      datum:
+          type: integer
-        type: string
+        datum:
-      betrag:
+          type: string
-        type: number
+        betrag:
-      kommentar:
+          type: number
-        type: string
+        kommentar:
-      ref_wohnung:
+          type: string
-        type: number
+        ref_wohnung:
-  Zahlung:
+          type: number
-    description: Zahlung type
+    Zahlung:
-    type: object
+      description: Zahlung type
-    properties:
+      type: object
-      id:
+      properties:
-        type: integer
+        id:
-      mieter:
+          type: integer
-        type: integer
+        mieter:
-      datum_ist:
+          type: integer
-        type: string
+        datum_ist:
-      datum_soll:
+          type: string
-        type: string
+        datum_soll:
-      betrag:
+          type: string
-        type: number
+        betrag:
-      kommentar:
+          type: number
-        type: string
+        kommentar:
-  ZahlungForderung:
+          type: string
-    description: ZahlungForderung type
+    ZahlungForderung:
-    type: object
+      description: ZahlungForderung type
-    properties:
+      type: object
-      zf_type:
+      properties:
-        type: string
+        zf_type:
-      id:
+          type: string
-        type: integer
+        id:
-      datum_soll:
+          type: integer
-        type: string
+        datum_soll:
-      datum_ist:
+          type: string
-        type: string
+        datum_ist:
-      betrag_zahlung:
+          type: string
-        type: number
+        betrag_zahlung:
-      betrag_forderung:
+          type: number
-        type: number
+        betrag_forderung:
-      kommentar:
+          type: number
-        type: string
+        kommentar:
-      mieter:
+          type: string
-        type: number
+        mieter:
-  Saldo:
+          type: number
-    description: Saldo type
+    Saldo:
-    type: object
+      description: Saldo type
-    properties:
+      type: object
-      forderungen:
+      properties:
-        type: number
+        forderungen:
-      zahlungen:
+          type: number
-        type: number
+        zahlungen:
-      saldo:
+          type: number
-        type: number
+        saldo:
-  securitySchemes:
+          type: number
-    jwt:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      x-bearerInfoFunc: auth.decode_token