fix ci

.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

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

@@ -106,11 +106,19 @@ WHERE mieter = ? AND
     "zahlungen": float(sumZ)
   }
 
-def put_zahlung(zahlung):
-  print("Input of put_zahlung: {} {}".format(type(zahlung), zahlung))
-  datum_soll = dateparser.parse(zahlung["datum_soll"], languages=["de"])
-  datum_ist = dateparser.parse(zahlung["datum_ist"], languages=["de"])
-  return putOne("""
+def put_zahlung(**args):
+  try:
+    body = args["body"]
+    datum_soll_raw = body["datum_soll"]
+    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

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))

swagger.yaml

@@ -126,6 +126,24 @@ paths:
           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:
+          description: Some server error
   /hv/mieter/{id}:
     get:
       tags: [ "Mieter" ]
@@ -296,21 +314,22 @@ paths:
           description: Neither Forderungen nor Zahlungen available
         500:
           description: Some server error
-#  /hv/zahlung:
-#    post:
-#      tags: [ "Zahlung" ]
-#      operationId: ZahlungenForderungen.put_zahlung
-#      summary: Inserts a new Zahlung
-#      parameters:
-#        - name: zahlung
-#          in: body
-#          schema:
-#            $ref: '#/components/schemas/Zahlung'
-#      responses:
-#        202:
-#          description: Zahlung successfully inserted
-#        500:
-#          description: Some server or database error
+  /hv/zahlung:
+    post:
+      tags: [ "Zahlung" ]
+      operationId: ZahlungenForderungen.put_zahlung
+      summary: Inserts a new Zahlung
+      requestBody:
+        description: Zahlung
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Zahlung'
+      responses:
+        202:
+          description: Zahlung successfully inserted
+        500:
+          description: Some server or database error
 
 
 components: