Skip to content

Add properties to props equatable #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 7, 2023
Merged

Add properties to props equatable #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccca994
Add properties to props equatable in mailbox
dab246 Nov 7, 2023
ccd4106
Remove all properties not used
dab246 Nov 7, 2023
bdb3af3
Fix unit test
dab246 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions lib/jmap/mail/email/email.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:jmap_dart_client/http/converter/thread_id_nullable_converter.dar
import 'package:jmap_dart_client/http/converter/unsigned_int_nullable_converter.dart';
import 'package:jmap_dart_client/http/converter/utc_date_nullable_converter.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
import 'package:jmap_dart_client/jmap/core/reference_id.dart';
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
Expand All @@ -23,11 +22,6 @@ import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';

class Email with EquatableMixin {
static Properties allProperties = Properties({
'id', 'subject','from', 'to', 'cc', 'bcc', 'keywords', 'size', 'receivedAt',
'sentAt', 'replyTo', 'preview', 'hasAttachment'
});

final EmailId? id;
final Id? blobId;
final ThreadId? threadId;
Expand Down
24 changes: 16 additions & 8 deletions lib/jmap/mail/mailbox/mailbox.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:jmap_dart_client/http/converter/total_threads_converter.dart';
import 'package:jmap_dart_client/http/converter/unread_emails_converter.dart';
import 'package:jmap_dart_client/http/converter/unread_threads_converter.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_rights.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/namespace.dart';
Expand All @@ -30,11 +29,6 @@ part 'mailbox.g.dart';
@MailboxNameConverter()
@JsonSerializable()
class Mailbox with EquatableMixin {
static Properties allProperties = Properties({
'id', 'name', 'parentId', 'role', 'sortOrder', 'totalEmails', 'unreadEmails',
'totalThreads', 'unreadThreads', 'myRights', 'isSubscribed'
});

@JsonKey(includeIfNull: false)
final MailboxId? id;

Expand Down Expand Up @@ -95,7 +89,21 @@ class Mailbox with EquatableMixin {
Map<String, dynamic> toJson() => _$MailboxToJson(this);

@override
List<Object?> get props => [id, name, parentId, role];
List<Object?> get props => [
id,
name,
parentId,
role,
sortOrder,
totalEmails,
unreadEmails,
totalThreads,
unreadThreads,
myRights,
isSubscribed,
namespace,
rights
];
}

class MailboxId with EquatableMixin {
Expand Down Expand Up @@ -129,7 +137,7 @@ class SortOrder with EquatableMixin {
late final UnsignedInt value;

SortOrder({int sortValue = 0}) {
this.value = UnsignedInt(sortValue);
value = UnsignedInt(sortValue);
}

@override
Expand Down
1 change: 1 addition & 0 deletions test/jmap/mailbox/query/query_mailbox_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ void main(){
true,
true,
),
isSubscribed: IsSubscribed(true),
);

test('Query Mailbox spam report', () async {
Expand Down