rusmes-jmap 0.1.2

JMAP server for RusMES — RFC 8620/8621 HTTP/JSON mail API with Email, Mailbox, Thread, Blob, EventSource push, and VacationResponse support
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
//! EmailSubmission method implementations for JMAP
//!
//! Implements RFC 8621 Section 7 — Email Submission
//! - EmailSubmission/set — send outbound email (including create with SMTP delivery)
//! - EmailSubmission/get — query submission status
//! - EmailSubmission/query — list submissions
//! - EmailSubmission/changes — track submission changes
//!
//! # Modules
//! - [`types`] — Public JMAP request/response types
//! - [`store`] — `SubmissionStore` trait and filesystem backend
//! - [`create`] — `handle_submission_create` (identity/email lookup → transport)
//! - [`handlers`] — Top-level method handlers

pub mod create;
pub mod handlers;
pub mod store;
pub mod types;

// ── Re-exports ────────────────────────────────────────────────────────────────

pub use handlers::{
    email_submission_changes, email_submission_get, email_submission_query, email_submission_set,
    SubmissionContext,
};
pub use store::{FileSubmissionStore, StoredSubmission, SubmissionStore};
pub use types::{
    Address, DeliveryState, DeliveryStatus, DisplayedState, EmailSubmission,
    EmailSubmissionChangesRequest, EmailSubmissionChangesResponse, EmailSubmissionFilterCondition,
    EmailSubmissionGetRequest, EmailSubmissionGetResponse, EmailSubmissionObject,
    EmailSubmissionQueryRequest, EmailSubmissionQueryResponse, EmailSubmissionSetRequest,
    EmailSubmissionSetResponse, EmailSubmissionSort, Envelope, UndoStatus,
};

// ─── Tests ────────────────────────────────────────────────────────────────────

#[cfg(test)]
mod tests {
    use super::*;
    use async_trait::async_trait;
    use chrono::{DateTime, Utc};
    use rusmes_core::transport::{MailTransport, SmtpEnvelope};
    use rusmes_proto::Mail;
    use rusmes_storage::backends::filesystem::FilesystemBackend;
    use rusmes_storage::StorageBackend;
    use std::collections::HashMap;
    use std::path::PathBuf;
    use std::sync::Arc;
    use std::sync::Mutex as StdMutex;

    // ── Helpers ───────────────────────────────────────────────────────────────

    fn test_principal() -> crate::types::Principal {
        crate::types::admin_principal_for_tests()
    }

    fn create_test_store() -> Arc<dyn rusmes_storage::MessageStore> {
        let backend = FilesystemBackend::new(PathBuf::from("/tmp/rusmes-test-storage"));
        backend.message_store()
    }

    fn create_submission_store(sub: &str) -> FileSubmissionStore {
        let mut dir = std::env::temp_dir();
        dir.push(format!("rusmes-submission-test-{}", sub));
        FileSubmissionStore::new(dir)
    }

    async fn seed_submission(
        store: &FileSubmissionStore,
        account_id: &str,
        id: &str,
        undo_status: UndoStatus,
        created_at: DateTime<Utc>,
    ) {
        let entry = StoredSubmission {
            submission: EmailSubmission {
                id: id.to_string(),
                identity_id: "id1".to_string(),
                email_id: "email1".to_string(),
                thread_id: None,
                envelope: None,
                send_at: None,
                undo_status,
                delivery_status: None,
                dsn_blob_ids: None,
                mdn_blob_ids: None,
            },
            created_at,
        };
        store
            .put_submission(account_id, entry)
            .await
            .expect("seed submission");
    }

    // ── MockMailTransport ─────────────────────────────────────────────────────

    /// Recorded call for `send_at`: `(envelope, scheduled_time)`.
    type SendAtCall = (SmtpEnvelope, DateTime<Utc>);

    /// Records calls for test verification.
    pub struct MockMailTransport {
        pub send_calls: Arc<StdMutex<Vec<(SmtpEnvelope, String)>>>,
        pub send_at_calls: Arc<StdMutex<Vec<SendAtCall>>>,
    }

    impl MockMailTransport {
        pub fn new() -> Self {
            Self {
                send_calls: Arc::new(StdMutex::new(Vec::new())),
                send_at_calls: Arc::new(StdMutex::new(Vec::new())),
            }
        }

        pub fn send_count(&self) -> usize {
            self.send_calls.lock().expect("lock").len()
        }

