Skip to content

Commit 7373a49

Browse files
authored
chore(persistence): fix drift generated code and tests (#2039)
1 parent 92e4fcd commit 7373a49

File tree

8 files changed

+128
-106
lines changed

8 files changed

+128
-106
lines changed

packages/stream_chat_persistence/lib/src/db/drift_chat_database.g.dart

Lines changed: 102 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/stream_chat_persistence/lib/src/entity/channels.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Channels extends Table {
4343
TextColumn get createdById => text().nullable()();
4444

4545
/// Map of custom channel extraData
46-
TextColumn get extraData => text().nullable().map(MapConverter<Object?>())();
46+
TextColumn get extraData => text().nullable().map(MapConverter())();
4747

4848
@override
4949
Set<Column> get primaryKey => {cid};

packages/stream_chat_persistence/lib/src/entity/messages.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class Messages extends Table {
124124
text().nullable().map(NullableMapConverter<String>())();
125125

126126
/// Message custom extraData
127-
TextColumn get extraData => text().nullable().map(MapConverter<Object?>())();
127+
TextColumn get extraData => text().nullable().map(MapConverter())();
128128

129129
@override
130130
Set<Column> get primaryKey => {id};

packages/stream_chat_persistence/lib/src/entity/reactions.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Reactions extends Table {
2323
IntColumn get score => integer().withDefault(const Constant(0))();
2424

2525
/// Reaction custom extraData
26-
TextColumn get extraData => text().nullable().map(MapConverter<Object?>())();
26+
TextColumn get extraData => text().nullable().map(MapConverter())();
2727

2828
@override
2929
Set<Column> get primaryKey => {

packages/stream_chat_persistence/lib/src/entity/users.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Users extends Table {
3030
BoolColumn get banned => boolean().withDefault(const Constant(false))();
3131

3232
/// Map of custom user extraData
33-
TextColumn get extraData => text().map(MapConverter<Object?>())();
33+
TextColumn get extraData => text().map(MapConverter())();
3434

3535
@override
3636
Set<Column> get primaryKey => {id};

packages/stream_chat_persistence/lib/src/mapper/pinned_message_mapper.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ extension PinnedMessageEntityX on PinnedMessageEntity {
2828
localUpdatedAt: localUpdatedAt,
2929
deletedAt: remoteDeletedAt,
3030
localDeletedAt: localDeletedAt,
31+
messageTextUpdatedAt: messageTextUpdatedAt,
3132
id: id,
3233
type: type,
3334
state: MessageState.fromJson(jsonDecode(state)),
@@ -78,6 +79,7 @@ extension PMessageX on Message {
7879
userId: user?.id,
7980
remoteDeletedAt: remoteDeletedAt,
8081
localDeletedAt: localDeletedAt,
82+
messageTextUpdatedAt: messageTextUpdatedAt,
8183
messageText: text,
8284
pinned: pinned,
8385
pinnedAt: pinnedAt,

packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void main() {
5555
state: jsonEncode(MessageState.sent),
5656
localUpdatedAt: DateTime.now(),
5757
remoteUpdatedAt: DateTime.now().add(const Duration(seconds: 1)),
58+
messageTextUpdatedAt: DateTime.now().add(const Duration(minutes: 5)),
5859
extraData: {'extra_test_data': 'extraData'},
5960
userId: user.id,
6061
localDeletedAt: DateTime.now(),
@@ -99,6 +100,10 @@ void main() {
99100
expect(message.state, MessageState.fromJson(jsonDecode(entity.state)));
100101
expect(message.localUpdatedAt, isSameDateAs(entity.localUpdatedAt));
101102
expect(message.remoteUpdatedAt, isSameDateAs(entity.remoteUpdatedAt));
103+
expect(
104+
message.messageTextUpdatedAt,
105+
isSameDateAs(entity.messageTextUpdatedAt),
106+
);
102107
expect(message.extraData, entity.extraData);
103108
expect(message.user!.id, entity.userId);
104109
expect(message.localDeletedAt, isSameDateAs(entity.localDeletedAt));
@@ -166,6 +171,7 @@ void main() {
166171
),
167172
localUpdatedAt: DateTime.now(),
168173
updatedAt: DateTime.now().add(const Duration(seconds: 1)),
174+
messageTextUpdatedAt: DateTime.now().add(const Duration(minutes: 5)),
169175
extraData: const {'extra_test_data': 'extraData'},
170176
user: user,
171177
localDeletedAt: DateTime.now(),
@@ -200,6 +206,10 @@ void main() {
200206
expect(entity.state, jsonEncode(message.state));
201207
expect(entity.localUpdatedAt, isSameDateAs(message.localUpdatedAt));
202208
expect(entity.remoteUpdatedAt, isSameDateAs(message.remoteUpdatedAt));
209+
expect(
210+
entity.messageTextUpdatedAt,
211+
isSameDateAs(message.messageTextUpdatedAt),
212+
);
203213
expect(entity.extraData, message.extraData);
204214
expect(entity.userId, message.user!.id);
205215
expect(entity.localDeletedAt, isSameDateAs(message.localDeletedAt));

packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void main() {
5555
state: jsonEncode(MessageState.sent),
5656
localUpdatedAt: DateTime.now(),
5757
remoteUpdatedAt: DateTime.now().add(const Duration(seconds: 1)),
58+
messageTextUpdatedAt: DateTime.now().add(const Duration(minutes: 5)),
5859
extraData: {'extra_test_data': 'extraData'},
5960
userId: user.id,
6061
localDeletedAt: DateTime.now(),
@@ -99,6 +100,10 @@ void main() {
99100
expect(message.state, MessageState.fromJson(jsonDecode(entity.state)));
100101
expect(message.localUpdatedAt, isSameDateAs(entity.localUpdatedAt));
101102
expect(message.remoteUpdatedAt, isSameDateAs(entity.remoteUpdatedAt));
103+
expect(
104+
message.messageTextUpdatedAt,
105+
isSameDateAs(entity.messageTextUpdatedAt),
106+
);
102107
expect(message.extraData, entity.extraData);
103108
expect(message.user!.id, entity.userId);
104109
expect(message.localDeletedAt, isSameDateAs(entity.localDeletedAt));
@@ -166,6 +171,7 @@ void main() {
166171
),
167172
localUpdatedAt: DateTime.now(),
168173
updatedAt: DateTime.now().add(const Duration(seconds: 1)),
174+
messageTextUpdatedAt: DateTime.now().add(const Duration(minutes: 5)),
169175
extraData: const {'extra_test_data': 'extraData'},
170176
user: user,
171177
localDeletedAt: DateTime.now(),
@@ -200,6 +206,10 @@ void main() {
200206
expect(entity.state, jsonEncode(message.state));
201207
expect(entity.localUpdatedAt, isSameDateAs(message.localUpdatedAt));
202208
expect(entity.remoteUpdatedAt, isSameDateAs(message.remoteUpdatedAt));
209+
expect(
210+
message.messageTextUpdatedAt,
211+
isSameDateAs(entity.messageTextUpdatedAt),
212+
);
203213
expect(entity.extraData, message.extraData);
204214
expect(entity.userId, message.user!.id);
205215
expect(entity.localDeletedAt, isSameDateAs(message.localDeletedAt));

0 commit comments

Comments
 (0)