add helper

create.sql.tmpl

@@ -1,9 +1,3 @@
--- -----------------------------------------------------
--- THIS IS GENERATED CODE, DO NOT EDIT MANUALLY!
--- ALL CHANGES WILL BE LOST AFTER THE NEXT RUN  
--- OF generate.py
--- -----------------------------------------------------
-
 #for $table in $tables
 CREATE TABLE ${table.name}_t (
   id serial not null primary key

generate.py

@@ -1,11 +1,24 @@
 import json
 from Cheetah.Template import Template
 import glob
+import argparse
 
-with open("schema.json") as schemaFile:
+parser = argparse.ArgumentParser(description="generate.py")
+parser.add_argument('--schema', '-s',
+                    help='Schema file. Default: schema.json in the current folder.',
+                    required=False,
+                    default='./schema.json')
+parser.add_argument('--template', '-t',
+                    help="""Template file, templates files must be named as the final output file
+with an additional .tmpl extension. Default: all template files in the current folder.""",                    
+                    required=False,
+                    default="*.tmpl")
+args = parser.parse_args()
+
+
+with open(args.schema) as schemaFile:
     schema = json.load(schemaFile)
 
-
 for table in schema["tables"]:
     for column in table["columns"]:
         if column["sqltype"] == 'serial':
@@ -27,10 +40,8 @@ for table in schema["tables"]:
             column["apitype"] = 'number'
             column["jstype"] = 'number'
 
-
+for f in glob.glob(args.template):
-
+    print(f"process {f}")
-
-for f in glob.glob("*.tmpl"):
     tmpl = Template(file=f, searchList=[schema])
     with open(f[:-5], 'w') as outFile:
         outFile.write(str(tmpl))

generateHelper.py

@@ -0,0 +1,3 @@
+def JsNameConverter(tmplName):
+    return ''.join([x.capitalize() for x in tmplName.split('_')])
+

methods.py.tmpl

@@ -1,10 +1,3 @@
-#####################################################
-### THIS IS GENERATED CODE, DO NOT EDIT MANUALLY! ###
-### ALL CHANGES WILL BE LOST AFTER THE NEXT RUN   ###
-### OF generate.py                                ###
-#####################################################
-
-
 from db import dbGetMany, dbGetOne
 
 #for $table in $tables
@@ -16,7 +9,7 @@ SELECT
 #for $column in $table.columns  
   ,$column.name
 #end for
-  FROM account_t
+  FROM ${table.name}_t
                          """, 
             "params": ()
         }
@@ -30,7 +23,7 @@ SELECT
 #for $column in $table.columns  
   ,$column.name
 #end for
-  FROM account_t
+  FROM ${table.name}_t
   WHERE id = %s
                          """, 
             "params": (${table.name}Id, )

openapi.yaml

@@ -1,652 +0,0 @@
-
-
-
-openapi: 3.0.0
-info:
-  title: hv2-api
-  version: "1"
-  description: "REST-API for the Nober Grundbesitz GbR Hausverwaltungs-Software"
-  termsOfService: "https://home.hottis.de/dokuwiki/doku.php?id=hv2pub:termsofuse"
-  contact: 
-    name: "Wolfgang Hottgenroth"
-    email:  "wolfgang.hottgenroth@icloud.com"
-externalDocs:
-  description: "Find more details here"
-  url: "https://home.hottis.de/dokuwiki/doku.php?id=hv2pub:externaldocs"
-
-paths:
-  /v1/accounts:
-    get:
-      tags: [ "account" ]
-      summary: Return all normalized accounts
-      operationId: methods.get_accounts
-      responses:
-        '200':
-          description: accounts response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/account'
-      security:
-      - jwt: ['secret']
-  /v1/accounts/{accountId}:
-    get:
-      tags: [ "account" ]
-      summary: Return the normalized account with given id
-      operationId: methods.get_account
-      parameters:
-        - name: accountId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: account response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/account'
-      security:
-      - jwt: ['secret']
-  /v1/tenants:
-    get:
-      tags: [ "tenant" ]
-      summary: Return all normalized tenants
-      operationId: methods.get_tenants
-      responses:
-        '200':
-          description: tenants response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/tenant'
-      security:
-      - jwt: ['secret']
-  /v1/tenants/{tenantId}:
-    get:
-      tags: [ "tenant" ]
-      summary: Return the normalized tenant with given id
-      operationId: methods.get_tenant
-      parameters:
-        - name: tenantId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: tenant response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/tenant'
-      security:
-      - jwt: ['secret']
-  /v1/premises:
-    get:
-      tags: [ "premise" ]
-      summary: Return all normalized premises
-      operationId: methods.get_premises
-      responses:
-        '200':
-          description: premises response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/premise'
-      security:
-      - jwt: ['secret']
-  /v1/premises/{premiseId}:
-    get:
-      tags: [ "premise" ]
-      summary: Return the normalized premise with given id
-      operationId: methods.get_premise
-      parameters:
-        - name: premiseId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: premise response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/premise'
-      security:
-      - jwt: ['secret']
-  /v1/flats:
-    get:
-      tags: [ "flat" ]
-      summary: Return all normalized flats
-      operationId: methods.get_flats
-      responses:
-        '200':
-          description: flats response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/flat'
-      security:
-      - jwt: ['secret']
-  /v1/flats/{flatId}:
-    get:
-      tags: [ "flat" ]
-      summary: Return the normalized flat with given id
-      operationId: methods.get_flat
-      parameters:
-        - name: flatId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: flat response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/flat'
-      security:
-      - jwt: ['secret']
-  /v1/overhead_advances:
-    get:
-      tags: [ "overhead_advance" ]
-      summary: Return all normalized overhead_advances
-      operationId: methods.get_overhead_advances
-      responses:
-        '200':
-          description: overhead_advances response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/overhead_advance'
-      security:
-      - jwt: ['secret']
-  /v1/overhead_advances/{overhead_advanceId}:
-    get:
-      tags: [ "overhead_advance" ]
-      summary: Return the normalized overhead_advance with given id
-      operationId: methods.get_overhead_advance
-      parameters:
-        - name: overhead_advanceId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: overhead_advance response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/overhead_advance'
-      security:
-      - jwt: ['secret']
-  /v1/overhead_advance_flat_mappings:
-    get:
-      tags: [ "overhead_advance_flat_mapping" ]
-      summary: Return all normalized overhead_advance_flat_mappings
-      operationId: methods.get_overhead_advance_flat_mappings
-      responses:
-        '200':
-          description: overhead_advance_flat_mappings response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/overhead_advance_flat_mapping'
-      security:
-      - jwt: ['secret']
-  /v1/overhead_advance_flat_mappings/{overhead_advance_flat_mappingId}:
-    get:
-      tags: [ "overhead_advance_flat_mapping" ]
-      summary: Return the normalized overhead_advance_flat_mapping with given id
-      operationId: methods.get_overhead_advance_flat_mapping
-      parameters:
-        - name: overhead_advance_flat_mappingId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: overhead_advance_flat_mapping response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/overhead_advance_flat_mapping'
-      security:
-      - jwt: ['secret']
-  /v1/parkings:
-    get:
-      tags: [ "parking" ]
-      summary: Return all normalized parkings
-      operationId: methods.get_parkings
-      responses:
-        '200':
-          description: parkings response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/parking'
-      security:
-      - jwt: ['secret']
-  /v1/parkings/{parkingId}:
-    get:
-      tags: [ "parking" ]
-      summary: Return the normalized parking with given id
-      operationId: methods.get_parking
-      parameters:
-        - name: parkingId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: parking response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/parking'
-      security:
-      - jwt: ['secret']
-  /v1/commercial_premises:
-    get:
-      tags: [ "commercial_premise" ]
-      summary: Return all normalized commercial_premises
-      operationId: methods.get_commercial_premises
-      responses:
-        '200':
-          description: commercial_premises response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/commercial_premise'
-      security:
-      - jwt: ['secret']
-  /v1/commercial_premises/{commercial_premiseId}:
-    get:
-      tags: [ "commercial_premise" ]
-      summary: Return the normalized commercial_premise with given id
-      operationId: methods.get_commercial_premise
-      parameters:
-        - name: commercial_premiseId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: commercial_premise response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/commercial_premise'
-      security:
-      - jwt: ['secret']
-  /v1/tenancys:
-    get:
-      tags: [ "tenancy" ]
-      summary: Return all normalized tenancys
-      operationId: methods.get_tenancys
-      responses:
-        '200':
-          description: tenancys response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/tenancy'
-      security:
-      - jwt: ['secret']
-  /v1/tenancys/{tenancyId}:
-    get:
-      tags: [ "tenancy" ]
-      summary: Return the normalized tenancy with given id
-      operationId: methods.get_tenancy
-      parameters:
-        - name: tenancyId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: tenancy response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/tenancy'
-      security:
-      - jwt: ['secret']
-  /v1/fees:
-    get:
-      tags: [ "fee" ]
-      summary: Return all normalized fees
-      operationId: methods.get_fees
-      responses:
-        '200':
-          description: fees response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/fee'
-      security:
-      - jwt: ['secret']
-  /v1/fees/{feeId}:
-    get:
-      tags: [ "fee" ]
-      summary: Return the normalized fee with given id
-      operationId: methods.get_fee
-      parameters:
-        - name: feeId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: fee response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/fee'
-      security:
-      - jwt: ['secret']
-  /v1/tenancy_fee_mappings:
-    get:
-      tags: [ "tenancy_fee_mapping" ]
-      summary: Return all normalized tenancy_fee_mappings
-      operationId: methods.get_tenancy_fee_mappings
-      responses:
-        '200':
-          description: tenancy_fee_mappings response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/tenancy_fee_mapping'
-      security:
-      - jwt: ['secret']
-  /v1/tenancy_fee_mappings/{tenancy_fee_mappingId}:
-    get:
-      tags: [ "tenancy_fee_mapping" ]
-      summary: Return the normalized tenancy_fee_mapping with given id
-      operationId: methods.get_tenancy_fee_mapping
-      parameters:
-        - name: tenancy_fee_mappingId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: tenancy_fee_mapping response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/tenancy_fee_mapping'
-      security:
-      - jwt: ['secret']
-  /v1/account_entrys:
-    get:
-      tags: [ "account_entry" ]
-      summary: Return all normalized account_entrys
-      operationId: methods.get_account_entrys
-      responses:
-        '200':
-          description: account_entrys response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/account_entry'
-      security:
-      - jwt: ['secret']
-  /v1/account_entrys/{account_entryId}:
-    get:
-      tags: [ "account_entry" ]
-      summary: Return the normalized account_entry with given id
-      operationId: methods.get_account_entry
-      parameters:
-        - name: account_entryId
-          in: path
-          required: true
-          schema:
-            type: integer
-      responses:
-        '200':
-          description: account_entry response
-          content:
-            'application/json':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/account_entry'
-      security:
-      - jwt: ['secret']
-
-components:
-  securitySchemes:
-    jwt:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      x-bearerInfoFunc: auth.decodeToken
-  schemas:
-    account:
-      description: account
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-    tenant:
-      description: tenant
-      type: object
-      properties:
-        id:
-          type: integer
-        salutation:
-          type: string
-        firstname:
-          type: string
-        lastname:
-          type: string
-        address1:
-          type: string
-        address2:
-          type: string
-        address3:
-          type: string
-        zip:
-          type: string
-        city:
-          type: string
-        phone1:
-          type: string
-        phone2:
-          type: string
-        iban:
-          type: string
-        account:
-          type: integer
-    premise:
-      description: premise
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        street:
-          type: string
-        zip:
-          type: string
-        city:
-          type: string
-    flat:
-      description: flat
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        premise:
-          type: integer
-        area:
-          type: number
-        flat_no:
-          type: integer
-    overhead_advance:
-      description: overhead_advance
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        amount:
-          type: number
-        startdate:
-          type: string
-        enddate:
-          type: string
-    overhead_advance_flat_mapping:
-      description: overhead_advance_flat_mapping
-      type: object
-      properties:
-        id:
-          type: integer
-        overhead_advance:
-          type: integer
-        flat:
-          type: integer
-    parking:
-      description: parking
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        premise:
-          type: integer
-    commercial_premise:
-      description: commercial_premise
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        premise:
-          type: integer
-    tenancy:
-      description: tenancy
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        tenant:
-          type: integer
-        flat:
-          type: integer
-        parking:
-          type: integer
-        commercial_premise:
-          type: integer
-        startdate:
-          type: string
-        enddate:
-          type: string
-    fee:
-      description: fee
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        amount:
-          type: number
-        fee_type:
-          type: string
-        startdate:
-          type: string
-        enddate:
-          type: string
-    tenancy_fee_mapping:
-      description: tenancy_fee_mapping
-      type: object
-      properties:
-        id:
-          type: integer
-        tenancy:
-          type: integer
-        fee:
-          type: integer
-    account_entry:
-      description: account_entry
-      type: object
-      properties:
-        id:
-          type: integer
-        description:
-          type: string
-        account:
-          type: integer
-        created_at:
-          type: string
-        amount:
-          type: number

openapi.yaml.tmpl

@@ -1,11 +1,3 @@
-#####################################################
-### THIS IS GENERATED CODE, DO NOT EDIT MANUALLY! ###
-### ALL CHANGES WILL BE LOST AFTER THE NEXT RUN   ###
-### OF generate.py                                ###
-#####################################################
-
-
-
 openapi: 3.0.0
 info:
   title: hv2-api

testdata/testdata.sql

@@ -0,0 +1,48 @@
+insert into account_t (description) values ('account testtenant1');
+
+insert into tenant_t (lastname, account) values (
+    'testtenant1', 
+    (select id from account_t where description = 'account testtenant1')
+);
+
+insert into premise_t (street, zip, city) values ('Hemsingskotten 38', '45259', 'Essen');
+
+insert into parking_t (description, premise) values ('Garage 1', (select id from premise_t where street = 'Hemsingskotten 38'));
+
+insert into flat_t (description, premise, area, flat_no) values('EG links', (select id from premise_t where street = 'Hemsingskotten 38'), 59.0, 1);
+
+insert into fee_t (description, amount, fee_type, startdate) values ('Altenwohnung Hemsingskotten', 5.23, 'per_area', '2021-01-01');
+
+insert into fee_t (description, amount, fee_type, startdate) values ('Garage intern', 30.0, 'total', '2021-01-01');
+
+insert into tenancy_t (tenant, flat, description, startdate) values (
+    (select id from tenant_t where lastname = 'testtenant1'),
+    (select id from flat_t where flat_no = 1),
+    'flat testtenant1',
+    '2021-06-01'
+);
+
+insert into tenancy_t (tenant, parking, description, startdate) values (
+    (select id from tenant_t where lastname = 'testtenant1'),
+    (select id from parking_t where description = 'Garage 1'),
+    'parking testtenant1',
+    '2021-06-01'
+);
+
+insert into overhead_advance_t (description, amount, startdate) values ('BKV Altenwohnung Hemsingskotten', 0.34, '2021-01-01');
+
+insert into overhead_advance_flat_mapping_t (overhead_advance, flat) values (
+    (select id from overhead_advance_t where description = 'BKV Altenwohnung Hemsingskotten'),
+    (select id from flat_t where flat_no = 1)
+);
+
+insert into tenancy_fee_mapping_t (tenancy, fee) values (
+    (select id from tenancy_t where description = 'flat testtenant1'),
+    (select id from fee_t where description = 'Altenwohnung Hemsingskotten')
+);
+
+insert into tenancy_fee_mapping_t (tenancy, fee) values (
+    (select id from tenancy_t where description = 'parking testtenant1'),
+    (select id from fee_t where description = 'Garage intern')
+);
+