diff --git a/backend/src/repositories/auditRepository.test.ts b/backend/src/repositories/auditRepository.test.ts new file mode 100644 index 0000000..ec0fc07 --- /dev/null +++ b/backend/src/repositories/auditRepository.test.ts @@ -0,0 +1,20 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { createFlockNote, deleteFlockNote } from './auditRepository.js'; +import { mockDb } from '../test/mockDb.js'; + +test('bird notes require a current, non-memorialized bird in the workspace', async () => { + const { calls } = mockDb({ rows: [] }); + const result = await createFlockNote({ workspaceId: 1, birdId: 'bird-1', body: 'Note', createdByUserId: 'user-1' }); + assert.equal(result, null); + assert.match(calls[0].text, /birds.workspace_id = \$1\s+AND birds.memorialized_at IS NULL/); + assert.deepEqual(calls[0].params, [1, 'bird-1', 'Note', 'Note', 'user-1']); +}); + +test('deleting bird notes preserves memorialized and transferred bird history', async () => { + const { calls } = mockDb({ rows: [] }); + assert.equal(await deleteFlockNote('note-1', 1), null); + assert.match(calls[0].text, /bird_id IS NULL OR EXISTS/); + assert.match(calls[0].text, /birds.id = flock_notes.bird_id/); + assert.match(calls[0].text, /birds.workspace_id = \$2\s+AND birds.memorialized_at IS NULL/); +}); diff --git a/backend/src/repositories/auditRepository.ts b/backend/src/repositories/auditRepository.ts index df49149..b385880 100644 --- a/backend/src/repositories/auditRepository.ts +++ b/backend/src/repositories/auditRepository.ts @@ -98,6 +98,7 @@ export const createFlockNote = async ({ FROM birds WHERE birds.id = $2 AND birds.workspace_id = $1 + AND birds.memorialized_at IS NULL ) RETURNING id, workspace_id, bird_id, title, body, created_by_user_id, created_at, updated_at ) @@ -125,6 +126,12 @@ export const deleteFlockNote = async (noteId: string, workspaceId: number) => { `DELETE FROM flock_notes WHERE id = $1 AND workspace_id = $2 + AND (bird_id IS NULL OR EXISTS ( + SELECT 1 FROM birds + WHERE birds.id = flock_notes.bird_id + AND birds.workspace_id = $2 + AND birds.memorialized_at IS NULL + )) RETURNING id, title`, [noteId, workspaceId], ); diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 447550f..ffa1373 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -2263,9 +2263,10 @@ function App() { const [removingWorkspaceMemberId, setRemovingWorkspaceMemberId] = useState(''); const [expandedSettingsSection, setExpandedSettingsSection] = useState(null); + const flockBirds = useMemo(() => sortBirdsByName([...birds, ...memorializedBirds]), [birds, memorializedBirds]); const selectedBird = useMemo( - () => birds.find((bird) => bird.id === selectedBirdId) ?? null, - [birds, selectedBirdId], + () => flockBirds.find((bird) => bird.id === selectedBirdId) ?? null, + [flockBirds, selectedBirdId], ); const isBillingOwner = Boolean( authSession?.user.email && @@ -2982,7 +2983,7 @@ function App() { setBirds(nextBirds); setMemorializedBirds(data.memorializedBirds ?? []); - setSelectedBirdId((current) => (current && nextBirds.some((bird) => bird.id === current) ? current : '')); + setSelectedBirdId((current) => (current && [...nextBirds, ...(data.memorializedBirds ?? [])].some((bird) => bird.id === current) ? current : '')); if (membersResponse.ok) { const membersData = (await readJsonSafely<{ members?: WorkspaceMember[] }>(membersResponse)) ?? {}; @@ -3680,6 +3681,7 @@ function App() { }; const startEditBird = (bird: Bird) => { + if (bird.memorializedAt) return; setSelectedBirdId(bird.id); setEditingBirdId(bird.id); setBirdEditorOpen(true); @@ -4660,7 +4662,7 @@ function App() { } const confirmed = window.confirm( - `Memorialize ${selectedBird.name}?\n\nThis cannot be undone by you. ${selectedBird.name} will become read-only, hidden from the standard flock view, and excluded from the subscription bird count.`, + `Memorialize ${selectedBird.name}?\n\nThis cannot be undone by you. ${selectedBird.name} will become read-only, shown softly faded in the flock, and excluded from the subscription bird count.`, ); if (!confirmed) { @@ -4689,17 +4691,14 @@ function App() { const memorializedBird = data.bird; setBirds((current) => current.filter((bird) => bird.id !== memorializedBird.id)); setMemorializedBirds((current) => sortBirdsByName([...current.filter((bird) => bird.id !== memorializedBird.id), memorializedBird])); - setSelectedBirdId(''); + setSelectedBirdId(memorializedBird.id); + setBirdEditorOpen(false); setEditingBirdId(''); setBirdForm(emptyBirdForm); setBirdPhotoName(''); setPhotoCrop(null); setPhotoDrag(null); setMemorializeBirdForm(emptyMemorializeBirdForm()); - setWeights([]); - setVetVisits([]); - setMedications([]); - setMedicationAdministrations([]); setAllBirdWeights((current) => { const next = { ...current }; delete next[memorializedBird.id]; @@ -6364,7 +6363,7 @@ function App() {
- {birds.map((bird) => { + {flockBirds.map((bird) => { const weightRangeAlert = outOfRangeBirds.find((alert) => alert.bird.id === bird.id) ?? null; const vetVisitAlertSignature = getVetVisitAlertSignature(bird.id); const hasVetVisitAlert = vetVisitDueBirdIds.has(bird.id); @@ -6372,7 +6371,7 @@ function App() { return (
- {formatWeight(bird.latestWeightGrams)} + {!bird.memorializedAt || bird.latestWeightGrams !== null ? ( + {formatWeight(bird.latestWeightGrams)} + ) : null} - {weightRangeAlert || hasVetVisitAlert ? ( + {!bird.memorializedAt && (weightRangeAlert || hasVetVisitAlert) ? (
{weightRangeAlert ? ( @@ -7127,7 +7129,7 @@ function App() {

Flock member

- {selectedBirdWeightRangeAlert || selectedBirdWeightDropAlerts.length || selectedBirdHasVetVisitAlert ? ( + {!selectedBird.memorializedAt && (selectedBirdWeightRangeAlert || selectedBirdWeightDropAlerts.length || selectedBirdHasVetVisitAlert) ? (
{selectedBirdWeightRangeAlert ? ( @@ -7180,7 +7182,7 @@ function App() {
<> -
+
{`${selectedBird.name}`}
{selectedBird.publicProfileEnabled && selectedBird.publicProfileCode ? ( @@ -7190,7 +7192,7 @@ function App() { ) : null} -
-
+ {selectedBird.memorializedAt ?

In memory of {selectedBird.name}{selectedBird.memorializedOn ? ` · ${formatDate(selectedBird.memorializedOn)}` : ''}. This profile and its care history are read-only.

: null} +
{selectedBirdTab === 'info' ? (
@@ -7267,7 +7270,7 @@ function App() {

Medication schedule

-
{renderMedicationList({ showAdministrationControls: true })}
+
{renderMedicationList({ showAdministrationControls: !selectedBird.memorializedAt })}
) : null}
@@ -7434,7 +7437,7 @@ function App() { -
+ {!selectedBird.memorializedAt ? (
- {editingWeightId ? ( - ) : null}
-
+ ) : null}
{editableWeights .map((weight) => ( @@ -7483,7 +7486,7 @@ function App() { {formatDate(weight.recordedOn)} {weight.notes || 'No notes recorded.'}
-
@@ -7510,7 +7513,7 @@ function App() { setVeterinaryInfoForm(toVeterinaryInfoForm(selectedBird)); setEditingVeterinaryInfo(true); }} - type="button" + disabled={Boolean(selectedBird.memorializedAt)} type="button" aria-label={`Edit veterinary info for ${selectedBird.name}`} title="Edit veterinary info" > @@ -7522,7 +7525,7 @@ function App() { ) : null}
- {editingVeterinaryInfo ? ( + {editingVeterinaryInfo && !selectedBird.memorializedAt ? (
- @@ -7604,7 +7607,7 @@ function App() {
- + {!selectedBird.memorializedAt ? (
- {editingVetVisitId ? ( - ) : null}
-
+ ) : null}
{vetVisits.length ? ( @@ -7661,7 +7664,7 @@ function App() { {visit.notes || 'No notes recorded.'}
- {editingVetVisitId === visit.id ? ( @@ -7669,7 +7672,7 @@ function App() { className="secondary-button" onClick={() => handleDeleteVetVisit(visit.id)} type="button" - disabled={deletingVetVisitId === visit.id} + disabled={Boolean(selectedBird.memorializedAt) || (deletingVetVisitId === visit.id)} > {deletingVetVisitId === visit.id ? 'Deleting...' : 'Delete'} @@ -7698,7 +7701,7 @@ function App() {

{selectedBirdNotes.length} total

-
+ {!selectedBird.memorializedAt ? (