c9f8122600
The Site's page sat at the repository root while its scripts lived in local/static, a split with no reason behind it. They are together in web/ now, with the page as index.html, which is also what the image serves. app.py held the adapters, the configuration, the shared query helpers and nineteen routes; customer.py held fourteen more but could not import from it without a cycle, so it was wired by passing nine callables into install_routes. Configuration and shared helpers move to local/runtime.py, the rules for attaching artwork to an order move to local/artwork.py where a customer correction and an operator final-file set can share them, and the routes become seven routers under local/api. app.py is 48 lines that create the application, apply the middleware and include them. Routers import downwards only. Three faults came out of the extraction and are worth recording, because each passed a check that looked sufficient. ast reports a function's line at the def, so every decorator on the line above fell outside the extracted range: twelve routes and the security middleware were defined but never registered, and the files still imported and parsed cleanly. Names the old closure renamed on the way in, and a Jsonb import, were missing in three modules. A name-resolution pass over every new module found those; the route count matching the original exactly, 32, is what confirmed the first. The release gate's marker for the fake payment adapter pointed at app.py and the adapter moved to runtime.py, so the gate passed while the condition it guards was unchanged. That is the same silent decay 2.5 set out to fix. A test now asserts every marker still matches something in its file, so the next move fails loudly. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
51 lines
3.1 KiB
Python
51 lines
3.1 KiB
Python
"""Attaching artwork to an order: the rules shared by customers and operators.
|
|
|
|
A customer submits a correction and an operator submits the final set; both go
|
|
through the same checks, so the rule about what may be attached, when, and what
|
|
it does to retention lives in one place.
|
|
"""
|
|
from datetime import datetime, timedelta, timezone
|
|
from uuid import UUID, uuid4
|
|
|
|
from fastapi import HTTPException
|
|
|
|
from .runtime import upload_row
|
|
from .scanning import require_clean
|
|
|
|
def submit_files(c, order, body, identity, kind, actor):
|
|
if order['version'] != body.version:
|
|
raise HTTPException(409, 'Order changed. Refresh before submitting files.')
|
|
if kind == 'final' and order['state'] not in ('rec','tra','cor'):
|
|
raise HTTPException(409, 'Final files can only change during artwork review')
|
|
if kind == 'correction' and order['state'] != 'cor':
|
|
raise HTTPException(409, 'This order is not awaiting artwork correction')
|
|
if len({f.upload_id for f in body.files}) != len(body.files):
|
|
raise HTTPException(422, 'Each uploaded file must appear once')
|
|
count = len(order['snapshot']['items'])
|
|
if any(f.item_index >= count for f in body.files):
|
|
raise HTTPException(422, 'Invalid order item')
|
|
if kind == 'final' and {f.item_index for f in body.files} != set(range(count)):
|
|
raise HTTPException(422, 'Final-file set must cover every order item')
|
|
original_ids = [UUID(uid) for item in order['snapshot']['items'] for uid in item['uploads']]
|
|
first = c.execute('SELECT min(created_at) AS first FROM dtf_local.uploads WHERE id=ANY(%s)', (original_ids,)).fetchone()['first']
|
|
expiry = first + timedelta(days=30)
|
|
if expiry <= datetime.now(timezone.utc):
|
|
raise HTTPException(410, 'Order artwork retention has expired')
|
|
for ref in body.files:
|
|
upload = upload_row(c, ref.upload_id, identity, lock=True)
|
|
if not upload['complete']:
|
|
raise HTTPException(409, 'Complete all uploads first')
|
|
require_clean(upload)
|
|
if c.execute('SELECT id FROM dtf_local.order_files WHERE upload_id=%s', (ref.upload_id,)).fetchone():
|
|
raise HTTPException(409, 'File is already attached. Upload a new revision.')
|
|
c.execute('UPDATE dtf_local.order_files SET active=false WHERE order_id=%s AND kind=%s', (order['id'],kind))
|
|
for ref in body.files:
|
|
c.execute('INSERT INTO dtf_local.order_files(id,order_id,upload_id,item_index,kind,note,created_by) VALUES(%s,%s,%s,%s,%s,%s,%s)',
|
|
(uuid4(),order['id'],ref.upload_id,ref.item_index,kind,body.note,actor))
|
|
c.execute('UPDATE dtf_local.uploads SET expires_at=LEAST(expires_at,%s) WHERE id=%s', (expiry,ref.upload_id))
|
|
c.execute('UPDATE dtf_local.orders SET version=version+1,updated_at=now() WHERE id=%s', (order['id'],))
|
|
if kind == 'final':
|
|
# Artwork approval, not commercial quote approval, starts original cleanup.
|
|
c.execute("UPDATE dtf_local.uploads SET expires_at=LEAST(expires_at,now()+interval '7 days') WHERE id=ANY(%s)", (original_ids,))
|
|
return {'ok': True, 'version': order['version']+1, 'expires_at': expiry}
|