#5: F2 sub-project 2 - IMAP SEARCH, EXPUNGE, COPY, MOVE
Adds the second F2 sub-project on top of the merged IMAP core: full SEARCH criteria matching (flags, dates, size, headers, body/text, NOT/OR), EXPUNGE (soft-delete via expunged_at), COPY, and MOVE (RFC 6851, advertised via CapMove/CapUIDPlus). Verified end-to-end with a real go-imap/v2 client against embedded Postgres. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
de082a190c
commit
0ec0698079
15 files changed
+1378
-21
No files matched your search
@@ -28,10 +28,12 @@ type ImapSessionUseCase struct {
|
||||
messages port.MessageQueryRepository
|
||||
flags port.FlagRepository
|
||||
blobs port.BlobReader
|
||||
expunger port.ExpungeRepository
|
||||
copier port.CopyRepository
|
||||
}
|
||||
|
||||
func NewImapSessionUseCase(auth port.AuthRepository, folders port.ImapFolderRepository, messages port.MessageQueryRepository, flags port.FlagRepository, blobs port.BlobReader) *ImapSessionUseCase {
|
||||
return &ImapSessionUseCase{auth: auth, folders: folders, messages: messages, flags: flags, blobs: blobs}
|
||||
func NewImapSessionUseCase(auth port.AuthRepository, folders port.ImapFolderRepository, messages port.MessageQueryRepository, flags port.FlagRepository, blobs port.BlobReader, expunger port.ExpungeRepository, copier port.CopyRepository) *ImapSessionUseCase {
|
||||
return &ImapSessionUseCase{auth: auth, folders: folders, messages: messages, flags: flags, blobs: blobs, expunger: expunger, copier: copier}
|
||||
}
|
||||
|
||||
func (uc *ImapSessionUseCase) Login(ctx context.Context, address, password string) (string, error) {
|
||||
@@ -78,3 +80,11 @@ func (uc *ImapSessionUseCase) ReadBlob(ctx context.Context, blobID uuid.UUID) ([
|
||||
func (uc *ImapSessionUseCase) SetFlags(ctx context.Context, folderID string, uid uint32, op port.FlagOp, flags []string) error {
|
||||
return uc.flags.SetFlags(ctx, folderID, uid, op, flags)
|
||||
}
|
||||
|
||||
func (uc *ImapSessionUseCase) Expunge(ctx context.Context, folderID string, uids []uint32) error {
|
||||
return uc.expunger.Expunge(ctx, folderID, uids)
|
||||
}
|
||||
|
||||
func (uc *ImapSessionUseCase) CopyMessages(ctx context.Context, sourceFolderID string, uids []uint32, destFolderID string) ([]port.CopiedMessage, error) {
|
||||
return uc.copier.CopyMessages(ctx, sourceFolderID, uids, destFolderID)
|
||||
}
|
||||
@@ -32,7 +32,7 @@ func TestImapSessionUseCase_Login_SucceedsForCorrectPassword(t *testing.T) {
|
||||
auth := &fakeAuthRepository{byAddress: map[string]port.MailboxAuth{
|
||||
"user@example.test": {ID: mailboxID, PasswordHash: testPasswordHash},
|
||||
}}
|
||||
uc := NewImapSessionUseCase(auth, nil, nil, nil, nil)
|
||||
uc := NewImapSessionUseCase(auth, nil, nil, nil, nil, nil, nil)
|
||||
|
||||
gotID, err := uc.Login(context.Background(), "user@example.test", testPassword)
|
||||
if err != nil {
|
||||
@@ -47,7 +47,7 @@ func TestImapSessionUseCase_Login_FailsForWrongPassword(t *testing.T) {
|
||||
auth := &fakeAuthRepository{byAddress: map[string]port.MailboxAuth{
|
||||
"user@example.test": {ID: uuid.New(), PasswordHash: testPasswordHash},
|
||||
}}
|
||||
uc := NewImapSessionUseCase(auth, nil, nil, nil, nil)
|
||||
uc := NewImapSessionUseCase(auth, nil, nil, nil, nil, nil, nil)
|
||||
|
||||
_, err := uc.Login(context.Background(), "user@example.test", "wrong-password")
|
||||
if !errors.Is(err, ErrAuthFailed) {
|
||||
@@ -57,7 +57,7 @@ func TestImapSessionUseCase_Login_FailsForWrongPassword(t *testing.T) {
|
||||
|
||||
func TestImapSessionUseCase_Login_FailsForUnknownAddress(t *testing.T) {
|
||||
auth := &fakeAuthRepository{byAddress: map[string]port.MailboxAuth{}}
|
||||
uc := NewImapSessionUseCase(auth, nil, nil, nil, nil)
|
||||
uc := NewImapSessionUseCase(auth, nil, nil, nil, nil, nil, nil)
|
||||
|
||||
_, err := uc.Login(context.Background(), "nobody@example.test", "anything")
|
||||
if !errors.Is(err, ErrAuthFailed) {
|
||||
@@ -89,7 +89,7 @@ func TestImapSessionUseCase_SelectFolder_ReturnsRecordForExistingFolder(t *testi
|
||||
folders := &fakeImapFolderRepository{byName: map[string]port.ImapFolderRecord{
|
||||
"INBOX": {ID: "folder-1", Name: "INBOX", UIDNext: 3, UIDValidity: 1000, NumMessages: 2},
|
||||
}}
|
||||
uc := NewImapSessionUseCase(nil, folders, nil, nil, nil)
|
||||
uc := NewImapSessionUseCase(nil, folders, nil, nil, nil, nil, nil)
|
||||
|
||||
rec, err := uc.SelectFolder(context.Background(), "mailbox-1", "INBOX")
|
||||
if err != nil {
|
||||
@@ -102,10 +102,62 @@ func TestImapSessionUseCase_SelectFolder_ReturnsRecordForExistingFolder(t *testi
|
||||
|
||||
func TestImapSessionUseCase_SelectFolder_ReturnsErrNoSuchFolderWhenMissing(t *testing.T) {
|
||||
folders := &fakeImapFolderRepository{byName: map[string]port.ImapFolderRecord{}}
|
||||
uc := NewImapSessionUseCase(nil, folders, nil, nil, nil)
|
||||
uc := NewImapSessionUseCase(nil, folders, nil, nil, nil, nil, nil)
|
||||
|
||||
_, err := uc.SelectFolder(context.Background(), "mailbox-1", "Nonexistent")
|
||||
if !errors.Is(err, ErrNoSuchFolder) {
|
||||
t.Fatalf("error = %v, want ErrNoSuchFolder", err)
|
||||
}
|
||||
}
|
||||
|
||||
type fakeExpungeRepository struct {
|
||||
calls []struct {
|
||||
folderID string
|
||||
uids []uint32
|
||||
}
|
||||
}
|
||||
|
||||
func (f *fakeExpungeRepository) Expunge(_ context.Context, folderID string, uids []uint32) error {
|
||||
f.calls = append(f.calls, struct {
|
||||
folderID string
|
||||
uids []uint32
|
||||
}{folderID, uids})
|
||||
return nil
|
||||
}
|
||||
|
||||
type fakeCopyRepository struct {
|
||||
result []port.CopiedMessage
|
||||
}
|
||||
|
||||
func (f *fakeCopyRepository) CopyMessages(_ context.Context, _ string, _ []uint32, _ string) ([]port.CopiedMessage, error) {
|
||||
return f.result, nil
|
||||
}
|
||||
|
||||
func TestImapSessionUseCase_Expunge_DelegatesToRepository(t *testing.T) {
|
||||
expunger := &fakeExpungeRepository{}
|
||||
uc := NewImapSessionUseCase(nil, nil, nil, nil, nil, expunger, nil)
|
||||
|
||||
err := uc.Expunge(context.Background(), "folder-1", []uint32{3, 7})
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if len(expunger.calls) != 1 || expunger.calls[0].folderID != "folder-1" {
|
||||
t.Fatalf("calls = %+v, want one call with folderID=folder-1", expunger.calls)
|
||||
}
|
||||
if len(expunger.calls[0].uids) != 2 || expunger.calls[0].uids[0] != 3 || expunger.calls[0].uids[1] != 7 {
|
||||
t.Errorf("uids = %v, want [3 7]", expunger.calls[0].uids)
|
||||
}
|
||||
}
|
||||
|
||||
func TestImapSessionUseCase_CopyMessages_ReturnsRepositoryResult(t *testing.T) {
|
||||
copier := &fakeCopyRepository{result: []port.CopiedMessage{{SourceUID: 3, DestUID: 1}, {SourceUID: 7, DestUID: 2}}}
|
||||
uc := NewImapSessionUseCase(nil, nil, nil, nil, nil, nil, copier)
|
||||
|
||||
got, err := uc.CopyMessages(context.Background(), "source-folder", []uint32{3, 7}, "dest-folder")
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
if len(got) != 2 || got[0].DestUID != 1 || got[1].DestUID != 2 {
|
||||
t.Errorf("got = %+v, want [{3 1} {7 2}]", got)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user