@aeolus-fleet/core 0.39.0 → 0.40.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -2
- package/dist/adapters/cli/fleet-init.d.ts +1 -1
- package/dist/adapters/cli/fleet-init.js +5 -3
- package/dist/adapters/cli/fleet-init.js.map +1 -1
- package/dist/adapters/cli/fleet-restored.d.ts +19 -0
- package/dist/adapters/cli/fleet-restored.js +37 -0
- package/dist/adapters/cli/fleet-restored.js.map +1 -0
- package/dist/adapters/cli/io.d.ts +5 -2
- package/dist/adapters/cli/io.js.map +1 -1
- package/dist/adapters/cli/run.d.ts +2 -0
- package/dist/adapters/cli/run.js +10 -2
- package/dist/adapters/cli/run.js.map +1 -1
- package/dist/adapters/prisma/client.d.ts +8 -2
- package/dist/adapters/prisma/client.js +3 -3
- package/dist/adapters/prisma/client.js.map +1 -1
- package/dist/adapters/prisma/content-type-sql.d.ts +11 -0
- package/dist/adapters/prisma/content-type-sql.js +41 -0
- package/dist/adapters/prisma/content-type-sql.js.map +1 -0
- package/dist/adapters/prisma/core-connections.d.ts +8 -0
- package/dist/adapters/prisma/core-connections.js +18 -0
- package/dist/adapters/prisma/core-connections.js.map +1 -0
- package/dist/adapters/prisma/exchange-rollups.d.ts +3 -1
- package/dist/adapters/prisma/exchange-rollups.js +25 -21
- package/dist/adapters/prisma/exchange-rollups.js.map +1 -1
- package/dist/adapters/prisma/fill-message-question-ids.d.ts +7 -0
- package/dist/adapters/prisma/fill-message-question-ids.js +12 -0
- package/dist/adapters/prisma/fill-message-question-ids.js.map +1 -0
- package/dist/adapters/prisma/fleet-counter.js +1 -1
- package/dist/adapters/prisma/fleet-counter.js.map +1 -1
- package/dist/adapters/prisma/fleet-removal.d.ts +17 -0
- package/dist/adapters/prisma/fleet-removal.js +109 -0
- package/dist/adapters/prisma/fleet-removal.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +6 -0
- package/dist/adapters/prisma/generated/client.d.ts +6 -0
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +0 -30
- package/dist/adapters/prisma/generated/enums.d.ts +0 -6
- package/dist/adapters/prisma/generated/enums.js +0 -5
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +11 -0
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +89 -10
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +13 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +13 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +13 -2
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Exchange.d.ts +60 -1
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +700 -1
- package/dist/adapters/prisma/generated/models/Message.d.ts +174 -1
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.d.ts +1132 -0
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js +2 -0
- package/dist/adapters/prisma/generated/models/MessageMetadataBackfill.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Operator.d.ts +1 -40
- package/dist/adapters/prisma/generated/models.d.ts +1 -0
- package/dist/adapters/prisma/health-bootstrap-index.d.ts +2 -0
- package/dist/adapters/prisma/health-bootstrap-index.js +15 -0
- package/dist/adapters/prisma/health-bootstrap-index.js.map +1 -0
- package/dist/adapters/prisma/health-snapshots.js +6 -3
- package/dist/adapters/prisma/health-snapshots.js.map +1 -1
- package/dist/adapters/prisma/history.d.ts +3 -1
- package/dist/adapters/prisma/history.js +22 -4
- package/dist/adapters/prisma/history.js.map +1 -1
- package/dist/adapters/prisma/identity.js +6 -9
- package/dist/adapters/prisma/identity.js.map +1 -1
- package/dist/adapters/prisma/index-after-start.d.ts +16 -0
- package/dist/adapters/prisma/index-after-start.js +78 -0
- package/dist/adapters/prisma/index-after-start.js.map +1 -0
- package/dist/adapters/prisma/installation.js +1 -1
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/message-metadata-fill.d.ts +40 -0
- package/dist/adapters/prisma/message-metadata-fill.js +122 -0
- package/dist/adapters/prisma/message-metadata-fill.js.map +1 -0
- package/dist/adapters/prisma/messaging.d.ts +29 -2
- package/dist/adapters/prisma/messaging.js +98 -41
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/page-with-messages.d.ts +11 -0
- package/dist/adapters/prisma/page-with-messages.js +42 -0
- package/dist/adapters/prisma/page-with-messages.js.map +1 -0
- package/dist/adapters/prisma/registry.js +32 -51
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +3 -3
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/sealings.js +23 -7
- package/dist/adapters/prisma/sealings.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +4 -2
- package/dist/adapters/prisma/unit-of-work.js +4 -0
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/prisma/unseen-plain-messages.d.ts +3 -0
- package/dist/adapters/prisma/unseen-plain-messages.js +20 -0
- package/dist/adapters/prisma/unseen-plain-messages.js.map +1 -0
- package/dist/adapters/trpc/console.d.ts +1 -10
- package/dist/adapters/trpc/console.js +2 -10
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +2 -2
- package/dist/adapters/trpc/fleet.d.ts +12 -1
- package/dist/adapters/trpc/fleet.js +9 -3
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +17 -11
- package/dist/adapters/trpc/ship.d.ts +6 -2
- package/dist/adapters/trpc/ship.js +4 -2
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.js +1 -0
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +4 -0
- package/dist/app.js +71 -2
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-core.js +5 -1
- package/dist/bin/aeolus-core.js.map +1 -1
- package/dist/domain/identity/operator-account.d.ts +1 -3
- package/dist/domain/identity/operator-account.js.map +1 -1
- package/dist/domain/identity/ports.d.ts +1 -6
- package/dist/domain/identity/read-account.d.ts +2 -3
- package/dist/domain/identity/read-account.js +1 -2
- package/dist/domain/identity/read-account.js.map +1 -1
- package/dist/domain/messaging/exchange.d.ts +3 -1
- package/dist/domain/messaging/exchange.js +10 -6
- package/dist/domain/messaging/exchange.js.map +1 -1
- package/dist/domain/messaging/fill-message-metadata.d.ts +29 -0
- package/dist/domain/messaging/fill-message-metadata.js +54 -0
- package/dist/domain/messaging/fill-message-metadata.js.map +1 -0
- package/dist/domain/messaging/message.d.ts +4 -0
- package/dist/domain/messaging/message.js +7 -1
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +62 -2
- package/dist/domain/messaging/public.d.ts +1 -0
- package/dist/domain/messaging/public.js +1 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/messaging/read-exchanges.d.ts +1 -0
- package/dist/domain/messaging/read-exchanges.js +2 -1
- package/dist/domain/messaging/read-exchanges.js.map +1 -1
- package/dist/domain/messaging/retired-asker.d.ts +33 -0
- package/dist/domain/messaging/retired-asker.js +81 -0
- package/dist/domain/messaging/retired-asker.js.map +1 -0
- package/dist/domain/messaging/turn-on-sealing.js +1 -1
- package/dist/domain/messaging/turn-on-sealing.js.map +1 -1
- package/dist/domain/registry/commission-ship.d.ts +2 -1
- package/dist/domain/registry/commission-ship.js +3 -2
- package/dist/domain/registry/commission-ship.js.map +1 -1
- package/dist/domain/registry/delete-fleet.d.ts +5 -3
- package/dist/domain/registry/delete-fleet.js +6 -4
- package/dist/domain/registry/delete-fleet.js.map +1 -1
- package/dist/domain/registry/end-leases-after-restore.d.ts +29 -0
- package/dist/domain/registry/end-leases-after-restore.js +31 -0
- package/dist/domain/registry/end-leases-after-restore.js.map +1 -0
- package/dist/domain/registry/found-fleet.js +1 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/lease.d.ts +3 -2
- package/dist/domain/registry/lease.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +30 -6
- package/dist/domain/registry/public.d.ts +1 -1
- package/dist/domain/registry/read-last-named-owner.d.ts +15 -0
- package/dist/domain/registry/read-last-named-owner.js +15 -0
- package/dist/domain/registry/read-last-named-owner.js.map +1 -0
- package/dist/domain/registry/remove-deleted-fleets.d.ts +30 -0
- package/dist/domain/registry/remove-deleted-fleets.js +54 -0
- package/dist/domain/registry/remove-deleted-fleets.js.map +1 -0
- package/dist/domain/registry/retire-ship.d.ts +6 -2
- package/dist/domain/registry/retire-ship.js +9 -1
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +9 -5
- package/dist/domain/registry/ship.js +33 -4
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/follow-fleet.d.ts +5 -3
- package/dist/domain/shared/follow-fleet.js +11 -2
- package/dist/domain/shared/follow-fleet.js.map +1 -1
- package/dist/domain/shared/health-snapshot.js +7 -2
- package/dist/domain/shared/health-snapshot.js.map +1 -1
- package/dist/domain/shared/read-sent-message.d.ts +7 -4
- package/dist/domain/shared/read-sent-message.js +6 -15
- package/dist/domain/shared/read-sent-message.js.map +1 -1
- package/dist/maintenance-pass.d.ts +1 -1
- package/dist/maintenance-pass.js +4 -1
- package/dist/maintenance-pass.js.map +1 -1
- package/dist/testing/container-sweeper.d.ts +20 -0
- package/dist/testing/container-sweeper.js +47 -14
- package/dist/testing/container-sweeper.js.map +1 -1
- package/dist/testing/postgres-global-setup.js +2 -1
- package/dist/testing/postgres-global-setup.js.map +1 -1
- package/dist/testing/stop-container.d.ts +21 -0
- package/dist/testing/stop-container.js +31 -0
- package/dist/testing/stop-container.js.map +1 -0
- package/dist/wiring.d.ts +8 -2
- package/dist/wiring.js +7 -3
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- package/src/adapters/prisma/migrations/20261113120000_events_owner_set_index/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261115090000_messages_asked_answered_question_id/migration.sql +20 -0
- package/src/adapters/prisma/migrations/20261115100000_unseen_plain_messages/migration.sql +3 -0
- package/src/adapters/prisma/migrations/20261115110000_theme_per_browser/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261115120000_fleet_deleted_at/migration.sql +2 -0
- package/src/adapters/prisma/schema.prisma +29 -14
- package/dist/domain/identity/set-theme.d.ts +0 -21
- package/dist/domain/identity/set-theme.js +0 -19
- package/dist/domain/identity/set-theme.js.map +0 -1
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import { PING_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
1
|
+
import { idSchema, PING_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
2
|
+
import { z } from 'zod';
|
|
2
3
|
import { isInExchange } from '../../domain/messaging/exchange.js';
|
|
4
|
+
import { answeredQuestionIdIn, askedQuestionIdIn, isAnswerContentType, isAskingContentType } from './content-type-sql.js';
|
|
3
5
|
import { addChangedDelivery } from './exchange-rollups.js';
|
|
4
6
|
import { Prisma } from './generated/client.js';
|
|
5
7
|
import { payloadColumnsOf, toDeliveryFromSql, toMessage } from './rows.js';
|
|
8
|
+
import { pageWithMessages } from './page-with-messages.js';
|
|
6
9
|
import { plainBytesOf } from '../../domain/messaging/sealed-payload.js';
|
|
7
10
|
import { pageOf } from '../../domain/shared/page.js';
|
|
8
11
|
/**
|
|
@@ -12,6 +15,55 @@ import { pageOf } from '../../domain/shared/page.js';
|
|
|
12
15
|
* held only until commit, and always after the fleet's lock for its event
|
|
13
16
|
* numbers, so the two locks are taken in one order and never deadlock.
|
|
14
17
|
*/
|
|
18
|
+
/**
|
|
19
|
+
* The ship's open questions (#1632, decision 0038), by message id from after
|
|
20
|
+
* the cursor, at most limit: along messages_fleet_id_sender_ship_id_id_asked_idx,
|
|
21
|
+
* each question's answer looked up by the replies index and its withdrawal or
|
|
22
|
+
* replacement by the question id index, by the uuids stored at send, so a
|
|
23
|
+
* sealed fleet's are found too. Until the after-start fill visits a plain
|
|
24
|
+
* question or answer, its payload supplies that uuid through an indexed
|
|
25
|
+
* sender range or a reply lookup. Only an answer from
|
|
26
|
+
* the asked ship, and a withdrawal or replacement from the ship itself to it,
|
|
27
|
+
* settles a question; a ship that is retired is never asked again.
|
|
28
|
+
*/
|
|
29
|
+
export function openQuestionsStatement(fleetId, { shipId, after, limit }) {
|
|
30
|
+
return Prisma.sql `
|
|
31
|
+
SELECT q.id AS "messageId", q.selector_ship_id AS "askedShipId", q.effective_question_id AS "questionId"
|
|
32
|
+
FROM (
|
|
33
|
+
SELECT m.*, m.asked_question_id AS effective_question_id FROM messages m
|
|
34
|
+
WHERE m.fleet_id = ${fleetId} AND m.sender_ship_id = ${shipId} AND m.asked_question_id IS NOT NULL
|
|
35
|
+
UNION ALL
|
|
36
|
+
SELECT m.*, ${askedQuestionIdIn('m.payload')} AS effective_question_id FROM messages m
|
|
37
|
+
WHERE m.fleet_id = ${fleetId} AND m.sender_ship_id = ${shipId}
|
|
38
|
+
AND m.asked_question_id IS NULL AND m.payload IS NOT NULL
|
|
39
|
+
AND ${isAskingContentType('m.content_type')}
|
|
40
|
+
) q
|
|
41
|
+
JOIN ships s ON s.fleet_id = q.fleet_id AND s.id = q.selector_ship_id
|
|
42
|
+
WHERE q.fleet_id = ${fleetId}
|
|
43
|
+
AND q.sender_ship_id = ${shipId}
|
|
44
|
+
AND q.effective_question_id IS NOT NULL
|
|
45
|
+
AND q.selector_kind = 'ship'
|
|
46
|
+
AND q.selector_ship_id <> ${shipId}
|
|
47
|
+
AND s.retired_at IS NULL
|
|
48
|
+
${after === undefined ? Prisma.empty : Prisma.sql `AND q.id > ${after}`}
|
|
49
|
+
AND NOT EXISTS (
|
|
50
|
+
SELECT 1 FROM messages a
|
|
51
|
+
WHERE a.fleet_id = q.fleet_id
|
|
52
|
+
AND a.in_reply_to_message_id = q.id
|
|
53
|
+
AND a.sender_ship_id = q.selector_ship_id
|
|
54
|
+
AND COALESCE(a.answered_question_id,
|
|
55
|
+
CASE WHEN ${isAnswerContentType('a.content_type')}
|
|
56
|
+
THEN ${answeredQuestionIdIn('a.payload')} END) = q.effective_question_id)
|
|
57
|
+
AND NOT EXISTS (
|
|
58
|
+
SELECT 1 FROM messages w
|
|
59
|
+
WHERE w.fleet_id = q.fleet_id
|
|
60
|
+
AND w.question_id = q.effective_question_id
|
|
61
|
+
AND w.sender_ship_id = q.sender_ship_id
|
|
62
|
+
AND w.selector_kind = 'ship'
|
|
63
|
+
AND w.selector_ship_id = q.selector_ship_id)
|
|
64
|
+
ORDER BY q.id ASC
|
|
65
|
+
LIMIT ${limit}`;
|
|
66
|
+
}
|
|
15
67
|
export function createPrismaMessageRepository(db) {
|
|
16
68
|
const counted = [];
|
|
17
69
|
return {
|
|
@@ -46,6 +98,8 @@ export function createPrismaMessageRepository(db) {
|
|
|
46
98
|
selectorValueIds: selector.kind === 'label' ? [...selector.valueIds] : [],
|
|
47
99
|
...payloadColumnsOf(message.payload),
|
|
48
100
|
questionId: message.questionId,
|
|
101
|
+
askedQuestionId: message.askedQuestionId,
|
|
102
|
+
answeredQuestionId: message.answeredQuestionId,
|
|
49
103
|
contentType: message.contentType,
|
|
50
104
|
model: message.model,
|
|
51
105
|
idempotencyKey: message.idempotencyKey,
|
|
@@ -75,6 +129,9 @@ export function createPrismaMessageRepository(db) {
|
|
|
75
129
|
const row = await db.message.findFirst({ where: { fleetId, id: messageId } });
|
|
76
130
|
return row ? toMessage(row) : undefined;
|
|
77
131
|
},
|
|
132
|
+
listOpenQuestionsOf: async (fleetId, query) => z
|
|
133
|
+
.array(z.object({ messageId: idSchema('message'), askedShipId: idSchema('ship'), questionId: z.string() }))
|
|
134
|
+
.parse(await db.$queryRaw(openQuestionsStatement(fleetId, query))),
|
|
78
135
|
};
|
|
79
136
|
}
|
|
80
137
|
/** The counted messages summed per fleet and day, in one order, so concurrent units of work lock the rows alike. */
|
|
@@ -103,6 +160,33 @@ async function withMessages(db, { fleetId, deliveries }) {
|
|
|
103
160
|
return { delivery, message };
|
|
104
161
|
});
|
|
105
162
|
}
|
|
163
|
+
/**
|
|
164
|
+
* SKIP LOCKED: a delivery another receive holds is passed over, never
|
|
165
|
+
* waited for, so two receivers never get the same one (ADR 0003). The
|
|
166
|
+
* limit counts the rows locked, not the rows scanned. Read committed: a
|
|
167
|
+
* row another receive claimed and committed meanwhile is checked again
|
|
168
|
+
* and no longer matches. One statement for the order: forced first
|
|
169
|
+
* (decision 0040), then the crew's own in flight, then pending, each
|
|
170
|
+
* oldest first. With inReplyTo, only deliveries of replies to that
|
|
171
|
+
* message, found through the messages' (fleet_id, in_reply_to_message_id) index.
|
|
172
|
+
*/
|
|
173
|
+
export function claimableStatement({ fleetId, shipId, type, leaseId, limit, excluding, inReplyTo, shouldSkipHanded }) {
|
|
174
|
+
return Prisma.sql `
|
|
175
|
+
SELECT id, fleet_id, message_id, recipient_ship_id, recipient_type, state::text AS state,
|
|
176
|
+
claimed_by_ship_id, claimed_by_lease_id, attempts, hand_over_number, handed_once_more_at, is_forced, created_at
|
|
177
|
+
FROM deliveries
|
|
178
|
+
WHERE fleet_id = ${fleetId}
|
|
179
|
+
AND ((state IN ('received', 'handed') AND claimed_by_lease_id = ${leaseId} AND id <> ALL(${[...excluding]}::text[]))
|
|
180
|
+
OR (state = 'pending'
|
|
181
|
+
AND (recipient_ship_id = ${shipId}
|
|
182
|
+
OR (recipient_type = ${type} AND (cardinality(reachable_ship_ids) = 0 OR ${shipId} = ANY(reachable_ship_ids))))))
|
|
183
|
+
AND (${shouldSkipHanded ?? false} = false OR state <> 'handed')
|
|
184
|
+
AND (${inReplyTo ?? null}::text IS NULL
|
|
185
|
+
OR message_id IN (SELECT id FROM messages WHERE fleet_id = ${fleetId} AND in_reply_to_message_id = ${inReplyTo ?? null}))
|
|
186
|
+
ORDER BY is_forced DESC, state = 'pending', created_at, id
|
|
187
|
+
LIMIT ${limit}
|
|
188
|
+
FOR UPDATE SKIP LOCKED`;
|
|
189
|
+
}
|
|
106
190
|
/**
|
|
107
191
|
* One page of an exchange: two halves, each read along the exchange index
|
|
108
192
|
* from the cursor and cut at the page: the other ship's deliveries that
|
|
@@ -162,6 +246,7 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
162
246
|
rollups.add(delivery.fleetId, {
|
|
163
247
|
after: {
|
|
164
248
|
messageId: delivery.messageId,
|
|
249
|
+
contentType: message.contentType,
|
|
165
250
|
senderShipId: message.senderShipId,
|
|
166
251
|
reachedShipId: recipient.kind === 'ship' ? recipient.shipId : delivery.claimedByShipId,
|
|
167
252
|
state: delivery.state,
|
|
@@ -202,29 +287,7 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
202
287
|
return { waiting, forced };
|
|
203
288
|
},
|
|
204
289
|
findClaimableForUpdate: async ({ fleetId, shipId, type, leaseId, limit, excluding, inReplyTo, shouldSkipHanded }) => {
|
|
205
|
-
|
|
206
|
-
// waited for, so two receivers never get the same one (ADR 0003). The
|
|
207
|
-
// limit counts the rows locked, not the rows scanned. Read committed: a
|
|
208
|
-
// row another receive claimed and committed meanwhile is checked again
|
|
209
|
-
// and no longer matches. One statement for the order: forced first
|
|
210
|
-
// (decision 0040), then the crew's own in flight, then pending, each
|
|
211
|
-
// oldest first. With inReplyTo, only deliveries of replies to that
|
|
212
|
-
// message, found through the messages' (fleet_id, in_reply_to_message_id) index.
|
|
213
|
-
const rows = await db.$queryRaw `
|
|
214
|
-
SELECT id, fleet_id, message_id, recipient_ship_id, recipient_type, state::text AS state,
|
|
215
|
-
claimed_by_ship_id, claimed_by_lease_id, attempts, hand_over_number, handed_once_more_at, is_forced, created_at
|
|
216
|
-
FROM deliveries
|
|
217
|
-
WHERE fleet_id = ${fleetId}
|
|
218
|
-
AND ((state IN ('received', 'handed') AND claimed_by_lease_id = ${leaseId} AND id <> ALL(${[...excluding]}::text[]))
|
|
219
|
-
OR (state = 'pending'
|
|
220
|
-
AND (recipient_ship_id = ${shipId}
|
|
221
|
-
OR (recipient_type = ${type} AND (cardinality(reachable_ship_ids) = 0 OR ${shipId} = ANY(reachable_ship_ids))))))
|
|
222
|
-
AND (${shouldSkipHanded ?? false} = false OR state <> 'handed')
|
|
223
|
-
AND (${inReplyTo ?? null}::text IS NULL
|
|
224
|
-
OR message_id IN (SELECT id FROM messages WHERE fleet_id = ${fleetId} AND in_reply_to_message_id = ${inReplyTo ?? null}))
|
|
225
|
-
ORDER BY is_forced DESC, state = 'pending', created_at, id
|
|
226
|
-
LIMIT ${limit}
|
|
227
|
-
FOR UPDATE SKIP LOCKED`;
|
|
290
|
+
const rows = await db.$queryRaw(claimableStatement({ fleetId, shipId, type, leaseId, limit, excluding, inReplyTo, shouldSkipHanded }));
|
|
228
291
|
const deliveries = rows.map(toDeliveryFromSql);
|
|
229
292
|
const messages = await db.message.findMany({
|
|
230
293
|
where: { fleetId, id: { in: deliveries.map((delivery) => delivery.messageId) } },
|
|
@@ -240,10 +303,12 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
240
303
|
});
|
|
241
304
|
},
|
|
242
305
|
findExchangePage: async (query) => {
|
|
243
|
-
const rows = await db
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
306
|
+
const rows = await pageWithMessages(db, {
|
|
307
|
+
statement: exchangePageStatement(query),
|
|
308
|
+
messageId: Prisma.sql `page.message_id`,
|
|
309
|
+
order: Prisma.sql `page.id DESC`,
|
|
310
|
+
});
|
|
311
|
+
return rows.map(({ row, message }) => ({ delivery: toDeliveryFromSql(row), message }));
|
|
247
312
|
},
|
|
248
313
|
findUnacknowledgedUpToForUpdate: async (query) => {
|
|
249
314
|
const rows = await db.$queryRaw(unacknowledgedUpToStatement(query));
|
|
@@ -255,7 +320,7 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
255
320
|
// id), and those of its type it claimed (the partial record index). A
|
|
256
321
|
// delivery is in one half only, so the merged page holds no repeat.
|
|
257
322
|
const after = cursor === undefined ? Prisma.empty : Prisma.sql `AND id < ${cursor}`;
|
|
258
|
-
const
|
|
323
|
+
const statement = Prisma.sql `
|
|
259
324
|
SELECT * FROM (
|
|
260
325
|
(SELECT id, fleet_id, message_id, recipient_ship_id, recipient_type, state::text AS state,
|
|
261
326
|
claimed_by_ship_id, claimed_by_lease_id, attempts, hand_over_number, handed_once_more_at, is_forced, created_at
|
|
@@ -273,17 +338,8 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
273
338
|
) AS record
|
|
274
339
|
ORDER BY id DESC
|
|
275
340
|
LIMIT ${limit + 1}`;
|
|
276
|
-
const
|
|
277
|
-
const
|
|
278
|
-
const byId = new Map(messages.map((row) => [row.id, toMessage(row)]));
|
|
279
|
-
const recorded = deliveries.map((delivery) => {
|
|
280
|
-
const message = byId.get(delivery.messageId);
|
|
281
|
-
if (!message) {
|
|
282
|
-
// The foreign key keeps every delivery's message in its fleet.
|
|
283
|
-
throw new Error(`Delivery ${delivery.id} has no message ${delivery.messageId}`);
|
|
284
|
-
}
|
|
285
|
-
return { delivery, message };
|
|
286
|
-
});
|
|
341
|
+
const rows = await pageWithMessages(db, { statement, messageId: Prisma.sql `page.message_id`, order: Prisma.sql `page.id DESC` });
|
|
342
|
+
const recorded = rows.map(({ row, message }) => ({ delivery: toDeliveryFromSql(row), message }));
|
|
287
343
|
return pageOf(recorded, { limit, cursorOf: (row) => row.delivery.id });
|
|
288
344
|
},
|
|
289
345
|
findForUpdate: async (fleetId, deliveryId) => {
|
|
@@ -338,7 +394,8 @@ export function createPrismaDeliveryRepository(db, rollups) {
|
|
|
338
394
|
hand_over_number = ${delivery.handOverNumber}::int, handed_once_more_at = ${delivery.handedOnceMoreAt}::timestamptz
|
|
339
395
|
FROM before
|
|
340
396
|
WHERE d.fleet_id = ${delivery.fleetId} AND d.id = before.id
|
|
341
|
-
RETURNING d.fleet_id, d.message_id, d.sender_ship_id, d.is_in_exchange,
|
|
397
|
+
RETURNING d.fleet_id, d.message_id, d.sender_ship_id, d.is_in_exchange,
|
|
398
|
+
(SELECT m.content_type FROM messages m WHERE m.fleet_id = d.fleet_id AND m.id = d.message_id) AS content_type, before.state AS before_state,
|
|
342
399
|
before.reached_ship_id AS before_reached_ship_id, d.state::text AS after_state, d.reached_ship_id AS after_reached_ship_id`;
|
|
343
400
|
for (const row of rows) {
|
|
344
401
|
addChangedDelivery(rollups, row);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging.js","sourceRoot":"","sources":["../../../src/adapters/prisma/messaging.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messaging.js","sourceRoot":"","sources":["../../../src/adapters/prisma/messaging.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Db } from './client.js';
|
|
2
|
+
import type { Prisma } from './generated/client.js';
|
|
3
|
+
/** Join after the indexed page limit, so only the bounded page loads payloads. */
|
|
4
|
+
export declare function pageWithMessages(db: Db, page: {
|
|
5
|
+
statement: Prisma.Sql;
|
|
6
|
+
messageId: Prisma.Sql;
|
|
7
|
+
order: Prisma.Sql;
|
|
8
|
+
}): Promise<{
|
|
9
|
+
row: unknown;
|
|
10
|
+
message: import("../../domain/messaging/message.js").Message;
|
|
11
|
+
}[]>;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/** Bounded pages and their messages share one statement snapshot, even while retention deletes them. */
|
|
2
|
+
import { idSchema } from '@aeolus-fleet/common';
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
import { toMessage } from './rows.js';
|
|
5
|
+
const joinedRow = z.looseObject({ storedMessageId: idSchema('message') });
|
|
6
|
+
/** Join after the indexed page limit, so only the bounded page loads payloads. */
|
|
7
|
+
export async function pageWithMessages(db, page) {
|
|
8
|
+
const rows = await db.$queryRaw `
|
|
9
|
+
SELECT page.*, m.id AS "storedMessageId",
|
|
10
|
+
m.fleet_id AS "fleetId",
|
|
11
|
+
m.sender_ship_id AS "senderShipId",
|
|
12
|
+
m.selector_kind AS "selectorKind",
|
|
13
|
+
m.selector_ship_id AS "selectorShipId",
|
|
14
|
+
m.selector_type AS "selectorType",
|
|
15
|
+
m.selector_value_ids AS "selectorValueIds",
|
|
16
|
+
m.payload AS "payload",
|
|
17
|
+
m.sealed_data_key_id AS "sealedDataKeyId",
|
|
18
|
+
m.sealed_nonce AS "sealedNonce",
|
|
19
|
+
m.sealed_ciphertext AS "sealedCiphertext",
|
|
20
|
+
m.sealed_payload_bytes AS "sealedPayloadBytes",
|
|
21
|
+
m.question_id AS "questionId",
|
|
22
|
+
m.asked_question_id AS "askedQuestionId",
|
|
23
|
+
m.answered_question_id AS "answeredQuestionId",
|
|
24
|
+
m.content_type AS "contentType",
|
|
25
|
+
m.model AS "model",
|
|
26
|
+
m.idempotency_key AS "idempotencyKey",
|
|
27
|
+
m.request_hash AS "requestHash",
|
|
28
|
+
m.in_reply_to_message_id AS "inReplyToMessageId",
|
|
29
|
+
m.resend_of_message_id AS "resendOfMessageId",
|
|
30
|
+
m.meeting_id AS "meetingId",
|
|
31
|
+
m.schedule_id AS "scheduleId",
|
|
32
|
+
m.send_time AS "sendTime",
|
|
33
|
+
m.created_at AS "createdAt"
|
|
34
|
+
FROM (${page.statement}) AS page
|
|
35
|
+
JOIN messages m ON m.fleet_id = page.fleet_id AND m.id = ${page.messageId}
|
|
36
|
+
ORDER BY ${page.order}`;
|
|
37
|
+
return rows.map((row) => {
|
|
38
|
+
const columns = joinedRow.parse(row);
|
|
39
|
+
return { row, message: toMessage({ ...columns, id: columns.storedMessageId }) };
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=page-with-messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"page-with-messages.js","sourceRoot":"","sources":["../../../src/adapters/prisma/page-with-messages.ts"],"names":[],"mappings":"AAAA,wGAAwG;AACxG,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC,EAAE,eAAe,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;AAE1E,kFAAkF;AAClF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAM,EAAE,IAAyE;IACtH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,SAAS,CAAW;;;;;;;;;;;;;;;;;;;;;;;;;;YA0BhC,IAAI,CAAC,SAAS;+DACqC,IAAI,CAAC,SAAS;eAC9D,IAAI,CAAC,KAAK,EAAE,CAAC;IAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC;IAClF,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -17,12 +17,12 @@ export function createPrismaFleetRepository(db) {
|
|
|
17
17
|
// A transaction-level advisory lock on one fixed key: released at commit or rollback.
|
|
18
18
|
await db.$executeRaw `SELECT pg_advisory_xact_lock(hashtext('aeolus:fleet-initialisation'))`;
|
|
19
19
|
},
|
|
20
|
-
count: () => db.fleet.count(),
|
|
20
|
+
count: () => db.fleet.count({ where: { deletedAt: null } }),
|
|
21
21
|
find: async (fleetId) => {
|
|
22
|
-
const row = await db.fleet.
|
|
22
|
+
const row = await db.fleet.findFirst({ where: { id: fleetId, deletedAt: null } });
|
|
23
23
|
return row ? toFleet(row) : undefined;
|
|
24
24
|
},
|
|
25
|
-
list: async () => (await db.fleet.findMany({ orderBy: { id: 'asc' } })).map(toFleet),
|
|
25
|
+
list: async () => (await db.fleet.findMany({ where: { deletedAt: null }, orderBy: { id: 'asc' } })).map(toFleet),
|
|
26
26
|
create: async (fleet) => {
|
|
27
27
|
await db.fleet.create({ data: fleet });
|
|
28
28
|
},
|
|
@@ -63,63 +63,26 @@ export function createPrismaFleetRepository(db) {
|
|
|
63
63
|
},
|
|
64
64
|
findForUpdate: async (fleetId) => {
|
|
65
65
|
const [row] = await db.$queryRaw `
|
|
66
|
-
SELECT id, name, created_at AS "createdAt" FROM fleets WHERE id = ${fleetId} FOR UPDATE`;
|
|
66
|
+
SELECT id, name, created_at AS "createdAt" FROM fleets WHERE id = ${fleetId} AND deleted_at IS NULL FOR UPDATE`;
|
|
67
67
|
return row === undefined ? undefined : toFleet(row);
|
|
68
68
|
},
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
// its
|
|
72
|
-
await db.$
|
|
73
|
-
// Children first: every foreign key restricts deletes. A message may answer
|
|
74
|
-
// or resend another of the fleet, so those links go before the messages.
|
|
75
|
-
await db.$executeRaw `DELETE FROM health_snapshot_deliveries WHERE fleet_id = ${fleetId}`;
|
|
76
|
-
await db.$executeRaw `DELETE FROM health_snapshots WHERE fleet_id = ${fleetId}`;
|
|
77
|
-
await db.$executeRaw `DELETE FROM events WHERE fleet_id = ${fleetId}`;
|
|
78
|
-
await db.$executeRaw `DELETE FROM commission_approvals WHERE fleet_id = ${fleetId}`;
|
|
79
|
-
await db.$executeRaw `DELETE FROM overdue_deliveries WHERE fleet_id = ${fleetId}`;
|
|
80
|
-
await db.$executeRaw `DELETE FROM exchanges WHERE fleet_id = ${fleetId}`;
|
|
81
|
-
await db.$executeRaw `DELETE FROM pruned_exchanges WHERE fleet_id = ${fleetId}`;
|
|
82
|
-
await db.$executeRaw `DELETE FROM deliveries WHERE fleet_id = ${fleetId}`;
|
|
83
|
-
// A schedule names the messages it replies to and sent, and a message the schedule it was sent for.
|
|
84
|
-
await db.$executeRaw `UPDATE messages SET in_reply_to_message_id = NULL, resend_of_message_id = NULL, schedule_id = NULL, send_time = NULL WHERE fleet_id = ${fleetId}`;
|
|
85
|
-
await db.$executeRaw `DELETE FROM schedules WHERE fleet_id = ${fleetId}`;
|
|
86
|
-
await db.$executeRaw `DELETE FROM messages WHERE fleet_id = ${fleetId}`;
|
|
87
|
-
await db.$executeRaw `DELETE FROM data_keys WHERE fleet_id = ${fleetId}`;
|
|
88
|
-
await db.$executeRaw `DELETE FROM fleet_feature_flags WHERE fleet_id = ${fleetId}`;
|
|
89
|
-
await db.$executeRaw `DELETE FROM meeting_mic_requests WHERE fleet_id = ${fleetId}`;
|
|
90
|
-
await db.$executeRaw `DELETE FROM meeting_participants WHERE fleet_id = ${fleetId}`;
|
|
91
|
-
await db.$executeRaw `DELETE FROM meetings WHERE fleet_id = ${fleetId}`;
|
|
92
|
-
await db.$executeRaw `DELETE FROM message_days WHERE fleet_id = ${fleetId}`;
|
|
69
|
+
markDeleted: async (fleetId, at) => {
|
|
70
|
+
await db.$executeRaw `UPDATE fleets SET deleted_at = ${at} WHERE id = ${fleetId}`;
|
|
71
|
+
// What signs in to the fleet and its crew requests end with the mark; everything else waits for the removal pass.
|
|
72
|
+
await db.$executeRaw `DELETE FROM credentials WHERE fleet_id = ${fleetId}`;
|
|
93
73
|
await db.$executeRaw `DELETE FROM notice_dismissals WHERE fleet_id = ${fleetId}`;
|
|
94
74
|
await db.$executeRaw `DELETE FROM guide_progress WHERE fleet_id = ${fleetId}`;
|
|
95
75
|
await db.$executeRaw `DELETE FROM account_notice_dismissals WHERE fleet_id = ${fleetId}`;
|
|
96
76
|
await db.$executeRaw `DELETE FROM account_guide_progress WHERE fleet_id = ${fleetId}`;
|
|
97
77
|
await db.$executeRaw `DELETE FROM console_sessions WHERE fleet_id = ${fleetId}`;
|
|
98
78
|
await db.$executeRaw `DELETE FROM sign_in_tickets WHERE fleet_id = ${fleetId}`;
|
|
99
|
-
await db.$executeRaw `DELETE FROM
|
|
79
|
+
await db.$executeRaw `DELETE FROM operators WHERE fleet_id = ${fleetId}`;
|
|
100
80
|
await db.$executeRaw `DELETE FROM crew_request_give_backs WHERE fleet_id = ${fleetId}`;
|
|
101
81
|
await db.$executeRaw `DELETE FROM crew_requests WHERE fleet_id = ${fleetId}`;
|
|
102
|
-
|
|
103
|
-
await db.$executeRaw `
|
|
104
|
-
await db.$executeRaw `DELETE FROM network_rules_drafts WHERE fleet_id = ${fleetId}`;
|
|
105
|
-
await db.$executeRaw `DELETE FROM reach_refusals WHERE fleet_id = ${fleetId}`;
|
|
106
|
-
await db.$executeRaw `DELETE FROM declared_network_rules WHERE fleet_id = ${fleetId}`;
|
|
107
|
-
await db.$executeRaw `DELETE FROM installation_declared_network_rules WHERE fleet_id = ${fleetId}`;
|
|
108
|
-
await db.$executeRaw `DELETE FROM scope_namespaces WHERE fleet_id = ${fleetId}`;
|
|
109
|
-
await db.$executeRaw `DELETE FROM defined_scopes WHERE fleet_id = ${fleetId}`;
|
|
110
|
-
await db.$executeRaw `DELETE FROM verified_facts WHERE fleet_id = ${fleetId}`;
|
|
111
|
-
await db.$executeRaw `DELETE FROM alerts WHERE fleet_id = ${fleetId}`;
|
|
112
|
-
await db.$executeRaw `DELETE FROM ship_expectations WHERE fleet_id = ${fleetId}`;
|
|
113
|
-
await db.$executeRaw `DELETE FROM ship_labels WHERE fleet_id = ${fleetId}`;
|
|
114
|
-
await db.$executeRaw `DELETE FROM label_values WHERE fleet_id = ${fleetId}`;
|
|
115
|
-
await db.$executeRaw `DELETE FROM labels WHERE fleet_id = ${fleetId}`;
|
|
116
|
-
await db.$executeRaw `DELETE FROM leases WHERE fleet_id = ${fleetId}`;
|
|
117
|
-
await db.$executeRaw `DELETE FROM ships WHERE fleet_id = ${fleetId}`;
|
|
118
|
-
await db.$executeRaw `DELETE FROM operators WHERE fleet_id = ${fleetId}`;
|
|
119
|
-
// The request that created the fleet names it, so it goes too; a delete's record names nothing of it.
|
|
120
|
-
await db.$executeRaw `DELETE FROM installation_requests WHERE fleet_id = ${fleetId}`;
|
|
121
|
-
await db.$executeRaw `DELETE FROM fleets WHERE id = ${fleetId}`;
|
|
82
|
+
// Its data keys are shredded, so nothing it sealed opens again; the rows stay until the batches, as every message and schedule sealed under one restricts its delete.
|
|
83
|
+
await db.$executeRaw `UPDATE data_keys SET wrapped_by_company_key = ''::bytea, wrapped_by_recovery_key = NULL, check_value = ''::bytea WHERE fleet_id = ${fleetId}`;
|
|
122
84
|
},
|
|
85
|
+
listDeleted: async () => (await db.fleet.findMany({ where: { deletedAt: { not: null } }, orderBy: { deletedAt: 'asc' } })).map(toFleet),
|
|
123
86
|
};
|
|
124
87
|
}
|
|
125
88
|
export function createPrismaCrewRequestRepository(db) {
|
|
@@ -278,6 +241,18 @@ export function createPrismaShipRepository(db) {
|
|
|
278
241
|
const row = await db.ship.findFirst({ where: { fleetId, kind: 'viewer' } });
|
|
279
242
|
return row ? toShip(row) : undefined;
|
|
280
243
|
},
|
|
244
|
+
findLastNamedOwner: async (fleetId, commissionerId) => {
|
|
245
|
+
// Newest first through the commissioner's OwnerSet events alone (events_owner_set_idx).
|
|
246
|
+
const [row] = await db.$queryRaw `
|
|
247
|
+
SELECT e.details ->> 'ownerShipId' AS "ownerShipId" FROM events e
|
|
248
|
+
WHERE e.fleet_id = ${fleetId} AND e.actor_ship_id = ${commissionerId} AND e.type = 'OwnerSet' AND e.details ->> 'how' = 'named'
|
|
249
|
+
ORDER BY e.seq DESC LIMIT 1`;
|
|
250
|
+
if (row === undefined) {
|
|
251
|
+
return undefined;
|
|
252
|
+
}
|
|
253
|
+
const owner = await db.ship.findFirst({ where: { fleetId, id: z.object({ ownerShipId: idSchema('ship') }).parse(row).ownerShipId } });
|
|
254
|
+
return owner ? toShip(owner) : undefined;
|
|
255
|
+
},
|
|
281
256
|
lockName: async (fleetId, name) => {
|
|
282
257
|
// A transaction-level advisory lock on the fleet and the name, released at
|
|
283
258
|
// commit or rollback. Read committed: once the holder commits, the next
|
|
@@ -431,6 +406,10 @@ export function createPrismaLeaseRepository(db) {
|
|
|
431
406
|
const rows = await db.$queryRaw(crewedShipsStatement({ fleetId, shipIds }));
|
|
432
407
|
return rows.map((row) => crewedShipRowSchema.parse(row).ship_id);
|
|
433
408
|
},
|
|
409
|
+
listOpen: async (fleetId) => {
|
|
410
|
+
const rows = await db.lease.findMany({ where: { fleetId, endedAt: null }, select: { id: true, shipId: true }, orderBy: { startedAt: 'asc' } });
|
|
411
|
+
return rows.map((row) => ({ id: idSchema('lease').parse(row.id), shipId: idSchema('ship').parse(row.shipId) }));
|
|
412
|
+
},
|
|
434
413
|
findLastSeen: async (fleetId, shipId) => {
|
|
435
414
|
const [row] = await db.$queryRaw `
|
|
436
415
|
SELECT COALESCE(last_seen_at, started_at) AS last_seen_at
|
|
@@ -602,7 +581,8 @@ export function createPrismaInFlightDeliveries(db, rollups) {
|
|
|
602
581
|
d.sender_ship_id, d.is_in_exchange, held.state AS before_state, held.reached_ship_id AS before_reached_ship_id,
|
|
603
582
|
d.state::text AS after_state, d.reached_ship_id AS after_reached_ship_id
|
|
604
583
|
)
|
|
605
|
-
SELECT
|
|
584
|
+
SELECT returned.*, (SELECT m.content_type FROM messages m WHERE m.fleet_id = returned.fleet_id AND m.id = returned.message_id) AS content_type
|
|
585
|
+
FROM returned ORDER BY created_at, id`;
|
|
606
586
|
for (const row of rows) {
|
|
607
587
|
addChangedDelivery(rollups, row);
|
|
608
588
|
}
|
|
@@ -614,7 +594,8 @@ export function createPrismaInFlightDeliveries(db, rollups) {
|
|
|
614
594
|
const rows = await db.$queryRaw `
|
|
615
595
|
UPDATE deliveries SET state = 'abandoned'
|
|
616
596
|
WHERE fleet_id = ${fleetId} AND recipient_ship_id = ${shipId} AND state = 'pending'
|
|
617
|
-
RETURNING id, message_id, created_at, fleet_id, sender_ship_id, is_in_exchange,
|
|
597
|
+
RETURNING id, message_id, created_at, fleet_id, sender_ship_id, is_in_exchange,
|
|
598
|
+
(SELECT m.content_type FROM messages m WHERE m.fleet_id = deliveries.fleet_id AND m.id = deliveries.message_id) AS content_type, 'pending' AS before_state,
|
|
618
599
|
reached_ship_id AS before_reached_ship_id, state::text AS after_state, reached_ship_id AS after_reached_ship_id`;
|
|
619
600
|
for (const row of rows) {
|
|
620
601
|
addChangedDelivery(rollups, row);
|