From a46186e6a7176e8026b9664d9a9ba0590da42669 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Fri, 14 May 2021 11:28:32 +0200 Subject: [PATCH] use Map for extradata in persistence --- .../lib/src/db/moor_chat_database.g.dart | 120 +++++++++--------- .../lib/src/entity/channels.dart | 2 +- .../lib/src/entity/messages.dart | 2 +- .../lib/src/entity/reactions.dart | 2 +- .../lib/src/entity/users.dart | 2 +- 5 files changed, 63 insertions(+), 65 deletions(-) diff --git a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.g.dart b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.g.dart index 8220ee4e..b8d404b2 100644 --- a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.g.dart +++ b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.g.dart @@ -42,22 +42,20 @@ class ChannelEntity extends DataClass implements Insertable { final String? createdById; /// Map of custom channel extraData - final Map? extraData; - - ChannelEntity({ - required this.id, - required this.type, - required this.cid, - required this.config, - required this.frozen, - this.lastMessageAt, - required this.createdAt, - required this.updatedAt, - this.deletedAt, - required this.memberCount, - this.createdById, - this.extraData, - }); + final Map? extraData; + ChannelEntity( + {required this.id, + required this.type, + required this.cid, + required this.config, + required this.frozen, + this.lastMessageAt, + required this.createdAt, + required this.updatedAt, + this.deletedAt, + required this.memberCount, + this.createdById, + this.extraData}); factory ChannelEntity.fromData( Map data, GeneratedDatabase db, {String? prefix}) { @@ -135,7 +133,7 @@ class ChannelEntity extends DataClass implements Insertable { deletedAt: serializer.fromJson(json['deletedAt']), memberCount: serializer.fromJson(json['memberCount']), createdById: serializer.fromJson(json['createdById']), - extraData: serializer.fromJson?>(json['extraData']), + extraData: serializer.fromJson?>(json['extraData']), ); } @override @@ -153,7 +151,7 @@ class ChannelEntity extends DataClass implements Insertable { 'deletedAt': serializer.toJson(deletedAt), 'memberCount': serializer.toJson(memberCount), 'createdById': serializer.toJson(createdById), - 'extraData': serializer.toJson?>(extraData), + 'extraData': serializer.toJson?>(extraData), }; } @@ -169,7 +167,7 @@ class ChannelEntity extends DataClass implements Insertable { Value deletedAt = const Value.absent(), int? memberCount, Value createdById = const Value.absent(), - Value?> extraData = const Value.absent()}) => + Value?> extraData = const Value.absent()}) => ChannelEntity( id: id ?? this.id, type: type ?? this.type, @@ -257,7 +255,7 @@ class ChannelsCompanion extends UpdateCompanion { final Value deletedAt; final Value memberCount; final Value createdById; - final Value?> extraData; + final Value?> extraData; const ChannelsCompanion({ this.id = const Value.absent(), this.type = const Value.absent(), @@ -301,7 +299,7 @@ class ChannelsCompanion extends UpdateCompanion { Expression? deletedAt, Expression? memberCount, Expression? createdById, - Expression?>? extraData, + Expression?>? extraData, }) { return RawValuesInsertable({ if (id != null) 'id': id, @@ -331,7 +329,7 @@ class ChannelsCompanion extends UpdateCompanion { Value? deletedAt, Value? memberCount, Value? createdById, - Value?>? extraData}) { + Value?>? extraData}) { return ChannelsCompanion( id: id ?? this.id, type: type ?? this.type, @@ -638,8 +636,8 @@ class $ChannelsTable extends Channels static TypeConverter, String> $converter0 = MapConverter(); - static TypeConverter, String> $converter1 = - MapConverter(); + static TypeConverter, String> $converter1 = + MapConverter(); } class MessageEntity extends DataClass implements Insertable { @@ -714,7 +712,7 @@ class MessageEntity extends DataClass implements Insertable { final String? channelCid; /// Message custom extraData - final Map? extraData; + final Map? extraData; MessageEntity( {required this.id, this.messageText, @@ -901,7 +899,7 @@ class MessageEntity extends DataClass implements Insertable { pinExpires: serializer.fromJson(json['pinExpires']), pinnedByUserId: serializer.fromJson(json['pinnedByUserId']), channelCid: serializer.fromJson(json['channelCid']), - extraData: serializer.fromJson?>(json['extraData']), + extraData: serializer.fromJson?>(json['extraData']), ); } @override @@ -931,7 +929,7 @@ class MessageEntity extends DataClass implements Insertable { 'pinExpires': serializer.toJson(pinExpires), 'pinnedByUserId': serializer.toJson(pinnedByUserId), 'channelCid': serializer.toJson(channelCid), - 'extraData': serializer.toJson?>(extraData), + 'extraData': serializer.toJson?>(extraData), }; } @@ -959,7 +957,7 @@ class MessageEntity extends DataClass implements Insertable { Value pinExpires = const Value.absent(), Value pinnedByUserId = const Value.absent(), Value channelCid = const Value.absent(), - Value?> extraData = const Value.absent()}) => + Value?> extraData = const Value.absent()}) => MessageEntity( id: id ?? this.id, messageText: messageText.present ? messageText.value : this.messageText, @@ -1121,7 +1119,7 @@ class MessagesCompanion extends UpdateCompanion { final Value pinExpires; final Value pinnedByUserId; final Value channelCid; - final Value?> extraData; + final Value?> extraData; const MessagesCompanion({ this.id = const Value.absent(), this.messageText = const Value.absent(), @@ -1200,7 +1198,7 @@ class MessagesCompanion extends UpdateCompanion { Expression? pinExpires, Expression? pinnedByUserId, Expression? channelCid, - Expression?>? extraData, + Expression?>? extraData, }) { return RawValuesInsertable({ if (id != null) 'id': id, @@ -1254,7 +1252,7 @@ class MessagesCompanion extends UpdateCompanion { Value? pinExpires, Value? pinnedByUserId, Value? channelCid, - Value?>? extraData}) { + Value?>? extraData}) { return MessagesCompanion( id: id ?? this.id, messageText: messageText ?? this.messageText, @@ -1818,8 +1816,8 @@ class $MessagesTable extends Messages MapConverter(); static TypeConverter, String> $converter4 = MapConverter(); - static TypeConverter, String> $converter5 = - MapConverter(); + static TypeConverter, String> $converter5 = + MapConverter(); } class PinnedMessageEntity extends DataClass @@ -1895,7 +1893,7 @@ class PinnedMessageEntity extends DataClass final String? channelCid; /// Message custom extraData - final Map? extraData; + final Map? extraData; PinnedMessageEntity( {required this.id, this.messageText, @@ -2082,7 +2080,7 @@ class PinnedMessageEntity extends DataClass pinExpires: serializer.fromJson(json['pinExpires']), pinnedByUserId: serializer.fromJson(json['pinnedByUserId']), channelCid: serializer.fromJson(json['channelCid']), - extraData: serializer.fromJson?>(json['extraData']), + extraData: serializer.fromJson?>(json['extraData']), ); } @override @@ -2112,7 +2110,7 @@ class PinnedMessageEntity extends DataClass 'pinExpires': serializer.toJson(pinExpires), 'pinnedByUserId': serializer.toJson(pinnedByUserId), 'channelCid': serializer.toJson(channelCid), - 'extraData': serializer.toJson?>(extraData), + 'extraData': serializer.toJson?>(extraData), }; } @@ -2140,7 +2138,7 @@ class PinnedMessageEntity extends DataClass Value pinExpires = const Value.absent(), Value pinnedByUserId = const Value.absent(), Value channelCid = const Value.absent(), - Value?> extraData = const Value.absent()}) => + Value?> extraData = const Value.absent()}) => PinnedMessageEntity( id: id ?? this.id, messageText: messageText.present ? messageText.value : this.messageText, @@ -2302,7 +2300,7 @@ class PinnedMessagesCompanion extends UpdateCompanion { final Value pinExpires; final Value pinnedByUserId; final Value channelCid; - final Value?> extraData; + final Value?> extraData; const PinnedMessagesCompanion({ this.id = const Value.absent(), this.messageText = const Value.absent(), @@ -2381,7 +2379,7 @@ class PinnedMessagesCompanion extends UpdateCompanion { Expression? pinExpires, Expression? pinnedByUserId, Expression? channelCid, - Expression?>? extraData, + Expression?>? extraData, }) { return RawValuesInsertable({ if (id != null) 'id': id, @@ -2435,7 +2433,7 @@ class PinnedMessagesCompanion extends UpdateCompanion { Value? pinExpires, Value? pinnedByUserId, Value? channelCid, - Value?>? extraData}) { + Value?>? extraData}) { return PinnedMessagesCompanion( id: id ?? this.id, messageText: messageText ?? this.messageText, @@ -3000,8 +2998,8 @@ class $PinnedMessagesTable extends PinnedMessages MapConverter(); static TypeConverter, String> $converter4 = MapConverter(); - static TypeConverter, String> $converter5 = - MapConverter(); + static TypeConverter, String> $converter5 = + MapConverter(); } class ReactionEntity extends DataClass implements Insertable { @@ -3021,7 +3019,7 @@ class ReactionEntity extends DataClass implements Insertable { final int score; /// Reaction custom extraData - final Map? extraData; + final Map? extraData; ReactionEntity( {required this.userId, required this.messageId, @@ -3073,7 +3071,7 @@ class ReactionEntity extends DataClass implements Insertable { type: serializer.fromJson(json['type']), createdAt: serializer.fromJson(json['createdAt']), score: serializer.fromJson(json['score']), - extraData: serializer.fromJson?>(json['extraData']), + extraData: serializer.fromJson?>(json['extraData']), ); } @override @@ -3085,7 +3083,7 @@ class ReactionEntity extends DataClass implements Insertable { 'type': serializer.toJson(type), 'createdAt': serializer.toJson(createdAt), 'score': serializer.toJson(score), - 'extraData': serializer.toJson?>(extraData), + 'extraData': serializer.toJson?>(extraData), }; } @@ -3095,7 +3093,7 @@ class ReactionEntity extends DataClass implements Insertable { String? type, DateTime? createdAt, int? score, - Value?> extraData = const Value.absent()}) => + Value?> extraData = const Value.absent()}) => ReactionEntity( userId: userId ?? this.userId, messageId: messageId ?? this.messageId, @@ -3144,7 +3142,7 @@ class ReactionsCompanion extends UpdateCompanion { final Value type; final Value createdAt; final Value score; - final Value?> extraData; + final Value?> extraData; const ReactionsCompanion({ this.userId = const Value.absent(), this.messageId = const Value.absent(), @@ -3169,7 +3167,7 @@ class ReactionsCompanion extends UpdateCompanion { Expression? type, Expression? createdAt, Expression? score, - Expression?>? extraData, + Expression?>? extraData, }) { return RawValuesInsertable({ if (userId != null) 'user_id': userId, @@ -3187,7 +3185,7 @@ class ReactionsCompanion extends UpdateCompanion { Value? type, Value? createdAt, Value? score, - Value?>? extraData}) { + Value?>? extraData}) { return ReactionsCompanion( userId: userId ?? this.userId, messageId: messageId ?? this.messageId, @@ -3357,8 +3355,8 @@ class $ReactionsTable extends Reactions return $ReactionsTable(_db, alias); } - static TypeConverter, String> $converter0 = - MapConverter(); + static TypeConverter, String> $converter0 = + MapConverter(); } class UserEntity extends DataClass implements Insertable { @@ -3384,7 +3382,7 @@ class UserEntity extends DataClass implements Insertable { final bool banned; /// Map of custom user extraData - final Map extraData; + final Map extraData; UserEntity( {required this.id, this.role, @@ -3449,7 +3447,7 @@ class UserEntity extends DataClass implements Insertable { lastActive: serializer.fromJson(json['lastActive']), online: serializer.fromJson(json['online']), banned: serializer.fromJson(json['banned']), - extraData: serializer.fromJson>(json['extraData']), + extraData: serializer.fromJson>(json['extraData']), ); } @override @@ -3463,7 +3461,7 @@ class UserEntity extends DataClass implements Insertable { 'lastActive': serializer.toJson(lastActive), 'online': serializer.toJson(online), 'banned': serializer.toJson(banned), - 'extraData': serializer.toJson>(extraData), + 'extraData': serializer.toJson>(extraData), }; } @@ -3475,7 +3473,7 @@ class UserEntity extends DataClass implements Insertable { Value lastActive = const Value.absent(), bool? online, bool? banned, - Map? extraData}) => + Map? extraData}) => UserEntity( id: id ?? this.id, role: role.present ? role.value : this.role, @@ -3536,7 +3534,7 @@ class UsersCompanion extends UpdateCompanion { final Value lastActive; final Value online; final Value banned; - final Value> extraData; + final Value> extraData; const UsersCompanion({ this.id = const Value.absent(), this.role = const Value.absent(), @@ -3555,7 +3553,7 @@ class UsersCompanion extends UpdateCompanion { this.lastActive = const Value.absent(), this.online = const Value.absent(), this.banned = const Value.absent(), - required Map extraData, + required Map extraData, }) : id = Value(id), extraData = Value(extraData); static Insertable custom({ @@ -3566,7 +3564,7 @@ class UsersCompanion extends UpdateCompanion { Expression? lastActive, Expression? online, Expression? banned, - Expression>? extraData, + Expression>? extraData, }) { return RawValuesInsertable({ if (id != null) 'id': id, @@ -3588,7 +3586,7 @@ class UsersCompanion extends UpdateCompanion { Value? lastActive, Value? online, Value? banned, - Value>? extraData}) { + Value>? extraData}) { return UsersCompanion( id: id ?? this.id, role: role ?? this.role, @@ -3791,8 +3789,8 @@ class $UsersTable extends Users with TableInfo<$UsersTable, UserEntity> { return $UsersTable(_db, alias); } - static TypeConverter, String> $converter0 = - MapConverter(); + static TypeConverter, String> $converter0 = + MapConverter(); } class MemberEntity extends DataClass implements Insertable { diff --git a/packages/stream_chat_persistence/lib/src/entity/channels.dart b/packages/stream_chat_persistence/lib/src/entity/channels.dart index e6c280ed..2c65719b 100644 --- a/packages/stream_chat_persistence/lib/src/entity/channels.dart +++ b/packages/stream_chat_persistence/lib/src/entity/channels.dart @@ -39,7 +39,7 @@ class Channels extends Table { TextColumn get createdById => text().nullable()(); /// Map of custom channel extraData - TextColumn get extraData => text().nullable().map(MapConverter())(); + TextColumn get extraData => text().nullable().map(MapConverter())(); @override Set get primaryKey => {cid}; diff --git a/packages/stream_chat_persistence/lib/src/entity/messages.dart b/packages/stream_chat_persistence/lib/src/entity/messages.dart index 7cb1326d..4006d6ce 100644 --- a/packages/stream_chat_persistence/lib/src/entity/messages.dart +++ b/packages/stream_chat_persistence/lib/src/entity/messages.dart @@ -81,7 +81,7 @@ class Messages extends Table { 'NULLABLE REFERENCES channels(cid) ON DELETE CASCADE')(); /// Message custom extraData - TextColumn get extraData => text().nullable().map(MapConverter())(); + TextColumn get extraData => text().nullable().map(MapConverter())(); @override Set get primaryKey => {id}; diff --git a/packages/stream_chat_persistence/lib/src/entity/reactions.dart b/packages/stream_chat_persistence/lib/src/entity/reactions.dart index 2b7d12b5..62380408 100644 --- a/packages/stream_chat_persistence/lib/src/entity/reactions.dart +++ b/packages/stream_chat_persistence/lib/src/entity/reactions.dart @@ -22,7 +22,7 @@ class Reactions extends Table { IntColumn get score => integer().withDefault(const Constant(0))(); /// Reaction custom extraData - TextColumn get extraData => text().nullable().map(MapConverter())(); + TextColumn get extraData => text().nullable().map(MapConverter())(); @override Set get primaryKey => { diff --git a/packages/stream_chat_persistence/lib/src/entity/users.dart b/packages/stream_chat_persistence/lib/src/entity/users.dart index 49fb4687..303092c9 100644 --- a/packages/stream_chat_persistence/lib/src/entity/users.dart +++ b/packages/stream_chat_persistence/lib/src/entity/users.dart @@ -27,7 +27,7 @@ class Users extends Table { BoolColumn get banned => boolean().withDefault(const Constant(false))(); /// Map of custom user extraData - TextColumn get extraData => text().map(MapConverter())(); + TextColumn get extraData => text().map(MapConverter())(); @override Set get primaryKey => {id};