Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restart Field Report numbering at 1 each event #1506

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ims/store/_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -1571,11 +1571,11 @@ def fieldReportWithNumber(txn: Transaction) -> FieldReport:
)
raise

def _nextFieldReportNumber(self, txn: Transaction) -> int:
def _nextFieldReportNumber(self, eventID: str, txn: Transaction) -> int:
"""
Look up the next available field report number.
"""
txn.execute(self.query.maxFieldReportNumber.text)
txn.execute(self.query.maxFieldReportNumber.text, {"eventID": eventID})
row = txn.fetchone()
assert row is not None
number = cast(Optional[int], row["max(NUMBER)"])
Expand Down Expand Up @@ -1645,7 +1645,7 @@ def createFieldReport(
) -> FieldReport:
if not directImport:
# Assign the incident number a number
number = self._nextFieldReportNumber(txn)
number = self._nextFieldReportNumber(fieldReport.eventID, txn)
fieldReport = fieldReport.replace(number=number)

# Write incident row
Expand Down
3 changes: 2 additions & 1 deletion src/ims/store/mysql/_queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,9 @@
),
maxFieldReportNumber=Query(
"look up maximum field report number",
"""
f"""
select max(NUMBER) from FIELD_REPORT
where EVENT = ({query_eventID})
""",
),
fieldReports=Query(
Expand Down
3 changes: 2 additions & 1 deletion src/ims/store/sqlite/_queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,9 @@
),
maxFieldReportNumber=Query(
"look up maximum field report number",
"""
f"""
select max(NUMBER) from FIELD_REPORT
where EVENT = ({query_eventID})
""",
),
fieldReports=Query(
Expand Down
Loading