From a1b21892e8d5588488deeb36ae8d66c4af58950a Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 24 May 2023 17:48:11 +0530 Subject: [PATCH 1/5] fix(llc, persistence): remove default value of user.createdAt, updatedAt. Signed-off-by: xsahil03x --- .../stream_chat/lib/src/core/models/user.dart | 11 ++-- .../lib/src/db/drift_chat_database.g.dart | 56 +++++++++---------- .../lib/src/entity/users.dart | 4 +- .../test/src/mapper/user_mapper_test.dart | 2 +- .../test/src/utils/date_matcher.dart | 19 ++++--- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packages/stream_chat/lib/src/core/models/user.dart b/packages/stream_chat/lib/src/core/models/user.dart index a280d18c..dd0b7704 100644 --- a/packages/stream_chat/lib/src/core/models/user.dart +++ b/packages/stream_chat/lib/src/core/models/user.dart @@ -35,8 +35,8 @@ class User extends Equatable { this.role, String? name, String? image, - DateTime? createdAt, - DateTime? updatedAt, + this.createdAt, + this.updatedAt, this.lastActive, Map extraData = const {}, this.online = false, @@ -44,8 +44,7 @@ class User extends Equatable { this.banExpires, this.teams = const [], this.language, - }) : createdAt = createdAt ?? DateTime.now(), - updatedAt = updatedAt ?? DateTime.now(), + }) : // For backwards compatibility, set 'name', 'image' in [extraData]. extraData = { ...extraData, @@ -104,11 +103,11 @@ class User extends Equatable { /// Date of user creation. @JsonKey(includeToJson: false) - final DateTime createdAt; + final DateTime? createdAt; /// Date of last user update. @JsonKey(includeToJson: false) - final DateTime updatedAt; + final DateTime? updatedAt; /// Date of last user connection. @JsonKey(includeToJson: false) diff --git a/packages/stream_chat_persistence/lib/src/db/drift_chat_database.g.dart b/packages/stream_chat_persistence/lib/src/db/drift_chat_database.g.dart index 6f8b0e31..0dcd0107 100644 --- a/packages/stream_chat_persistence/lib/src/db/drift_chat_database.g.dart +++ b/packages/stream_chat_persistence/lib/src/db/drift_chat_database.g.dart @@ -3651,18 +3651,14 @@ class $UsersTable extends Users with TableInfo<$UsersTable, UserEntity> { const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentDateAndTime); + 'created_at', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt'); @override late final GeneratedColumn updatedAt = GeneratedColumn( - 'updated_at', aliasedName, false, - type: DriftSqlType.dateTime, - requiredDuringInsert: false, - defaultValue: currentDateAndTime); + 'updated_at', aliasedName, true, + type: DriftSqlType.dateTime, requiredDuringInsert: false); static const VerificationMeta _lastActiveMeta = const VerificationMeta('lastActive'); @override @@ -3773,9 +3769,9 @@ class $UsersTable extends Users with TableInfo<$UsersTable, UserEntity> { language: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}language']), createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), updatedAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!, + .read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at']), lastActive: attachedDatabase.typeMapping .read(DriftSqlType.dateTime, data['${effectivePrefix}last_active']), online: attachedDatabase.typeMapping @@ -3808,10 +3804,10 @@ class UserEntity extends DataClass implements Insertable { final String? language; /// Date of user creation - final DateTime createdAt; + final DateTime? createdAt; /// Date of last user update - final DateTime updatedAt; + final DateTime? updatedAt; /// Date of last user connection final DateTime? lastActive; @@ -3828,8 +3824,8 @@ class UserEntity extends DataClass implements Insertable { {required this.id, this.role, this.language, - required this.createdAt, - required this.updatedAt, + this.createdAt, + this.updatedAt, this.lastActive, required this.online, required this.banned, @@ -3844,8 +3840,12 @@ class UserEntity extends DataClass implements Insertable { if (!nullToAbsent || language != null) { map['language'] = Variable(language); } - map['created_at'] = Variable(createdAt); - map['updated_at'] = Variable(updatedAt); + if (!nullToAbsent || createdAt != null) { + map['created_at'] = Variable(createdAt); + } + if (!nullToAbsent || updatedAt != null) { + map['updated_at'] = Variable(updatedAt); + } if (!nullToAbsent || lastActive != null) { map['last_active'] = Variable(lastActive); } @@ -3865,8 +3865,8 @@ class UserEntity extends DataClass implements Insertable { id: serializer.fromJson(json['id']), role: serializer.fromJson(json['role']), language: serializer.fromJson(json['language']), - createdAt: serializer.fromJson(json['createdAt']), - updatedAt: serializer.fromJson(json['updatedAt']), + createdAt: serializer.fromJson(json['createdAt']), + updatedAt: serializer.fromJson(json['updatedAt']), lastActive: serializer.fromJson(json['lastActive']), online: serializer.fromJson(json['online']), banned: serializer.fromJson(json['banned']), @@ -3880,8 +3880,8 @@ class UserEntity extends DataClass implements Insertable { 'id': serializer.toJson(id), 'role': serializer.toJson(role), 'language': serializer.toJson(language), - 'createdAt': serializer.toJson(createdAt), - 'updatedAt': serializer.toJson(updatedAt), + 'createdAt': serializer.toJson(createdAt), + 'updatedAt': serializer.toJson(updatedAt), 'lastActive': serializer.toJson(lastActive), 'online': serializer.toJson(online), 'banned': serializer.toJson(banned), @@ -3893,8 +3893,8 @@ class UserEntity extends DataClass implements Insertable { {String? id, Value role = const Value.absent(), Value language = const Value.absent(), - DateTime? createdAt, - DateTime? updatedAt, + Value createdAt = const Value.absent(), + Value updatedAt = const Value.absent(), Value lastActive = const Value.absent(), bool? online, bool? banned, @@ -3903,8 +3903,8 @@ class UserEntity extends DataClass implements Insertable { id: id ?? this.id, role: role.present ? role.value : this.role, language: language.present ? language.value : this.language, - createdAt: createdAt ?? this.createdAt, - updatedAt: updatedAt ?? this.updatedAt, + createdAt: createdAt.present ? createdAt.value : this.createdAt, + updatedAt: updatedAt.present ? updatedAt.value : this.updatedAt, lastActive: lastActive.present ? lastActive.value : this.lastActive, online: online ?? this.online, banned: banned ?? this.banned, @@ -3948,8 +3948,8 @@ class UsersCompanion extends UpdateCompanion { final Value id; final Value role; final Value language; - final Value createdAt; - final Value updatedAt; + final Value createdAt; + final Value updatedAt; final Value lastActive; final Value online; final Value banned; @@ -4010,8 +4010,8 @@ class UsersCompanion extends UpdateCompanion { {Value? id, Value? role, Value? language, - Value? createdAt, - Value? updatedAt, + Value? createdAt, + Value? updatedAt, Value? lastActive, Value? online, Value? banned, diff --git a/packages/stream_chat_persistence/lib/src/entity/users.dart b/packages/stream_chat_persistence/lib/src/entity/users.dart index a5db56cc..56b22e70 100644 --- a/packages/stream_chat_persistence/lib/src/entity/users.dart +++ b/packages/stream_chat_persistence/lib/src/entity/users.dart @@ -15,10 +15,10 @@ class Users extends Table { TextColumn get language => text().nullable()(); /// Date of user creation - DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)(); + DateTimeColumn get createdAt => dateTime().nullable()(); /// Date of last user update - DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)(); + DateTimeColumn get updatedAt => dateTime().nullable()(); /// Date of last user connection DateTimeColumn get lastActive => dateTime().nullable()(); diff --git a/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart index 8f9340a9..eef6aadb 100644 --- a/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart +++ b/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart @@ -27,7 +27,7 @@ void main() { expect(user.language, entity.language); expect(user.createdAt, isSameDateAs(entity.createdAt)); expect(user.updatedAt, isSameDateAs(entity.updatedAt)); - expect(user.lastActive, isSameDateAs(entity.lastActive!)); + expect(user.lastActive, isSameDateAs(entity.lastActive)); expect(user.online, entity.online); expect(user.banned, entity.banned); expect(user.extraData, entity.extraData); diff --git a/packages/stream_chat_persistence/test/src/utils/date_matcher.dart b/packages/stream_chat_persistence/test/src/utils/date_matcher.dart index 5f55f46a..d19d25f2 100644 --- a/packages/stream_chat_persistence/test/src/utils/date_matcher.dart +++ b/packages/stream_chat_persistence/test/src/utils/date_matcher.dart @@ -1,21 +1,22 @@ import 'package:flutter_test/flutter_test.dart'; -Matcher isSameDateAs(DateTime targetDate) => +Matcher isSameDateAs(DateTime? targetDate) => _IsSameDateAs(targetDate: targetDate); class _IsSameDateAs extends Matcher { const _IsSameDateAs({required this.targetDate}); - final DateTime targetDate; + final DateTime? targetDate; @override - bool matches(covariant DateTime date, Map matchState) => - date.year == targetDate.year && - date.month == targetDate.month && - date.day == targetDate.day && - date.hour == targetDate.hour && - date.minute == targetDate.minute && - date.second == targetDate.second; + bool matches(covariant DateTime date, Map matchState) { + return date.year == targetDate?.year && + date.month == targetDate?.month && + date.day == targetDate?.day && + date.hour == targetDate?.hour && + date.minute == targetDate?.minute && + date.second == targetDate?.second; + } @override Description describe(Description description) => From 34e469ea7c4202f3d2f1ecfbf574acf0d44b00dd Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 24 May 2023 17:48:55 +0530 Subject: [PATCH 2/5] chore: bump schemaVersion. Signed-off-by: xsahil03x --- .../stream_chat_persistence/lib/src/db/drift_chat_database.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_persistence/lib/src/db/drift_chat_database.dart b/packages/stream_chat_persistence/lib/src/db/drift_chat_database.dart index e186fbb3..131a5768 100644 --- a/packages/stream_chat_persistence/lib/src/db/drift_chat_database.dart +++ b/packages/stream_chat_persistence/lib/src/db/drift_chat_database.dart @@ -49,7 +49,7 @@ class DriftChatDatabase extends _$DriftChatDatabase { // you should bump this number whenever you change or add a table definition. @override - int get schemaVersion => 10; + int get schemaVersion => 11; @override MigrationStrategy get migration => MigrationStrategy( From f13472cbf3cfad2cefb5a1617d3c7ef08cae8be7 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 24 May 2023 17:53:25 +0530 Subject: [PATCH 3/5] chore: update CHANGELOG.md Signed-off-by: xsahil03x --- packages/stream_chat/CHANGELOG.md | 5 +++++ packages/stream_chat_persistence/CHANGELOG.md | 2 ++ 2 files changed, 7 insertions(+) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 5cb869e1..1989aea0 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,5 +1,10 @@ ## Upcoming +🐞 Fixed + +- [[#1422]](https://github.com/GetStream/stream-chat-flutter/issues/1422) Fixed `User.createdAt` property using + currentTime when the ws connection is not established. + ✅ Added - Added support for `ChatPersistenceClient.isConnected` for checking if the client is connected to the database. diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md index 0729e865..1295ba14 100644 --- a/packages/stream_chat_persistence/CHANGELOG.md +++ b/packages/stream_chat_persistence/CHANGELOG.md @@ -1,6 +1,8 @@ ## Upcoming - Added support for `StreamChatPersistenceClient.isConnected` for checking if the client is connected to the database. +- [[#1422]](https://github.com/GetStream/stream-chat-flutter/issues/1422) Removed default values + from `UserEntity` `createdAt` and `updatedAt` fields. ## 6.1.0 From 9ae6d701de9822d9cc58dee50812b4f9d644358c Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 24 May 2023 18:04:17 +0530 Subject: [PATCH 4/5] chore: fix test. Signed-off-by: xsahil03x --- packages/stream_chat/test/src/core/models/user_test.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/stream_chat/test/src/core/models/user_test.dart b/packages/stream_chat/test/src/core/models/user_test.dart index c8e04ede..fe44dc87 100644 --- a/packages/stream_chat/test/src/core/models/user_test.dart +++ b/packages/stream_chat/test/src/core/models/user_test.dart @@ -198,8 +198,8 @@ void main() { expect(user.banned, false); expect(user.teams, []); expect(user.lastActive, null); - expect(user.createdAt, isNotNull); - expect(user.updatedAt, isNotNull); + expect(user.createdAt, null); + expect(user.updatedAt, null); }); test('default values, parse json', () { @@ -214,8 +214,8 @@ void main() { expect(user.banned, false); expect(user.teams, []); expect(user.lastActive, null); - expect(user.createdAt, isNotNull); - expect(user.updatedAt, isNotNull); + expect(user.createdAt, null); + expect(user.updatedAt, null); }); }); } From 613b29eafb13332b69930faac6fb10b8f3ae96cd Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Wed, 24 May 2023 18:04:40 +0530 Subject: [PATCH 5/5] chore: fix lints. Signed-off-by: xsahil03x --- .../test/src/dao/channel_query_dao_test.dart | 6 +++--- .../test/src/dao/member_dao_test.dart | 4 ++-- .../test/src/mapper/channel_mapper_test.dart | 12 ++++++------ .../test/src/mapper/member_mapper_test.dart | 8 ++++---- .../test/src/mapper/message_mapper_test.dart | 12 ++++++------ .../test/src/mapper/pinned_message_mapper_test.dart | 12 ++++++------ .../test/src/mapper/user_mapper_test.dart | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart index 08905719..91efdb6e 100644 --- a/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart +++ b/packages/stream_chat_persistence/test/src/dao/channel_query_dao_test.dart @@ -132,7 +132,7 @@ void main() { // Should match lastMessageAt date expect( updatedChannel.lastMessageAt, - isSameDateAs(insertedChannel.lastMessageAt!), + isSameDateAs(insertedChannel.lastMessageAt), ); } }); @@ -177,7 +177,7 @@ void main() { // Should match lastMessageAt date expect( updatedChannel.lastMessageAt, - isSameDateAs(insertedChannel.lastMessageAt!), + isSameDateAs(insertedChannel.lastMessageAt), ); } }); @@ -220,7 +220,7 @@ void main() { // Should match lastMessageAt date expect( updatedChannel.lastMessageAt, - isSameDateAs(insertedChannel.lastMessageAt!), + isSameDateAs(insertedChannel.lastMessageAt), ); } }); diff --git a/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart b/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart index 1d4d151b..d96fcd02 100644 --- a/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart +++ b/packages/stream_chat_persistence/test/src/dao/member_dao_test.dart @@ -66,7 +66,7 @@ void main() { expect(fetchedMember.updatedAt, isSameDateAs(member.updatedAt)); expect( fetchedMember.inviteAcceptedAt, - isSameDateAs(member.inviteAcceptedAt!), + isSameDateAs(member.inviteAcceptedAt), ); } }); @@ -93,7 +93,7 @@ void main() { expect(fetchedMember.updatedAt, isSameDateAs(member.updatedAt)); expect( fetchedMember.inviteAcceptedAt, - isSameDateAs(member.inviteAcceptedAt!), + isSameDateAs(member.inviteAcceptedAt), ); } diff --git a/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart index b8bcc2ed..73dd2998 100644 --- a/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart +++ b/packages/stream_chat_persistence/test/src/mapper/channel_mapper_test.dart @@ -37,8 +37,8 @@ void main() { expect(channelModel.updatedAt, isSameDateAs(entity.updatedAt)); expect(channelModel.memberCount, entity.memberCount); expect(channelModel.cid, entity.cid); - expect(channelModel.lastMessageAt, isSameDateAs(entity.lastMessageAt!)); - expect(channelModel.deletedAt, isSameDateAs(entity.deletedAt!)); + expect(channelModel.lastMessageAt, isSameDateAs(entity.lastMessageAt)); + expect(channelModel.deletedAt, isSameDateAs(entity.deletedAt)); expect(channelModel.extraData, entity.extraData); expect(channelModel.createdBy!.id, entity.createdById); }); @@ -77,8 +77,8 @@ void main() { expect(channelModel.updatedAt, isSameDateAs(entity.updatedAt)); expect(channelModel.memberCount, entity.memberCount); expect(channelModel.cid, entity.cid); - expect(channelModel.lastMessageAt, isSameDateAs(entity.lastMessageAt!)); - expect(channelModel.deletedAt, isSameDateAs(entity.deletedAt!)); + expect(channelModel.lastMessageAt, isSameDateAs(entity.lastMessageAt)); + expect(channelModel.deletedAt, isSameDateAs(entity.deletedAt)); expect(channelModel.extraData, entity.extraData); expect(channelModel.createdBy!.id, entity.createdById); }); @@ -115,8 +115,8 @@ void main() { expect(channelEntity.updatedAt, isSameDateAs(model.updatedAt)); expect(channelEntity.memberCount, model.memberCount); expect(channelEntity.cid, model.cid); - expect(channelEntity.lastMessageAt, isSameDateAs(model.lastMessageAt!)); - expect(channelEntity.deletedAt, isSameDateAs(model.deletedAt!)); + expect(channelEntity.lastMessageAt, isSameDateAs(model.lastMessageAt)); + expect(channelEntity.deletedAt, isSameDateAs(model.deletedAt)); expect(channelEntity.extraData, model.extraData); expect(channelEntity.createdById, model.createdBy!.id); }); diff --git a/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart index 206651bd..001872aa 100644 --- a/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart +++ b/packages/stream_chat_persistence/test/src/mapper/member_mapper_test.dart @@ -29,8 +29,8 @@ void main() { expect(member.createdAt, isSameDateAs(entity.createdAt)); expect(member.updatedAt, isSameDateAs(entity.updatedAt)); expect(member.channelRole, entity.channelRole); - expect(member.inviteAcceptedAt, isSameDateAs(entity.inviteAcceptedAt!)); - expect(member.inviteRejectedAt, isSameDateAs(entity.inviteRejectedAt!)); + expect(member.inviteAcceptedAt, isSameDateAs(entity.inviteAcceptedAt)); + expect(member.inviteRejectedAt, isSameDateAs(entity.inviteRejectedAt)); expect(member.invited, entity.invited); expect(member.banned, entity.banned); expect(member.shadowBanned, entity.shadowBanned); @@ -59,8 +59,8 @@ void main() { expect(entity.createdAt, isSameDateAs(member.createdAt)); expect(entity.updatedAt, isSameDateAs(member.updatedAt)); expect(entity.channelRole, member.channelRole); - expect(entity.inviteAcceptedAt, isSameDateAs(member.inviteAcceptedAt!)); - expect(entity.inviteRejectedAt, isSameDateAs(member.inviteRejectedAt!)); + expect(entity.inviteAcceptedAt, isSameDateAs(member.inviteAcceptedAt)); + expect(entity.inviteRejectedAt, isSameDateAs(member.inviteRejectedAt)); expect(entity.invited, member.invited); expect(entity.banned, member.banned); expect(entity.shadowBanned, member.shadowBanned); diff --git a/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart index 8a06f02d..ccb9108e 100644 --- a/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart +++ b/packages/stream_chat_persistence/test/src/mapper/message_mapper_test.dart @@ -96,11 +96,11 @@ void main() { expect(message.updatedAt, isSameDateAs(entity.updatedAt)); expect(message.extraData, entity.extraData); expect(message.user!.id, entity.userId); - expect(message.deletedAt, isSameDateAs(entity.deletedAt!)); + expect(message.deletedAt, isSameDateAs(entity.deletedAt)); expect(message.text, entity.messageText); expect(message.pinned, entity.pinned); - expect(message.pinExpires, isSameDateAs(entity.pinExpires!)); - expect(message.pinnedAt, isSameDateAs(entity.pinnedAt!)); + expect(message.pinExpires, isSameDateAs(entity.pinExpires)); + expect(message.pinnedAt, isSameDateAs(entity.pinnedAt)); expect(message.pinnedBy!.id, entity.pinnedByUserId); expect(message.reactionCounts, entity.reactionCounts); expect(message.reactionScores, entity.reactionScores); @@ -191,11 +191,11 @@ void main() { expect(entity.updatedAt, isSameDateAs(message.updatedAt)); expect(entity.extraData, message.extraData); expect(entity.userId, message.user!.id); - expect(entity.deletedAt, isSameDateAs(message.deletedAt!)); + expect(entity.deletedAt, isSameDateAs(message.deletedAt)); expect(entity.messageText, message.text); expect(entity.pinned, message.pinned); - expect(entity.pinExpires, isSameDateAs(message.pinExpires!)); - expect(entity.pinnedAt, isSameDateAs(message.pinnedAt!)); + expect(entity.pinExpires, isSameDateAs(message.pinExpires)); + expect(entity.pinnedAt, isSameDateAs(message.pinnedAt)); expect(entity.pinnedByUserId, message.pinnedBy!.id); expect(entity.reactionCounts, message.reactionCounts); expect(entity.reactionScores, message.reactionScores); diff --git a/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart index 9c4d99a2..fd3e075c 100644 --- a/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart +++ b/packages/stream_chat_persistence/test/src/mapper/pinned_message_mapper_test.dart @@ -89,11 +89,11 @@ void main() { expect(message.updatedAt, isSameDateAs(entity.updatedAt)); expect(message.extraData, entity.extraData); expect(message.user!.id, entity.userId); - expect(message.deletedAt, isSameDateAs(entity.deletedAt!)); + expect(message.deletedAt, isSameDateAs(entity.deletedAt)); expect(message.text, entity.messageText); expect(message.pinned, entity.pinned); - expect(message.pinExpires, isSameDateAs(entity.pinExpires!)); - expect(message.pinnedAt, isSameDateAs(entity.pinnedAt!)); + expect(message.pinExpires, isSameDateAs(entity.pinExpires)); + expect(message.pinnedAt, isSameDateAs(entity.pinnedAt)); expect(message.pinnedBy!.id, entity.pinnedByUserId); expect(message.reactionCounts, entity.reactionCounts); expect(message.reactionScores, entity.reactionScores); @@ -179,11 +179,11 @@ void main() { expect(entity.updatedAt, isSameDateAs(message.updatedAt)); expect(entity.extraData, message.extraData); expect(entity.userId, message.user!.id); - expect(entity.deletedAt, isSameDateAs(message.deletedAt!)); + expect(entity.deletedAt, isSameDateAs(message.deletedAt)); expect(entity.messageText, message.text); expect(entity.pinned, message.pinned); - expect(entity.pinExpires, isSameDateAs(message.pinExpires!)); - expect(entity.pinnedAt, isSameDateAs(message.pinnedAt!)); + expect(entity.pinExpires, isSameDateAs(message.pinExpires)); + expect(entity.pinnedAt, isSameDateAs(message.pinnedAt)); expect(entity.pinnedByUserId, message.pinnedBy!.id); expect(entity.reactionCounts, message.reactionCounts); expect(entity.reactionScores, message.reactionScores); diff --git a/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart b/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart index eef6aadb..b41e9d59 100644 --- a/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart +++ b/packages/stream_chat_persistence/test/src/mapper/user_mapper_test.dart @@ -52,7 +52,7 @@ void main() { expect(entity.language, user.language); expect(entity.createdAt, isSameDateAs(user.createdAt)); expect(entity.updatedAt, isSameDateAs(user.updatedAt)); - expect(entity.lastActive, isSameDateAs(user.lastActive!)); + expect(entity.lastActive, isSameDateAs(user.lastActive)); expect(entity.online, user.online); expect(entity.banned, user.banned); expect(entity.extraData, user.extraData);