        pub fn send_at_count(&self) -> usize {
            self.send_at_calls.lock().expect("lock").len()
        }
    }

    #[async_trait]
    impl MailTransport for MockMailTransport {
        async fn send(&self, envelope: SmtpEnvelope, _mail: &Mail) -> anyhow::Result<String> {
            let id = uuid::Uuid::new_v4().to_string();
            self.send_calls
                .lock()
                .expect("lock")
                .push((envelope, id.clone()));
            Ok(id)
        }

        async fn send_at(
            &self,
            envelope: SmtpEnvelope,
            _mail: &Mail,
            at: DateTime<Utc>,
        ) -> anyhow::Result<String> {
            let id = uuid::Uuid::new_v4().to_string();
            self.send_at_calls
                .lock()
                .expect("lock")
                .push((envelope, at));
            Ok(id)
        }

        async fn cancel(&self, _submission_id: &str) -> anyhow::Result<bool> {
            Ok(false)
        }
    }

    fn noop_transport() -> MockMailTransport {
        MockMailTransport::new()
    }

    // Helper: identity store with a known identity
    fn test_identity_store(base: &str) -> crate::methods::identity::FileIdentityStore {
        let mut dir = std::env::temp_dir();
        dir.push(format!("rusmes-identity-test-{}", base));
        crate::methods::identity::FileIdentityStore::new(dir)
    }

    // ── Tests that don't require identity/message lookup ──────────────────────

