Compare commits
58
Commits
1da5748734
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1be7152a7 | ||
|
|
aa14131757 | ||
|
|
21a76418fe | ||
|
|
4223ec2e72 | ||
|
|
8981fe6fda | ||
|
|
f434e39c32 | ||
|
|
1417057160 | ||
|
|
742b4bfc32 | ||
|
|
bc0775eafe | ||
|
|
c778d3422c | ||
|
|
14f9040456 | ||
|
|
8dfa89c6b6 | ||
|
|
a32111fbf4 | ||
|
|
6772c5e408 | ||
|
|
156012ad64 | ||
|
|
d3429cefb4 | ||
|
|
397a1844b5 | ||
|
|
412e9f03bb | ||
|
|
76342d3d55 | ||
|
|
eced2dc1e9 | ||
|
|
e692a50efc | ||
|
|
f097fd8c43 | ||
|
|
e211b7f680 | ||
|
|
72ade7f92c | ||
|
|
72f8196acf | ||
|
|
b087d9822e | ||
|
|
785f6ac8b9 | ||
|
|
20d80d76f0 | ||
|
|
6a75825a88 | ||
|
|
5599476730 | ||
|
|
d13738069e | ||
|
|
5aec5ae176 | ||
|
|
186cf4411e | ||
|
|
435e0260e5 | ||
|
|
eaf6b09349 | ||
|
|
405639329c | ||
|
|
719b9d7000 | ||
|
|
e3270d64bf | ||
|
|
f97d8e53b1 | ||
|
|
1d8b138b62 | ||
|
|
75cc0b46f9 | ||
|
|
3cddbe4922 | ||
|
|
58645f87ea | ||
|
|
b58b56249a | ||
|
|
5ec51451ee | ||
|
|
8d4bcfdf0c | ||
|
|
8f474a1081 | ||
|
|
be28592dfa | ||
|
|
11087ead17 | ||
|
|
2bfc56ea81 | ||
|
|
dcc02ab60d | ||
|
|
4017708282 | ||
|
|
4df2a1dede | ||
|
|
b6cfe62724 | ||
|
|
96dd142899 | ||
|
|
7ae97c27a0 | ||
|
|
bbe550b8a9 | ||
|
|
de15af4302 |
@@ -52,24 +52,6 @@ paths:
|
||||
$ref: '#/components/schemas/patch_notes'
|
||||
"400":
|
||||
description: bad payload
|
||||
|
||||
/patchnotes/all:
|
||||
get:
|
||||
tags: [Patchnotes]
|
||||
summary: Returns **all** patch notes (admin area)
|
||||
operationId: listAllPatchnotes
|
||||
responses:
|
||||
"200":
|
||||
description: list of all patch notes
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
type: array
|
||||
items:
|
||||
$ref: '#/components/schemas/patch_notes'
|
||||
"404":
|
||||
description: no Patch notes found
|
||||
|
||||
/patchnotes/{patchID}:
|
||||
parameters:
|
||||
- in: path
|
||||
@@ -151,13 +133,16 @@ components:
|
||||
patch_date:
|
||||
type: string
|
||||
format: date
|
||||
required: [patchID, title, changes, version, patch_date]
|
||||
project:
|
||||
type: string
|
||||
required: [patchID, title, changes, version, patch_date, project]
|
||||
example:
|
||||
patchID: 29e80bcc-5981-4a52-99e1-373442dea9b9
|
||||
title: Patch note 1
|
||||
changes: Fixed export bug
|
||||
version: 1.0.0
|
||||
patch_date: '2025-01-02' # ← als String in Quotes!
|
||||
project: 'Test-Projekt'
|
||||
|
||||
patch_notes_input:
|
||||
description: Schema for POST/PUT (server generates patchID if omitted)
|
||||
@@ -172,12 +157,15 @@ components:
|
||||
patch_date:
|
||||
type: string
|
||||
format: date
|
||||
required: [title, changes, version, patch_date]
|
||||
project:
|
||||
type: string
|
||||
required: [title, changes, version, patch_date, project]
|
||||
example:
|
||||
title: Patch note 1
|
||||
changes: Fixed export bug
|
||||
version: 1.0.0
|
||||
patch_date: '2025-01-02' # ← ebenfalls in Quotes
|
||||
project: 'Test-Projekt'
|
||||
|
||||
responses:
|
||||
Error400:
|
||||
|
||||
@@ -5,12 +5,9 @@ Dockerfile
|
||||
README.md
|
||||
git_push.sh
|
||||
openapi_server/__init__.py
|
||||
openapi_server/__main__.py
|
||||
openapi_server/controllers/__init__.py
|
||||
openapi_server/controllers/patchnotes_controller.py
|
||||
openapi_server/controllers/security_controller.py
|
||||
openapi_server/models/__init__.py
|
||||
openapi_server/models/base_model.py
|
||||
openapi_server/models/patch_notes.py
|
||||
openapi_server/models/patch_notes_input.py
|
||||
openapi_server/openapi/openapi.yaml
|
||||
|
||||
@@ -24,7 +24,7 @@ app = connexion.FlaskApp(__name__, specification_dir='./openapi/')
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
position=MiddlewarePosition.BEFORE_EXCEPTION,
|
||||
allow_origin_regex=r"^(https?://)(.*kanzleiapp\.io|.*masasana\.ai|localhost:4200)$",
|
||||
allow_origin_regex=r"^https?://(.*\.kanzleiapp\.io|.*\.masasana\.ai|localhost:4200)$",
|
||||
allow_credentials=True,
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
|
||||
@@ -19,6 +19,7 @@ from openapi_server.__main__ import collection, last_login_collection
|
||||
from openapi_server.models.patch_notes import PatchNotes
|
||||
from openapi_server.utils.auth import current_user_id
|
||||
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
def create_patchnote(body): # noqa: E501
|
||||
"""Creates new patch notes
|
||||
@@ -37,7 +38,7 @@ def create_patchnote(body): # noqa: E501
|
||||
|
||||
pn = PatchNotes.from_dict(body)
|
||||
|
||||
# --- Datum wahlweise als str oder date annehmen ---
|
||||
# --- Datum wahlweise als str oder Date annehmen ---
|
||||
if isinstance(pn.patch_date, date):
|
||||
date_str = pn.patch_date.isoformat()
|
||||
else:
|
||||
@@ -56,6 +57,7 @@ def create_patchnote(body): # noqa: E501
|
||||
"changes": pn.changes,
|
||||
"version": pn.version,
|
||||
"patch_date": date_str,
|
||||
"project": pn.project
|
||||
}
|
||||
|
||||
collection.insert_one(patch_doc)
|
||||
@@ -123,14 +125,18 @@ def list_patchnotes(since: str | None = None):
|
||||
"""GET /patchnotes – liefert neue Patchnotes und setzt last_login."""
|
||||
|
||||
user_id = current_user_id() # 1) aktueller Benutzer
|
||||
last_login_doc = last_login_collection.find_one(
|
||||
{"user_id": user_id},
|
||||
{"_id": 0, "last_login": 1}
|
||||
)
|
||||
last_login = last_login_doc.get("last_login") if last_login_doc else None
|
||||
|
||||
# 2) Wenn ?since fehlt, gespeichertes last_login holen
|
||||
if since is None:
|
||||
rec = last_login_collection.find_one({"user_id": user_id})
|
||||
since = rec["last_login"] if rec else None
|
||||
|
||||
# 3) Datum validieren (nur wenn vorhanden)
|
||||
query = {}
|
||||
logging.info("since" + str(since))
|
||||
logging.info("last_login" + str(last_login))
|
||||
if since:
|
||||
logging.info("Went into if since")
|
||||
|
||||
try:
|
||||
datetime.strptime(since, "%Y-%m-%d")
|
||||
except ValueError:
|
||||
@@ -139,12 +145,31 @@ def list_patchnotes(since: str | None = None):
|
||||
detail="since must be YYYY-MM-DD",
|
||||
status=400,
|
||||
)
|
||||
mongo_filter = {"patch_date": {"$gte": since}}
|
||||
else:
|
||||
mongo_filter = {} # erster Login → alle Notes
|
||||
query = {
|
||||
"patch_date": {
|
||||
"$gte": since,
|
||||
"$lte": last_login
|
||||
}
|
||||
}
|
||||
|
||||
# 3) Datum validieren (nur wenn vorhanden)
|
||||
elif since is None:
|
||||
logging.info("Went into if since is None")
|
||||
try:
|
||||
docs = collection.find({})
|
||||
for d in docs:
|
||||
d.pop("_id", None)
|
||||
if isinstance(d["patch_date"], (datetime, date)):
|
||||
d["patch_date"] = d["patch_date"].isoformat()
|
||||
except ValueError as e:
|
||||
raise ProblemException(
|
||||
title="Internal Server Error",
|
||||
detail=str(e),
|
||||
status=500,
|
||||
)
|
||||
# 4) Patchnotes abholen
|
||||
docs = list(collection.find(mongo_filter).sort("patch_date", 1))
|
||||
|
||||
docs = list(collection.find(query).sort("patch_date", 1))
|
||||
for d in docs:
|
||||
d.pop("_id", None)
|
||||
if isinstance(d["patch_date"], (datetime, date)):
|
||||
@@ -157,7 +182,6 @@ def list_patchnotes(since: str | None = None):
|
||||
{"$set": {"last_login": today}},
|
||||
upsert=True,
|
||||
)
|
||||
|
||||
return Response(json_util.dumps(docs), mimetype="application/json", status=200)
|
||||
|
||||
|
||||
@@ -199,6 +223,7 @@ def update_patchnote(patch_id, body): # noqa: E501
|
||||
"changes": pn.changes,
|
||||
"version": pn.version,
|
||||
"patch_date": date_str, # richtiger Feldname!
|
||||
"project": pn.project,
|
||||
}}
|
||||
)
|
||||
|
||||
@@ -217,5 +242,3 @@ def update_patchnote(patch_id, body): # noqa: E501
|
||||
mimetype="application/json",
|
||||
status=200,
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ class PatchNotes(Model):
|
||||
Do not edit the class manually.
|
||||
"""
|
||||
|
||||
def __init__(self, patch_id=None, title=None, changes=None, version=None, patch_date=None): # noqa: E501
|
||||
def __init__(self, patch_id=None, title=None, changes=None, version=None, patch_date=None, project=None): # noqa: E501
|
||||
"""PatchNotes - a model defined in OpenAPI
|
||||
|
||||
:param patch_id: The patch_id of this PatchNotes. # noqa: E501
|
||||
@@ -25,13 +25,16 @@ class PatchNotes(Model):
|
||||
:type version: str
|
||||
:param patch_date: The patch_date of this PatchNotes. # noqa: E501
|
||||
:type patch_date: date
|
||||
:param project: The project of this PatchNotes. # noqa: E501
|
||||
:type project: str
|
||||
"""
|
||||
self.openapi_types = {
|
||||
'patch_id': str,
|
||||
'title': str,
|
||||
'changes': str,
|
||||
'version': str,
|
||||
'patch_date': date
|
||||
'patch_date': str,
|
||||
'project': str
|
||||
}
|
||||
|
||||
self.attribute_map = {
|
||||
@@ -39,7 +42,8 @@ class PatchNotes(Model):
|
||||
'title': 'title',
|
||||
'changes': 'changes',
|
||||
'version': 'version',
|
||||
'patch_date': 'patch_date'
|
||||
'patch_date': 'patch_date',
|
||||
'project': 'project'
|
||||
}
|
||||
|
||||
self._patch_id = patch_id
|
||||
@@ -47,6 +51,7 @@ class PatchNotes(Model):
|
||||
self._changes = changes
|
||||
self._version = version
|
||||
self._patch_date = patch_date
|
||||
self._project = project
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, dikt) -> 'PatchNotes':
|
||||
@@ -173,3 +178,26 @@ class PatchNotes(Model):
|
||||
raise ValueError("Invalid value for `patch_date`, must not be `None`") # noqa: E501
|
||||
|
||||
self._patch_date = patch_date
|
||||
|
||||
@property
|
||||
def project(self) -> str:
|
||||
"""Gets the project of this PatchNotes.
|
||||
|
||||
|
||||
:return: The project of this PatchNotes.
|
||||
:rtype: str
|
||||
"""
|
||||
return self._project
|
||||
|
||||
@project.setter
|
||||
def project(self, project: str):
|
||||
"""Sets the project of this PatchNotes.
|
||||
|
||||
|
||||
:param project: The project of this PatchNotes.
|
||||
:type project: str
|
||||
"""
|
||||
if project is None:
|
||||
raise ValueError("Invalid value for `project`, must not be `None`") # noqa: E501
|
||||
|
||||
self._project = project
|
||||
|
||||
@@ -12,7 +12,7 @@ class PatchNotesInput(Model):
|
||||
Do not edit the class manually.
|
||||
"""
|
||||
|
||||
def __init__(self, title=None, changes=None, version=None, patch_date=None): # noqa: E501
|
||||
def __init__(self, title=None, changes=None, version=None, patch_date=None, project=None): # noqa: E501
|
||||
"""PatchNotesInput - a model defined in OpenAPI
|
||||
|
||||
:param title: The title of this PatchNotesInput. # noqa: E501
|
||||
@@ -23,25 +23,30 @@ class PatchNotesInput(Model):
|
||||
:type version: str
|
||||
:param patch_date: The patch_date of this PatchNotesInput. # noqa: E501
|
||||
:type patch_date: date
|
||||
:param project: The project of this PatchNotesInput. # noqa: E501
|
||||
:type project: str
|
||||
"""
|
||||
self.openapi_types = {
|
||||
'title': str,
|
||||
'changes': str,
|
||||
'version': str,
|
||||
'patch_date': date
|
||||
'patch_date': date,
|
||||
'project': str
|
||||
}
|
||||
|
||||
self.attribute_map = {
|
||||
'title': 'title',
|
||||
'changes': 'changes',
|
||||
'version': 'version',
|
||||
'patch_date': 'patch_date'
|
||||
'patch_date': 'patch_date',
|
||||
'project': 'project'
|
||||
}
|
||||
|
||||
self._title = title
|
||||
self._changes = changes
|
||||
self._version = version
|
||||
self._patch_date = patch_date
|
||||
self._project = project
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, dikt) -> 'PatchNotesInput':
|
||||
@@ -145,3 +150,26 @@ class PatchNotesInput(Model):
|
||||
raise ValueError("Invalid value for `patch_date`, must not be `None`") # noqa: E501
|
||||
|
||||
self._patch_date = patch_date
|
||||
|
||||
@property
|
||||
def project(self) -> str:
|
||||
"""Gets the project of this PatchNotesInput.
|
||||
|
||||
|
||||
:return: The project of this PatchNotesInput.
|
||||
:rtype: str
|
||||
"""
|
||||
return self._project
|
||||
|
||||
@project.setter
|
||||
def project(self, project: str):
|
||||
"""Sets the project of this PatchNotesInput.
|
||||
|
||||
|
||||
:param project: The project of this PatchNotesInput.
|
||||
:type project: str
|
||||
"""
|
||||
if project is None:
|
||||
raise ValueError("Invalid value for `project`, must not be `None`") # noqa: E501
|
||||
|
||||
self._project = project
|
||||
|
||||
@@ -22,27 +22,6 @@ paths:
|
||||
format: date
|
||||
type: string
|
||||
style: form
|
||||
- description: Maximum number of items to return
|
||||
explode: true
|
||||
in: query
|
||||
name: limit
|
||||
required: false
|
||||
schema:
|
||||
default: 20
|
||||
maximum: 100
|
||||
minimum: 1
|
||||
type: integer
|
||||
style: form
|
||||
- description: Pagination offset
|
||||
explode: true
|
||||
in: query
|
||||
name: offset
|
||||
required: false
|
||||
schema:
|
||||
default: 0
|
||||
minimum: 0
|
||||
type: integer
|
||||
style: form
|
||||
responses:
|
||||
"200":
|
||||
content:
|
||||
@@ -176,29 +155,6 @@ components:
|
||||
format: date
|
||||
type: string
|
||||
style: form
|
||||
LimitParam:
|
||||
description: Maximum number of items to return
|
||||
explode: true
|
||||
in: query
|
||||
name: limit
|
||||
required: false
|
||||
schema:
|
||||
default: 20
|
||||
maximum: 100
|
||||
minimum: 1
|
||||
type: integer
|
||||
style: form
|
||||
OffsetParam:
|
||||
description: Pagination offset
|
||||
explode: true
|
||||
in: query
|
||||
name: offset
|
||||
required: false
|
||||
schema:
|
||||
default: 0
|
||||
minimum: 0
|
||||
type: integer
|
||||
style: form
|
||||
responses:
|
||||
Error400:
|
||||
description: Invalid request payload
|
||||
@@ -212,6 +168,7 @@ components:
|
||||
changes: Fixed export bug
|
||||
version: 1.0.0
|
||||
patch_date: 2025-01-02
|
||||
project: Test-Projekt
|
||||
properties:
|
||||
patchID:
|
||||
format: uuid
|
||||
@@ -225,33 +182,41 @@ components:
|
||||
patch_date:
|
||||
format: date
|
||||
type: string
|
||||
project:
|
||||
type: string
|
||||
required:
|
||||
- changes
|
||||
- patchID
|
||||
- patch_date
|
||||
- project
|
||||
- title
|
||||
- version
|
||||
title: patch_notes
|
||||
type: object
|
||||
patch_notes_input:
|
||||
description: Schema for POST/PUT (server generates patchID & patch_date if omitted)
|
||||
description: Schema for POST/PUT (server generates patchID if omitted)
|
||||
example:
|
||||
title: Patch note 1
|
||||
changes: Fixed export bug
|
||||
version: 1.0.0
|
||||
patch_date: 2025-01-02
|
||||
project: Test-Projekt
|
||||
properties:
|
||||
title:
|
||||
title: title
|
||||
type: string
|
||||
changes:
|
||||
title: changes
|
||||
type: string
|
||||
version:
|
||||
title: version
|
||||
type: string
|
||||
patch_date:
|
||||
format: date
|
||||
title: patch_date
|
||||
type: string
|
||||
project:
|
||||
type: string
|
||||
required:
|
||||
- changes
|
||||
- patch_date
|
||||
- project
|
||||
- title
|
||||
- version
|
||||
title: patch_notes_input
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
eeee
|
||||
123
|
||||
Reference in New Issue
Block a user