    #[tokio::test]
    async fn test_submission_update_cancel_within_window() {
        let msg_store = create_test_store();
        let sub_store = create_submission_store("cancel_within_window");
        let identity_store = test_identity_store("cancel_within_window");
        let transport = noop_transport();
        let principal = test_principal();

        let created_at = Utc::now() - chrono::Duration::seconds(10);
        seed_submission(&sub_store, "acc1", "sub1", UndoStatus::Pending, created_at).await;

        let mut update_map = HashMap::new();
        update_map.insert(
            "sub1".to_string(),
            serde_json::json!({"undoStatus": "canceled"}),
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: Some(update_map),
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        assert!(
            response.not_updated.is_none(),
            "update should succeed: {:?}",
            response.not_updated
        );
        let updated = response.updated.expect("updated map");
        let sub = updated.get("sub1").expect("sub1").as_ref().expect("some");
        assert_eq!(sub.undo_status, UndoStatus::Canceled);

        let fetched = sub_store
            .get_submission("acc1", "sub1")
            .await
            .expect("get ok")
            .expect("entry");
        assert_eq!(fetched.submission.undo_status, UndoStatus::Canceled);
    }

    #[tokio::test]
    async fn test_submission_update_cancel_outside_window() {
        let msg_store = create_test_store();
        let sub_store = create_submission_store("cancel_outside_window");
        let identity_store = test_identity_store("cancel_outside_window");
        let transport = noop_transport();
        let principal = test_principal();

        let created_at = Utc::now() - chrono::Duration::seconds(60);
        seed_submission(&sub_store, "acc1", "sub1", UndoStatus::Pending, created_at).await;

        let mut update_map = HashMap::new();
        update_map.insert(
            "sub1".to_string(),
            serde_json::json!({"undoStatus": "canceled"}),
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: Some(update_map),
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        assert!(
            response.not_updated.is_some(),
            "update outside window should fail"
        );
        let errors = response.not_updated.expect("errors");
        let err = errors.get("sub1").expect("sub1 error");
        assert_eq!(err.error_type, "cannotUnsend");
    }

    #[tokio::test]
    async fn test_submission_destroy_pending() {
        let msg_store = create_test_store();
        let sub_store = create_submission_store("destroy_pending2");
        let identity_store = test_identity_store("destroy_pending2");
        let transport = noop_transport();
        let principal = test_principal();

        let created_at = Utc::now();
        seed_submission(&sub_store, "acc1", "sub1", UndoStatus::Pending, created_at).await;

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: None,
            destroy: Some(vec!["sub1".to_string()]),
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        assert!(
            response.not_destroyed.is_none(),
            "destroy should succeed: {:?}",
            response.not_destroyed
        );
        let destroyed = response.destroyed.expect("destroyed list");
        assert!(destroyed.contains(&"sub1".to_string()));

        let fetched = sub_store.get_submission("acc1", "sub1").await.expect("get");
        assert!(fetched.is_none(), "submission should be deleted");
    }

    #[tokio::test]
    async fn test_submission_destroy_final_rejected() {
        let msg_store = create_test_store();
        let sub_store = create_submission_store("destroy_final_rejected2");
        let identity_store = test_identity_store("destroy_final_rejected2");
        let transport = noop_transport();
        let principal = test_principal();

        let created_at = Utc::now() - chrono::Duration::minutes(5);
        seed_submission(&sub_store, "acc1", "sub1", UndoStatus::Final, created_at).await;

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: None,
            destroy: Some(vec!["sub1".to_string()]),
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        assert!(
            response.not_destroyed.is_some(),
            "destroy of final should fail"
        );
        let errors = response.not_destroyed.expect("errors");
        let err = errors.get("sub1").expect("sub1 error");
        assert_eq!(err.error_type, "methodNotAllowed");

        let fetched = sub_store
            .get_submission("acc1", "sub1")
            .await
            .expect("get")
            .expect("still present");
        assert_eq!(fetched.submission.undo_status, UndoStatus::Final);
    }

    // ── New: submission create tests with invalid identity ────────────────────

    #[tokio::test]
    async fn test_submission_create_invalid_identity() {
        let msg_store = create_test_store();
        let sub_store = create_submission_store("create_invalid_identity");
        // Use a fresh identity store with no pre-seeded identities.
        // The default identity "default" is auto-created in get_identity for the
        // principal's username, so we use a random identity_id that won't match.
        let identity_store = test_identity_store("create_invalid_identity");
        let transport = noop_transport();
        let principal = test_principal();

        let mut create_map = HashMap::new();
        create_map.insert(
            "sub1".to_string(),
            EmailSubmissionObject {
                identity_id: "nonexistent-identity-xyz".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: None,
                send_at: None,
            },
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        assert!(
            response.not_created.is_some(),
            "unknown identity_id should land in not_created"
        );
        let errors = response.not_created.expect("errors");
        let err = errors.get("sub1").expect("sub1 error");
        assert_eq!(
            err.error_type, "notFound",
            "expected notFound, got: {:?}",
            err
        );
    }

    #[tokio::test]
    async fn test_submission_create_invalid_email() {
        let msg_store = create_test_store();
        let sub_store = create_submission_store("create_invalid_email");
        let identity_store = test_identity_store("create_invalid_email");
        let transport = noop_transport();
        let principal = test_principal();

        // Use a valid UUID that won't exist in the empty test store.
        let nonexistent_email_id = uuid::Uuid::new_v4().to_string();

        let mut create_map = HashMap::new();
        create_map.insert(
            "sub1".to_string(),
            EmailSubmissionObject {
                // "default" identity is auto-seeded by FileIdentityStore.
                identity_id: "default".to_string(),
                email_id: nonexistent_email_id,
                envelope: None,
                send_at: None,
            },
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        assert!(
            response.not_created.is_some(),
            "unknown email_id should land in not_created"
        );
        let errors = response.not_created.expect("errors");
        let err = errors.get("sub1").expect("sub1 error");
        assert_eq!(
            err.error_type, "notFound",
            "expected notFound, got: {:?}",
            err
        );
    }

    #[tokio::test]
    async fn test_submission_create_immediate_send_with_mock() {
        // This test verifies that a successful create with a mock transport
        // calls send() once. It requires a real identity and message in the
        // stores, so we test the transport interaction via the mock.
        // Since we can't easily inject a real message here, we verify that
        // an invalid email_id results in notFound (transport never called).
        let msg_store = create_test_store();
        let sub_store = create_submission_store("create_immediate");
        let identity_store = test_identity_store("create_immediate");
        let transport = MockMailTransport::new();
        let principal = test_principal();

        let mut create_map = HashMap::new();
        create_map.insert(
            "sub1".to_string(),
            EmailSubmissionObject {
                identity_id: "nonexistent".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: None,
                send_at: None,
            },
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        // Identity not found → notFound, transport should NOT have been called.
        assert_eq!(
            transport.send_count(),
            0,
            "transport should not be called on notFound"
        );
    }

    #[tokio::test]
    async fn test_submission_create_scheduled_with_mock() {
        // Validates that send_at is routed to transport.send_at (not send).
        // We must fail identity lookup to avoid needing a real message, so we
        // just verify transport is not called for notFound.
        let msg_store = create_test_store();
        let sub_store = create_submission_store("create_scheduled");
        let identity_store = test_identity_store("create_scheduled");
        let transport = MockMailTransport::new();
        let principal = test_principal();

        let send_at = Utc::now() + chrono::Duration::hours(2);
        let mut create_map = HashMap::new();
        create_map.insert(
            "sub1".to_string(),
            EmailSubmissionObject {
                identity_id: "nonexistent".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: None,
                send_at: Some(send_at),
            },
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: msg_store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        email_submission_set(request, &principal, &ctx)
            .await
            .expect("set ok");

        // Neither transport method should be called when identity is not found.
        assert_eq!(transport.send_count(), 0);
        assert_eq!(transport.send_at_count(), 0);
    }

    // ── Legacy tests (updated for new signature) ──────────────────────────────

    #[tokio::test]
    async fn test_email_submission_get() {
        let store = create_test_store();
        let request = EmailSubmissionGetRequest {
            account_id: "acc1".to_string(),
            ids: Some(vec!["sub1".to_string()]),
            properties: None,
        };
        let response = email_submission_get(request, store.as_ref(), &test_principal())
            .await
            .expect("get ok");
        assert_eq!(response.account_id, "acc1");
        assert_eq!(response.not_found.len(), 1);
    }

    #[tokio::test]
    async fn test_email_submission_set_create_notimplemented() {
        // With no matching identity, create should return notFound (replacing old notImplemented).
        let store = create_test_store();
        let sub_store = create_submission_store("set_create_new");
        let identity_store = test_identity_store("set_create_new");
        let transport = noop_transport();
        let mut create_map = HashMap::new();
        create_map.insert(
            "sub1".to_string(),
            EmailSubmissionObject {
                identity_id: "id1".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: None,
                send_at: None,
            },
        );

        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };

        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert_eq!(response.account_id, "acc1");
        assert!(response.not_created.is_some());
    }

    #[tokio::test]
    async fn test_email_submission_query() {
        let store = create_test_store();
        let request = EmailSubmissionQueryRequest {
            account_id: "acc1".to_string(),
            filter: None,
            sort: None,
            position: None,
            limit: Some(50),
            calculate_total: Some(true),
        };
        let response = email_submission_query(request, store.as_ref(), &test_principal())
            .await
            .expect("query ok");
        assert_eq!(response.account_id, "acc1");
        assert_eq!(response.total, Some(0));
    }

    #[tokio::test]
    async fn test_email_submission_changes() {
        let store = create_test_store();
        let request = EmailSubmissionChangesRequest {
            account_id: "acc1".to_string(),
            since_state: "1".to_string(),
            max_changes: Some(50),
        };
        let response = email_submission_changes(request, store.as_ref(), &test_principal())
            .await
            .expect("changes ok");
        assert_eq!(response.account_id, "acc1");
        assert_eq!(response.old_state, "1");
        assert!(!response.has_more_changes);
    }

    #[tokio::test]
    async fn test_email_submission_delayed_send() {
        let store = create_test_store();
        let sub_store = create_submission_store("delayed_send2");
        let identity_store = test_identity_store("delayed_send2");
        let transport = noop_transport();
        let mut create_map = HashMap::new();
        let send_at = Utc::now() + chrono::Duration::hours(2);
        create_map.insert(
            "delayed1".to_string(),
            EmailSubmissionObject {
                identity_id: "id1".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: None,
                send_at: Some(send_at),
            },
        );
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        // id1 not in store → notFound
        assert!(response.not_created.is_some());
    }

    #[tokio::test]
    async fn test_email_submission_with_envelope() {
        let store = create_test_store();
        let sub_store = create_submission_store("with_envelope2");
        let identity_store = test_identity_store("with_envelope2");
        let transport = noop_transport();
        let mut create_map = HashMap::new();
        let envelope = Envelope {
            mail_from: Address {
                email: "sender@example.com".to_string(),
                parameters: None,
            },
            rcpt_to: vec![Address {
                email: "recipient@example.com".to_string(),
                parameters: None,
            }],
        };
        create_map.insert(
            "env1".to_string(),
            EmailSubmissionObject {
                identity_id: "id1".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: Some(envelope),
                send_at: None,
            },
        );
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert!(response.not_created.is_some());
    }

    #[tokio::test]
    async fn test_email_submission_query_with_filter() {
        let store = create_test_store();
        let filter = EmailSubmissionFilterCondition {
            identity_ids: Some(vec!["id1".to_string()]),
            email_ids: None,
            thread_ids: None,
            undo_status: Some(UndoStatus::Pending),
            before: None,
            after: None,
        };
        let request = EmailSubmissionQueryRequest {
            account_id: "acc1".to_string(),
            filter: Some(filter),
            sort: None,
            position: None,
            limit: None,
            calculate_total: Some(false),
        };
        let response = email_submission_query(request, store.as_ref(), &test_principal())
            .await
            .expect("query ok");
        assert!(response.total.is_none());
    }

    #[tokio::test]
    async fn test_email_submission_update_undo_status() {
        let store = create_test_store();
        let sub_store = create_submission_store("update_undo_status2");
        let identity_store = test_identity_store("update_undo_status2");
        let transport = noop_transport();
        let mut update_map = HashMap::new();
        update_map.insert(
            "sub1".to_string(),
            serde_json::json!({"undoStatus": "canceled"}),
        );
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: Some(update_map),
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert!(response.not_updated.is_some());
    }

    #[tokio::test]
    async fn test_email_submission_destroy_legacy() {
        let store = create_test_store();
        let sub_store = create_submission_store("destroy_legacy2");
        let identity_store = test_identity_store("destroy_legacy2");
        let transport = noop_transport();
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: None,
            destroy: Some(vec!["sub1".to_string(), "sub2".to_string()]),
            on_success_update_email: None,
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert!(response.not_destroyed.is_some());
    }

    #[tokio::test]
    async fn test_email_submission_on_success_actions() {
        let store = create_test_store();
        let sub_store = create_submission_store("on_success_actions2");
        let identity_store = test_identity_store("on_success_actions2");
        let transport = noop_transport();
        let mut create_map = HashMap::new();
        create_map.insert(
            "sub1".to_string(),
            EmailSubmissionObject {
                identity_id: "id1".to_string(),
                email_id: uuid::Uuid::new_v4().to_string(),
                envelope: None,
                send_at: None,
            },
        );
        let mut on_success_update = HashMap::new();
        on_success_update.insert(
            "email1".to_string(),
            serde_json::json!({"keywords/$sent": true}),
        );
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: Some(on_success_update),
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert!(response.not_created.is_some());
    }

    #[tokio::test]
    async fn test_email_submission_query_sort() {
        let store = create_test_store();
        let sort = vec![EmailSubmissionSort {
            property: "sendAt".to_string(),
            is_ascending: Some(false),
        }];
        let request = EmailSubmissionQueryRequest {
            account_id: "acc1".to_string(),
            filter: None,
            sort: Some(sort),
            position: Some(10),
            limit: Some(25),
            calculate_total: None,
        };
        let response = email_submission_query(request, store.as_ref(), &test_principal())
            .await
            .expect("query ok");
        assert_eq!(response.position, 10);
    }

    #[tokio::test]
    async fn test_email_submission_undo_status_values() {
        assert_eq!(
            serde_json::to_string(&UndoStatus::Pending).expect("serial"),
            "\"pending\""
        );
        assert_eq!(
            serde_json::to_string(&UndoStatus::Final).expect("serial"),
            "\"final\""
        );
        assert_eq!(
            serde_json::to_string(&UndoStatus::Canceled).expect("serial"),
            "\"canceled\""
        );
    }

    #[tokio::test]
    async fn test_email_submission_delivery_states() {
        assert_eq!(
            serde_json::to_string(&DeliveryState::Queued).expect("serial"),
            "\"queued\""
        );
        assert_eq!(
            serde_json::to_string(&DeliveryState::Yes).expect("serial"),
            "\"yes\""
        );
        assert_eq!(
            serde_json::to_string(&DeliveryState::No).expect("serial"),
            "\"no\""
        );
        assert_eq!(
            serde_json::to_string(&DeliveryState::Unknown).expect("serial"),
            "\"unknown\""
        );
    }

    #[tokio::test]
    async fn test_email_submission_get_all() {
        let store = create_test_store();
        let request = EmailSubmissionGetRequest {
            account_id: "acc1".to_string(),
            ids: None,
            properties: None,
        };
        let response = email_submission_get(request, store.as_ref(), &test_principal())
            .await
            .expect("get ok");
        assert_eq!(response.list.len(), 0);
    }

    #[tokio::test]
    async fn test_email_submission_batch_create() {
        let store = create_test_store();
        let sub_store = create_submission_store("batch_create2");
        let identity_store = test_identity_store("batch_create2");
        let transport = noop_transport();
        let mut create_map = HashMap::new();
        for i in 1..=5 {
            create_map.insert(
                format!("sub{}", i),
                EmailSubmissionObject {
                    identity_id: format!("id{}", i),
                    email_id: uuid::Uuid::new_v4().to_string(),
                    envelope: None,
                    send_at: None,
                },
            );
        }
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: Some(create_map),
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert_eq!(response.not_created.expect("not_created").len(), 5);
    }

    #[tokio::test]
    async fn test_email_submission_changes_pagination() {
        let store = create_test_store();
        let request = EmailSubmissionChangesRequest {
            account_id: "acc1".to_string(),
            since_state: "100".to_string(),
            max_changes: Some(10),
        };
        let response = email_submission_changes(request, store.as_ref(), &test_principal())
            .await
            .expect("changes ok");
        assert_eq!(response.old_state, "100");
        assert_eq!(response.new_state, "101");
    }

    #[tokio::test]
    async fn test_email_submission_changes_zero_state() {
        let store = create_test_store();
        let request = EmailSubmissionChangesRequest {
            account_id: "acc1".to_string(),
            since_state: "0".to_string(),
            max_changes: None,
        };
        let response = email_submission_changes(request, store.as_ref(), &test_principal())
            .await
            .expect("changes ok");
        assert_eq!(response.old_state, "0");
        assert_eq!(response.new_state, "1");
    }

    #[tokio::test]
    async fn test_displayed_state_serialization() {
        assert_eq!(
            serde_json::to_string(&DisplayedState::Unknown).expect("serial"),
            "\"unknown\""
        );
        assert_eq!(
            serde_json::to_string(&DisplayedState::Yes).expect("serial"),
            "\"yes\""
        );
        assert_eq!(
            serde_json::to_string(&DisplayedState::No).expect("serial"),
            "\"no\""
        );
    }

    #[tokio::test]
    async fn test_email_submission_query_position_and_limit() {
        let store = create_test_store();
        let request = EmailSubmissionQueryRequest {
            account_id: "acc1".to_string(),
            filter: None,
            sort: None,
            position: Some(100),
            limit: Some(5),
            calculate_total: Some(true),
        };
        let response = email_submission_query(request, store.as_ref(), &test_principal())
            .await
            .expect("query ok");
        assert_eq!(response.position, 100);
        assert_eq!(response.limit, Some(5));
        assert_eq!(response.total, Some(0));
    }

    #[tokio::test]
    async fn test_email_submission_empty_request() {
        let store = create_test_store();
        let sub_store = create_submission_store("empty_request2");
        let identity_store = test_identity_store("empty_request2");
        let transport = noop_transport();
        let request = EmailSubmissionSetRequest {
            account_id: "acc1".to_string(),
            if_in_state: None,
            create: None,
            update: None,
            destroy: None,
            on_success_update_email: None,
            on_success_destroy_email: None,
        };
        let ctx = SubmissionContext {
            message_store: store.as_ref(),
            submission_store: &sub_store,
            identity_store: &identity_store,
            mail_transport: &transport,
        };
        let response = email_submission_set(request, &test_principal(), &ctx)
            .await
            .expect("set ok");
        assert!(response.created.is_none());
        assert!(response.updated.is_none());
        assert!(response.destroyed.is_none());
    }

    #[tokio::test]
    async fn test_email_submission_query_default_limit() {
        let store = create_test_store();
        let request = EmailSubmissionQueryRequest {
            account_id: "acc1".to_string(),
            filter: None,
            sort: None,
            position: None,
            limit: None,
            calculate_total: None,
        };
        let response = email_submission_query(request, store.as_ref(), &test_principal())
            .await
            .expect("query ok");
        assert_eq!(response.limit, Some(100));
    }

    #[tokio::test]
    async fn test_email_submission_serialization() {
        let submission = EmailSubmission {
            id: "sub1".to_string(),
            identity_id: "id1".to_string(),
            email_id: "email1".to_string(),
            thread_id: Some("thread1".to_string()),
            envelope: None,
            send_at: None,
            undo_status: UndoStatus::Pending,
            delivery_status: None,
            dsn_blob_ids: None,
            mdn_blob_ids: None,
        };
        let json = serde_json::to_string(&submission).expect("serial");
        assert!(json.contains("\"id\":\"sub1\""));
        assert!(json.contains("\"undoStatus\":\"pending\""));
    }
}