diff --git a/lib/database.dart b/lib/database.dart index fac0f08..efeb00e 100644 --- a/lib/database.dart +++ b/lib/database.dart @@ -3,24 +3,33 @@ import 'package:drift_flutter/drift_flutter.dart'; part 'database.g.dart'; + +enum SessionStatus { + pending, + started, + completed, + missed +} + class Sessions extends Table { IntColumn get id => integer().autoIncrement()(); TextColumn get title => text().withLength(min: 3, max: 32)(); TextColumn get content => text().named('body')(); + TextColumn get status => textEnum()(); DateTimeColumn get date => dateTime().nullable()(); - DateTimeColumn get createdAt => dateTime().nullable()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } class SessionActivities extends Table { IntColumn get id => integer().autoIncrement()(); IntColumn get sessionId => integer().references(Sessions, #id)(); IntColumn get activityId => integer().references(Activities, #id)(); - TextColumn get results => text()(); - TextColumn get achievements => text()(); - DateTimeColumn get createdAt => dateTime().nullable()(); + TextColumn get results => text().nullable()(); + TextColumn get achievements => text().nullable()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } -enum Categories { +enum ActivityCategories { fundamentals, conditioning, advanced, @@ -28,20 +37,33 @@ enum Categories { pro } +enum ActivityType { + strength, + power, + conditioning, + hypertrophy, + endurance, + stability, + mobility, + flexibility, + rehabilitation, + technical +} + class Activities extends Table { IntColumn get id => integer().autoIncrement()(); TextColumn get title => text().withLength(min: 3, max: 32)(); - TextColumn get type => text().withLength(min: 3, max: 32)(); + TextColumn get type => textEnum()(); TextColumn get description => text().named('body')(); - TextColumn get categories => textEnum()(); - DateTimeColumn get createdAt => dateTime().nullable()(); + TextColumn get category => textEnum()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } class ActivityActions extends Table { IntColumn get id => integer().autoIncrement()(); IntColumn get activityId => integer().references(Activities, #id)(); IntColumn get actionId => integer().references(Actions, #id)(); - DateTimeColumn get createdAt => dateTime().nullable()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } class Actions extends Table { @@ -49,23 +71,27 @@ class Actions extends Table { TextColumn get title => text().withLength(min: 3, max: 32)(); TextColumn get description => text().named('body')(); TextColumn get set => text()(); - DateTimeColumn get createdAt => dateTime().nullable()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } class ObjectMediaItems extends Table { IntColumn get id => integer().autoIncrement()(); IntColumn get objectId => integer().references(Actions, #id)(); IntColumn get mediaId => integer().references(MediaItems, #id)(); - DateTimeColumn get createdAt => dateTime().nullable()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } +enum MediaType { + youtube, + image +} class MediaItems extends Table { IntColumn get id => integer().autoIncrement()(); TextColumn get title => text().withLength(min: 3, max: 32)(); TextColumn get description => text().named('body')(); TextColumn get reference => text().withLength(min: 3, max: 32)(); - TextColumn get type => text().withLength(min: 3, max: 32)(); - DateTimeColumn get createdAt => dateTime().nullable()(); + TextColumn get type => textEnum()(); + DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); } @DriftDatabase(tables: [ diff --git a/lib/database.g.dart b/lib/database.g.dart index 3d29f0a..539d583 100644 --- a/lib/database.g.dart +++ b/lib/database.g.dart @@ -31,6 +31,12 @@ class $SessionsTable extends Sessions with TableInfo<$SessionsTable, Session> { late final GeneratedColumn content = GeneratedColumn( 'body', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); + static const VerificationMeta _statusMeta = const VerificationMeta('status'); + @override + late final GeneratedColumnWithTypeConverter status = + GeneratedColumn('status', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter($SessionsTable.$converterstatus); static const VerificationMeta _dateMeta = const VerificationMeta('date'); @override late final GeneratedColumn date = GeneratedColumn( @@ -40,10 +46,13 @@ class $SessionsTable extends Sessions with TableInfo<$SessionsTable, Session> { const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override - List get $columns => [id, title, content, date, createdAt]; + List get $columns => + [id, title, content, status, date, createdAt]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -69,6 +78,7 @@ class $SessionsTable extends Sessions with TableInfo<$SessionsTable, Session> { } else if (isInserting) { context.missing(_contentMeta); } + context.handle(_statusMeta, const VerificationResult.success()); if (data.containsKey('date')) { context.handle( _dateMeta, date.isAcceptableOrUnknown(data['date']!, _dateMeta)); @@ -92,10 +102,13 @@ class $SessionsTable extends Sessions with TableInfo<$SessionsTable, Session> { .read(DriftSqlType.string, data['${effectivePrefix}title'])!, content: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}body'])!, + status: $SessionsTable.$converterstatus.fromSql(attachedDatabase + .typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}status'])!), date: attachedDatabase.typeMapping .read(DriftSqlType.dateTime, data['${effectivePrefix}date']), createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -103,32 +116,39 @@ class $SessionsTable extends Sessions with TableInfo<$SessionsTable, Session> { $SessionsTable createAlias(String alias) { return $SessionsTable(attachedDatabase, alias); } + + static JsonTypeConverter2 $converterstatus = + const EnumNameConverter(SessionStatus.values); } class Session extends DataClass implements Insertable { final int id; final String title; final String content; + final SessionStatus status; final DateTime? date; - final DateTime? createdAt; + final DateTime createdAt; const Session( {required this.id, required this.title, required this.content, + required this.status, this.date, - this.createdAt}); + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['title'] = Variable(title); map['body'] = Variable(content); + { + map['status'] = + Variable($SessionsTable.$converterstatus.toSql(status)); + } if (!nullToAbsent || date != null) { map['date'] = Variable(date); } - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); - } + map['created_at'] = Variable(createdAt); return map; } @@ -137,10 +157,9 @@ class Session extends DataClass implements Insertable { id: Value(id), title: Value(title), content: Value(content), + status: Value(status), date: date == null && nullToAbsent ? const Value.absent() : Value(date), - createdAt: createdAt == null && nullToAbsent - ? const Value.absent() - : Value(createdAt), + createdAt: Value(createdAt), ); } @@ -151,8 +170,10 @@ class Session extends DataClass implements Insertable { id: serializer.fromJson(json['id']), title: serializer.fromJson(json['title']), content: serializer.fromJson(json['content']), + status: $SessionsTable.$converterstatus + .fromJson(serializer.fromJson(json['status'])), date: serializer.fromJson(json['date']), - createdAt: serializer.fromJson(json['createdAt']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -162,8 +183,10 @@ class Session extends DataClass implements Insertable { 'id': serializer.toJson(id), 'title': serializer.toJson(title), 'content': serializer.toJson(content), + 'status': serializer + .toJson($SessionsTable.$converterstatus.toJson(status)), 'date': serializer.toJson(date), - 'createdAt': serializer.toJson(createdAt), + 'createdAt': serializer.toJson(createdAt), }; } @@ -171,20 +194,23 @@ class Session extends DataClass implements Insertable { {int? id, String? title, String? content, + SessionStatus? status, Value date = const Value.absent(), - Value createdAt = const Value.absent()}) => + DateTime? createdAt}) => Session( id: id ?? this.id, title: title ?? this.title, content: content ?? this.content, + status: status ?? this.status, date: date.present ? date.value : this.date, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + createdAt: createdAt ?? this.createdAt, ); Session copyWithCompanion(SessionsCompanion data) { return Session( id: data.id.present ? data.id.value : this.id, title: data.title.present ? data.title.value : this.title, content: data.content.present ? data.content.value : this.content, + status: data.status.present ? data.status.value : this.status, date: data.date.present ? data.date.value : this.date, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); @@ -196,6 +222,7 @@ class Session extends DataClass implements Insertable { ..write('id: $id, ') ..write('title: $title, ') ..write('content: $content, ') + ..write('status: $status, ') ..write('date: $date, ') ..write('createdAt: $createdAt') ..write(')')) @@ -203,7 +230,7 @@ class Session extends DataClass implements Insertable { } @override - int get hashCode => Object.hash(id, title, content, date, createdAt); + int get hashCode => Object.hash(id, title, content, status, date, createdAt); @override bool operator ==(Object other) => identical(this, other) || @@ -211,6 +238,7 @@ class Session extends DataClass implements Insertable { other.id == this.id && other.title == this.title && other.content == this.content && + other.status == this.status && other.date == this.date && other.createdAt == this.createdAt); } @@ -219,12 +247,14 @@ class SessionsCompanion extends UpdateCompanion { final Value id; final Value title; final Value content; + final Value status; final Value date; - final Value createdAt; + final Value createdAt; const SessionsCompanion({ this.id = const Value.absent(), this.title = const Value.absent(), this.content = const Value.absent(), + this.status = const Value.absent(), this.date = const Value.absent(), this.createdAt = const Value.absent(), }); @@ -232,14 +262,17 @@ class SessionsCompanion extends UpdateCompanion { this.id = const Value.absent(), required String title, required String content, + required SessionStatus status, this.date = const Value.absent(), this.createdAt = const Value.absent(), }) : title = Value(title), - content = Value(content); + content = Value(content), + status = Value(status); static Insertable custom({ Expression? id, Expression? title, Expression? content, + Expression? status, Expression? date, Expression? createdAt, }) { @@ -247,6 +280,7 @@ class SessionsCompanion extends UpdateCompanion { if (id != null) 'id': id, if (title != null) 'title': title, if (content != null) 'body': content, + if (status != null) 'status': status, if (date != null) 'date': date, if (createdAt != null) 'created_at': createdAt, }); @@ -256,12 +290,14 @@ class SessionsCompanion extends UpdateCompanion { {Value? id, Value? title, Value? content, + Value? status, Value? date, - Value? createdAt}) { + Value? createdAt}) { return SessionsCompanion( id: id ?? this.id, title: title ?? this.title, content: content ?? this.content, + status: status ?? this.status, date: date ?? this.date, createdAt: createdAt ?? this.createdAt, ); @@ -279,6 +315,10 @@ class SessionsCompanion extends UpdateCompanion { if (content.present) { map['body'] = Variable(content.value); } + if (status.present) { + map['status'] = + Variable($SessionsTable.$converterstatus.toSql(status.value)); + } if (date.present) { map['date'] = Variable(date.value); } @@ -294,6 +334,7 @@ class SessionsCompanion extends UpdateCompanion { ..write('id: $id, ') ..write('title: $title, ') ..write('content: $content, ') + ..write('status: $status, ') ..write('date: $date, ') ..write('createdAt: $createdAt') ..write(')')) @@ -326,34 +367,35 @@ class $ActivitiesTable extends Activities requiredDuringInsert: true); static const VerificationMeta _typeMeta = const VerificationMeta('type'); @override - late final GeneratedColumn type = GeneratedColumn( - 'type', aliasedName, false, - additionalChecks: - GeneratedColumn.checkTextLength(minTextLength: 3, maxTextLength: 32), - type: DriftSqlType.string, - requiredDuringInsert: true); + late final GeneratedColumnWithTypeConverter type = + GeneratedColumn('type', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter($ActivitiesTable.$convertertype); static const VerificationMeta _descriptionMeta = const VerificationMeta('description'); @override late final GeneratedColumn description = GeneratedColumn( 'body', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true); - static const VerificationMeta _categoriesMeta = - const VerificationMeta('categories'); + static const VerificationMeta _categoryMeta = + const VerificationMeta('category'); @override - late final GeneratedColumnWithTypeConverter categories = - GeneratedColumn('categories', aliasedName, false, + late final GeneratedColumnWithTypeConverter + category = GeneratedColumn('category', aliasedName, false, type: DriftSqlType.string, requiredDuringInsert: true) - .withConverter($ActivitiesTable.$convertercategories); + .withConverter( + $ActivitiesTable.$convertercategory); static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override List get $columns => - [id, title, type, description, categories, createdAt]; + [id, title, type, description, category, createdAt]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -373,19 +415,14 @@ class $ActivitiesTable extends Activities } else if (isInserting) { context.missing(_titleMeta); } - if (data.containsKey('type')) { - context.handle( - _typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); - } else if (isInserting) { - context.missing(_typeMeta); - } + context.handle(_typeMeta, const VerificationResult.success()); if (data.containsKey('body')) { context.handle(_descriptionMeta, description.isAcceptableOrUnknown(data['body']!, _descriptionMeta)); } else if (isInserting) { context.missing(_descriptionMeta); } - context.handle(_categoriesMeta, const VerificationResult.success()); + context.handle(_categoryMeta, const VerificationResult.success()); if (data.containsKey('created_at')) { context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); @@ -403,15 +440,15 @@ class $ActivitiesTable extends Activities .read(DriftSqlType.int, data['${effectivePrefix}id'])!, title: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}title'])!, - type: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}type'])!, + type: $ActivitiesTable.$convertertype.fromSql(attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}type'])!), description: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}body'])!, - categories: $ActivitiesTable.$convertercategories.fromSql(attachedDatabase + category: $ActivitiesTable.$convertercategory.fromSql(attachedDatabase .typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}categories'])!), + .read(DriftSqlType.string, data['${effectivePrefix}category'])!), createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -420,38 +457,42 @@ class $ActivitiesTable extends Activities return $ActivitiesTable(attachedDatabase, alias); } - static JsonTypeConverter2 $convertercategories = - const EnumNameConverter(Categories.values); + static JsonTypeConverter2 $convertertype = + const EnumNameConverter(ActivityType.values); + static JsonTypeConverter2 + $convertercategory = + const EnumNameConverter(ActivityCategories.values); } class Activity extends DataClass implements Insertable { final int id; final String title; - final String type; + final ActivityType type; final String description; - final Categories categories; - final DateTime? createdAt; + final ActivityCategories category; + final DateTime createdAt; const Activity( {required this.id, required this.title, required this.type, required this.description, - required this.categories, - this.createdAt}); + required this.category, + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['title'] = Variable(title); - map['type'] = Variable(type); + { + map['type'] = + Variable($ActivitiesTable.$convertertype.toSql(type)); + } map['body'] = Variable(description); { - map['categories'] = Variable( - $ActivitiesTable.$convertercategories.toSql(categories)); - } - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); + map['category'] = + Variable($ActivitiesTable.$convertercategory.toSql(category)); } + map['created_at'] = Variable(createdAt); return map; } @@ -461,10 +502,8 @@ class Activity extends DataClass implements Insertable { title: Value(title), type: Value(type), description: Value(description), - categories: Value(categories), - createdAt: createdAt == null && nullToAbsent - ? const Value.absent() - : Value(createdAt), + category: Value(category), + createdAt: Value(createdAt), ); } @@ -474,11 +513,12 @@ class Activity extends DataClass implements Insertable { return Activity( id: serializer.fromJson(json['id']), title: serializer.fromJson(json['title']), - type: serializer.fromJson(json['type']), + type: $ActivitiesTable.$convertertype + .fromJson(serializer.fromJson(json['type'])), description: serializer.fromJson(json['description']), - categories: $ActivitiesTable.$convertercategories - .fromJson(serializer.fromJson(json['categories'])), - createdAt: serializer.fromJson(json['createdAt']), + category: $ActivitiesTable.$convertercategory + .fromJson(serializer.fromJson(json['category'])), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -487,28 +527,29 @@ class Activity extends DataClass implements Insertable { return { 'id': serializer.toJson(id), 'title': serializer.toJson(title), - 'type': serializer.toJson(type), + 'type': serializer + .toJson($ActivitiesTable.$convertertype.toJson(type)), 'description': serializer.toJson(description), - 'categories': serializer.toJson( - $ActivitiesTable.$convertercategories.toJson(categories)), - 'createdAt': serializer.toJson(createdAt), + 'category': serializer + .toJson($ActivitiesTable.$convertercategory.toJson(category)), + 'createdAt': serializer.toJson(createdAt), }; } Activity copyWith( {int? id, String? title, - String? type, + ActivityType? type, String? description, - Categories? categories, - Value createdAt = const Value.absent()}) => + ActivityCategories? category, + DateTime? createdAt}) => Activity( id: id ?? this.id, title: title ?? this.title, type: type ?? this.type, description: description ?? this.description, - categories: categories ?? this.categories, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + category: category ?? this.category, + createdAt: createdAt ?? this.createdAt, ); Activity copyWithCompanion(ActivitiesCompanion data) { return Activity( @@ -517,8 +558,7 @@ class Activity extends DataClass implements Insertable { type: data.type.present ? data.type.value : this.type, description: data.description.present ? data.description.value : this.description, - categories: - data.categories.present ? data.categories.value : this.categories, + category: data.category.present ? data.category.value : this.category, createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); } @@ -530,7 +570,7 @@ class Activity extends DataClass implements Insertable { ..write('title: $title, ') ..write('type: $type, ') ..write('description: $description, ') - ..write('categories: $categories, ') + ..write('category: $category, ') ..write('createdAt: $createdAt') ..write(')')) .toString(); @@ -538,7 +578,7 @@ class Activity extends DataClass implements Insertable { @override int get hashCode => - Object.hash(id, title, type, description, categories, createdAt); + Object.hash(id, title, type, description, category, createdAt); @override bool operator ==(Object other) => identical(this, other) || @@ -547,42 +587,42 @@ class Activity extends DataClass implements Insertable { other.title == this.title && other.type == this.type && other.description == this.description && - other.categories == this.categories && + other.category == this.category && other.createdAt == this.createdAt); } class ActivitiesCompanion extends UpdateCompanion { final Value id; final Value title; - final Value type; + final Value type; final Value description; - final Value categories; - final Value createdAt; + final Value category; + final Value createdAt; const ActivitiesCompanion({ this.id = const Value.absent(), this.title = const Value.absent(), this.type = const Value.absent(), this.description = const Value.absent(), - this.categories = const Value.absent(), + this.category = const Value.absent(), this.createdAt = const Value.absent(), }); ActivitiesCompanion.insert({ this.id = const Value.absent(), required String title, - required String type, + required ActivityType type, required String description, - required Categories categories, + required ActivityCategories category, this.createdAt = const Value.absent(), }) : title = Value(title), type = Value(type), description = Value(description), - categories = Value(categories); + category = Value(category); static Insertable custom({ Expression? id, Expression? title, Expression? type, Expression? description, - Expression? categories, + Expression? category, Expression? createdAt, }) { return RawValuesInsertable({ @@ -590,7 +630,7 @@ class ActivitiesCompanion extends UpdateCompanion { if (title != null) 'title': title, if (type != null) 'type': type, if (description != null) 'body': description, - if (categories != null) 'categories': categories, + if (category != null) 'category': category, if (createdAt != null) 'created_at': createdAt, }); } @@ -598,16 +638,16 @@ class ActivitiesCompanion extends UpdateCompanion { ActivitiesCompanion copyWith( {Value? id, Value? title, - Value? type, + Value? type, Value? description, - Value? categories, - Value? createdAt}) { + Value? category, + Value? createdAt}) { return ActivitiesCompanion( id: id ?? this.id, title: title ?? this.title, type: type ?? this.type, description: description ?? this.description, - categories: categories ?? this.categories, + category: category ?? this.category, createdAt: createdAt ?? this.createdAt, ); } @@ -622,14 +662,15 @@ class ActivitiesCompanion extends UpdateCompanion { map['title'] = Variable(title.value); } if (type.present) { - map['type'] = Variable(type.value); + map['type'] = + Variable($ActivitiesTable.$convertertype.toSql(type.value)); } if (description.present) { map['body'] = Variable(description.value); } - if (categories.present) { - map['categories'] = Variable( - $ActivitiesTable.$convertercategories.toSql(categories.value)); + if (category.present) { + map['category'] = Variable( + $ActivitiesTable.$convertercategory.toSql(category.value)); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -644,7 +685,7 @@ class ActivitiesCompanion extends UpdateCompanion { ..write('title: $title, ') ..write('type: $type, ') ..write('description: $description, ') - ..write('categories: $categories, ') + ..write('category: $category, ') ..write('createdAt: $createdAt') ..write(')')) .toString(); @@ -688,20 +729,22 @@ class $SessionActivitiesTable extends SessionActivities const VerificationMeta('results'); @override late final GeneratedColumn results = GeneratedColumn( - 'results', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'results', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); static const VerificationMeta _achievementsMeta = const VerificationMeta('achievements'); @override late final GeneratedColumn achievements = GeneratedColumn( - 'achievements', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + 'achievements', aliasedName, true, + type: DriftSqlType.string, requiredDuringInsert: false); static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override List get $columns => [id, sessionId, activityId, results, achievements, createdAt]; @@ -735,16 +778,12 @@ class $SessionActivitiesTable extends SessionActivities if (data.containsKey('results')) { context.handle(_resultsMeta, results.isAcceptableOrUnknown(data['results']!, _resultsMeta)); - } else if (isInserting) { - context.missing(_resultsMeta); } if (data.containsKey('achievements')) { context.handle( _achievementsMeta, achievements.isAcceptableOrUnknown( data['achievements']!, _achievementsMeta)); - } else if (isInserting) { - context.missing(_achievementsMeta); } if (data.containsKey('created_at')) { context.handle(_createdAtMeta, @@ -766,11 +805,11 @@ class $SessionActivitiesTable extends SessionActivities activityId: attachedDatabase.typeMapping .read(DriftSqlType.int, data['${effectivePrefix}activity_id'])!, results: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}results'])!, + .read(DriftSqlType.string, data['${effectivePrefix}results']), achievements: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}achievements'])!, + .read(DriftSqlType.string, data['${effectivePrefix}achievements']), createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -784,27 +823,29 @@ class SessionActivity extends DataClass implements Insertable { final int id; final int sessionId; final int activityId; - final String results; - final String achievements; - final DateTime? createdAt; + final String? results; + final String? achievements; + final DateTime createdAt; const SessionActivity( {required this.id, required this.sessionId, required this.activityId, - required this.results, - required this.achievements, - this.createdAt}); + this.results, + this.achievements, + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['session_id'] = Variable(sessionId); map['activity_id'] = Variable(activityId); - map['results'] = Variable(results); - map['achievements'] = Variable(achievements); - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); + if (!nullToAbsent || results != null) { + map['results'] = Variable(results); } + if (!nullToAbsent || achievements != null) { + map['achievements'] = Variable(achievements); + } + map['created_at'] = Variable(createdAt); return map; } @@ -813,11 +854,13 @@ class SessionActivity extends DataClass implements Insertable { id: Value(id), sessionId: Value(sessionId), activityId: Value(activityId), - results: Value(results), - achievements: Value(achievements), - createdAt: createdAt == null && nullToAbsent + results: results == null && nullToAbsent ? const Value.absent() - : Value(createdAt), + : Value(results), + achievements: achievements == null && nullToAbsent + ? const Value.absent() + : Value(achievements), + createdAt: Value(createdAt), ); } @@ -828,9 +871,9 @@ class SessionActivity extends DataClass implements Insertable { id: serializer.fromJson(json['id']), sessionId: serializer.fromJson(json['sessionId']), activityId: serializer.fromJson(json['activityId']), - results: serializer.fromJson(json['results']), - achievements: serializer.fromJson(json['achievements']), - createdAt: serializer.fromJson(json['createdAt']), + results: serializer.fromJson(json['results']), + achievements: serializer.fromJson(json['achievements']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -840,9 +883,9 @@ class SessionActivity extends DataClass implements Insertable { 'id': serializer.toJson(id), 'sessionId': serializer.toJson(sessionId), 'activityId': serializer.toJson(activityId), - 'results': serializer.toJson(results), - 'achievements': serializer.toJson(achievements), - 'createdAt': serializer.toJson(createdAt), + 'results': serializer.toJson(results), + 'achievements': serializer.toJson(achievements), + 'createdAt': serializer.toJson(createdAt), }; } @@ -850,16 +893,17 @@ class SessionActivity extends DataClass implements Insertable { {int? id, int? sessionId, int? activityId, - String? results, - String? achievements, - Value createdAt = const Value.absent()}) => + Value results = const Value.absent(), + Value achievements = const Value.absent(), + DateTime? createdAt}) => SessionActivity( id: id ?? this.id, sessionId: sessionId ?? this.sessionId, activityId: activityId ?? this.activityId, - results: results ?? this.results, - achievements: achievements ?? this.achievements, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + results: results.present ? results.value : this.results, + achievements: + achievements.present ? achievements.value : this.achievements, + createdAt: createdAt ?? this.createdAt, ); SessionActivity copyWithCompanion(SessionActivitiesCompanion data) { return SessionActivity( @@ -907,9 +951,9 @@ class SessionActivitiesCompanion extends UpdateCompanion { final Value id; final Value sessionId; final Value activityId; - final Value results; - final Value achievements; - final Value createdAt; + final Value results; + final Value achievements; + final Value createdAt; const SessionActivitiesCompanion({ this.id = const Value.absent(), this.sessionId = const Value.absent(), @@ -922,13 +966,11 @@ class SessionActivitiesCompanion extends UpdateCompanion { this.id = const Value.absent(), required int sessionId, required int activityId, - required String results, - required String achievements, + this.results = const Value.absent(), + this.achievements = const Value.absent(), this.createdAt = const Value.absent(), }) : sessionId = Value(sessionId), - activityId = Value(activityId), - results = Value(results), - achievements = Value(achievements); + activityId = Value(activityId); static Insertable custom({ Expression? id, Expression? sessionId, @@ -951,9 +993,9 @@ class SessionActivitiesCompanion extends UpdateCompanion { {Value? id, Value? sessionId, Value? activityId, - Value? results, - Value? achievements, - Value? createdAt}) { + Value? results, + Value? achievements, + Value? createdAt}) { return SessionActivitiesCompanion( id: id ?? this.id, sessionId: sessionId ?? this.sessionId, @@ -1039,8 +1081,10 @@ class $ActionsTable extends Actions with TableInfo<$ActionsTable, Action> { const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override List get $columns => [id, title, description, set, createdAt]; @@ -1097,7 +1141,7 @@ class $ActionsTable extends Actions with TableInfo<$ActionsTable, Action> { set: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}set'])!, createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -1112,13 +1156,13 @@ class Action extends DataClass implements Insertable { final String title; final String description; final String set; - final DateTime? createdAt; + final DateTime createdAt; const Action( {required this.id, required this.title, required this.description, required this.set, - this.createdAt}); + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -1126,9 +1170,7 @@ class Action extends DataClass implements Insertable { map['title'] = Variable(title); map['body'] = Variable(description); map['set'] = Variable(set); - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); - } + map['created_at'] = Variable(createdAt); return map; } @@ -1138,9 +1180,7 @@ class Action extends DataClass implements Insertable { title: Value(title), description: Value(description), set: Value(set), - createdAt: createdAt == null && nullToAbsent - ? const Value.absent() - : Value(createdAt), + createdAt: Value(createdAt), ); } @@ -1152,7 +1192,7 @@ class Action extends DataClass implements Insertable { title: serializer.fromJson(json['title']), description: serializer.fromJson(json['description']), set: serializer.fromJson(json['set']), - createdAt: serializer.fromJson(json['createdAt']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -1163,7 +1203,7 @@ class Action extends DataClass implements Insertable { 'title': serializer.toJson(title), 'description': serializer.toJson(description), 'set': serializer.toJson(set), - 'createdAt': serializer.toJson(createdAt), + 'createdAt': serializer.toJson(createdAt), }; } @@ -1172,13 +1212,13 @@ class Action extends DataClass implements Insertable { String? title, String? description, String? set, - Value createdAt = const Value.absent()}) => + DateTime? createdAt}) => Action( id: id ?? this.id, title: title ?? this.title, description: description ?? this.description, set: set ?? this.set, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + createdAt: createdAt ?? this.createdAt, ); Action copyWithCompanion(ActionsCompanion data) { return Action( @@ -1221,7 +1261,7 @@ class ActionsCompanion extends UpdateCompanion { final Value title; final Value description; final Value set; - final Value createdAt; + final Value createdAt; const ActionsCompanion({ this.id = const Value.absent(), this.title = const Value.absent(), @@ -1259,7 +1299,7 @@ class ActionsCompanion extends UpdateCompanion { Value? title, Value? description, Value? set, - Value? createdAt}) { + Value? createdAt}) { return ActionsCompanion( id: id ?? this.id, title: title ?? this.title, @@ -1340,8 +1380,10 @@ class $ActivityActionsTable extends ActivityActions const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override List get $columns => [id, activityId, actionId, createdAt]; @override @@ -1391,7 +1433,7 @@ class $ActivityActionsTable extends ActivityActions actionId: attachedDatabase.typeMapping .read(DriftSqlType.int, data['${effectivePrefix}action_id'])!, createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -1405,21 +1447,19 @@ class ActivityAction extends DataClass implements Insertable { final int id; final int activityId; final int actionId; - final DateTime? createdAt; + final DateTime createdAt; const ActivityAction( {required this.id, required this.activityId, required this.actionId, - this.createdAt}); + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['activity_id'] = Variable(activityId); map['action_id'] = Variable(actionId); - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); - } + map['created_at'] = Variable(createdAt); return map; } @@ -1428,9 +1468,7 @@ class ActivityAction extends DataClass implements Insertable { id: Value(id), activityId: Value(activityId), actionId: Value(actionId), - createdAt: createdAt == null && nullToAbsent - ? const Value.absent() - : Value(createdAt), + createdAt: Value(createdAt), ); } @@ -1441,7 +1479,7 @@ class ActivityAction extends DataClass implements Insertable { id: serializer.fromJson(json['id']), activityId: serializer.fromJson(json['activityId']), actionId: serializer.fromJson(json['actionId']), - createdAt: serializer.fromJson(json['createdAt']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -1451,20 +1489,17 @@ class ActivityAction extends DataClass implements Insertable { 'id': serializer.toJson(id), 'activityId': serializer.toJson(activityId), 'actionId': serializer.toJson(actionId), - 'createdAt': serializer.toJson(createdAt), + 'createdAt': serializer.toJson(createdAt), }; } ActivityAction copyWith( - {int? id, - int? activityId, - int? actionId, - Value createdAt = const Value.absent()}) => + {int? id, int? activityId, int? actionId, DateTime? createdAt}) => ActivityAction( id: id ?? this.id, activityId: activityId ?? this.activityId, actionId: actionId ?? this.actionId, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + createdAt: createdAt ?? this.createdAt, ); ActivityAction copyWithCompanion(ActivityActionsCompanion data) { return ActivityAction( @@ -1503,7 +1538,7 @@ class ActivityActionsCompanion extends UpdateCompanion { final Value id; final Value activityId; final Value actionId; - final Value createdAt; + final Value createdAt; const ActivityActionsCompanion({ this.id = const Value.absent(), this.activityId = const Value.absent(), @@ -1535,7 +1570,7 @@ class ActivityActionsCompanion extends UpdateCompanion { {Value? id, Value? activityId, Value? actionId, - Value? createdAt}) { + Value? createdAt}) { return ActivityActionsCompanion( id: id ?? this.id, activityId: activityId ?? this.activityId, @@ -1614,18 +1649,18 @@ class $MediaItemsTable extends MediaItems requiredDuringInsert: true); static const VerificationMeta _typeMeta = const VerificationMeta('type'); @override - late final GeneratedColumn type = GeneratedColumn( - 'type', aliasedName, false, - additionalChecks: - GeneratedColumn.checkTextLength(minTextLength: 3, maxTextLength: 32), - type: DriftSqlType.string, - requiredDuringInsert: true); + late final GeneratedColumnWithTypeConverter type = + GeneratedColumn('type', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter($MediaItemsTable.$convertertype); static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override List get $columns => [id, title, description, reference, type, createdAt]; @@ -1660,12 +1695,7 @@ class $MediaItemsTable extends MediaItems } else if (isInserting) { context.missing(_referenceMeta); } - if (data.containsKey('type')) { - context.handle( - _typeMeta, type.isAcceptableOrUnknown(data['type']!, _typeMeta)); - } else if (isInserting) { - context.missing(_typeMeta); - } + context.handle(_typeMeta, const VerificationResult.success()); if (data.containsKey('created_at')) { context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta)); @@ -1687,10 +1717,10 @@ class $MediaItemsTable extends MediaItems .read(DriftSqlType.string, data['${effectivePrefix}body'])!, reference: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}reference'])!, - type: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}type'])!, + type: $MediaItemsTable.$convertertype.fromSql(attachedDatabase.typeMapping + .read(DriftSqlType.string, data['${effectivePrefix}type'])!), createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -1698,6 +1728,9 @@ class $MediaItemsTable extends MediaItems $MediaItemsTable createAlias(String alias) { return $MediaItemsTable(attachedDatabase, alias); } + + static JsonTypeConverter2 $convertertype = + const EnumNameConverter(MediaType.values); } class MediaItem extends DataClass implements Insertable { @@ -1705,15 +1738,15 @@ class MediaItem extends DataClass implements Insertable { final String title; final String description; final String reference; - final String type; - final DateTime? createdAt; + final MediaType type; + final DateTime createdAt; const MediaItem( {required this.id, required this.title, required this.description, required this.reference, required this.type, - this.createdAt}); + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; @@ -1721,10 +1754,11 @@ class MediaItem extends DataClass implements Insertable { map['title'] = Variable(title); map['body'] = Variable(description); map['reference'] = Variable(reference); - map['type'] = Variable(type); - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); + { + map['type'] = + Variable($MediaItemsTable.$convertertype.toSql(type)); } + map['created_at'] = Variable(createdAt); return map; } @@ -1735,9 +1769,7 @@ class MediaItem extends DataClass implements Insertable { description: Value(description), reference: Value(reference), type: Value(type), - createdAt: createdAt == null && nullToAbsent - ? const Value.absent() - : Value(createdAt), + createdAt: Value(createdAt), ); } @@ -1749,8 +1781,9 @@ class MediaItem extends DataClass implements Insertable { title: serializer.fromJson(json['title']), description: serializer.fromJson(json['description']), reference: serializer.fromJson(json['reference']), - type: serializer.fromJson(json['type']), - createdAt: serializer.fromJson(json['createdAt']), + type: $MediaItemsTable.$convertertype + .fromJson(serializer.fromJson(json['type'])), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -1761,8 +1794,9 @@ class MediaItem extends DataClass implements Insertable { 'title': serializer.toJson(title), 'description': serializer.toJson(description), 'reference': serializer.toJson(reference), - 'type': serializer.toJson(type), - 'createdAt': serializer.toJson(createdAt), + 'type': serializer + .toJson($MediaItemsTable.$convertertype.toJson(type)), + 'createdAt': serializer.toJson(createdAt), }; } @@ -1771,15 +1805,15 @@ class MediaItem extends DataClass implements Insertable { String? title, String? description, String? reference, - String? type, - Value createdAt = const Value.absent()}) => + MediaType? type, + DateTime? createdAt}) => MediaItem( id: id ?? this.id, title: title ?? this.title, description: description ?? this.description, reference: reference ?? this.reference, type: type ?? this.type, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + createdAt: createdAt ?? this.createdAt, ); MediaItem copyWithCompanion(MediaItemsCompanion data) { return MediaItem( @@ -1826,8 +1860,8 @@ class MediaItemsCompanion extends UpdateCompanion { final Value title; final Value description; final Value reference; - final Value type; - final Value createdAt; + final Value type; + final Value createdAt; const MediaItemsCompanion({ this.id = const Value.absent(), this.title = const Value.absent(), @@ -1841,7 +1875,7 @@ class MediaItemsCompanion extends UpdateCompanion { required String title, required String description, required String reference, - required String type, + required MediaType type, this.createdAt = const Value.absent(), }) : title = Value(title), description = Value(description), @@ -1870,8 +1904,8 @@ class MediaItemsCompanion extends UpdateCompanion { Value? title, Value? description, Value? reference, - Value? type, - Value? createdAt}) { + Value? type, + Value? createdAt}) { return MediaItemsCompanion( id: id ?? this.id, title: title ?? this.title, @@ -1898,7 +1932,8 @@ class MediaItemsCompanion extends UpdateCompanion { map['reference'] = Variable(reference.value); } if (type.present) { - map['type'] = Variable(type.value); + map['type'] = + Variable($MediaItemsTable.$convertertype.toSql(type.value)); } if (createdAt.present) { map['created_at'] = Variable(createdAt.value); @@ -1957,8 +1992,10 @@ class $ObjectMediaItemsTable extends ObjectMediaItems const VerificationMeta('createdAt'); @override late final GeneratedColumn createdAt = GeneratedColumn( - 'created_at', aliasedName, true, - type: DriftSqlType.dateTime, requiredDuringInsert: false); + 'created_at', aliasedName, false, + type: DriftSqlType.dateTime, + requiredDuringInsert: false, + defaultValue: Variable(DateTime.now())); @override List get $columns => [id, objectId, mediaId, createdAt]; @override @@ -2006,7 +2043,7 @@ class $ObjectMediaItemsTable extends ObjectMediaItems mediaId: attachedDatabase.typeMapping .read(DriftSqlType.int, data['${effectivePrefix}media_id'])!, createdAt: attachedDatabase.typeMapping - .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']), + .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, ); } @@ -2020,21 +2057,19 @@ class ObjectMediaItem extends DataClass implements Insertable { final int id; final int objectId; final int mediaId; - final DateTime? createdAt; + final DateTime createdAt; const ObjectMediaItem( {required this.id, required this.objectId, required this.mediaId, - this.createdAt}); + required this.createdAt}); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['object_id'] = Variable(objectId); map['media_id'] = Variable(mediaId); - if (!nullToAbsent || createdAt != null) { - map['created_at'] = Variable(createdAt); - } + map['created_at'] = Variable(createdAt); return map; } @@ -2043,9 +2078,7 @@ class ObjectMediaItem extends DataClass implements Insertable { id: Value(id), objectId: Value(objectId), mediaId: Value(mediaId), - createdAt: createdAt == null && nullToAbsent - ? const Value.absent() - : Value(createdAt), + createdAt: Value(createdAt), ); } @@ -2056,7 +2089,7 @@ class ObjectMediaItem extends DataClass implements Insertable { id: serializer.fromJson(json['id']), objectId: serializer.fromJson(json['objectId']), mediaId: serializer.fromJson(json['mediaId']), - createdAt: serializer.fromJson(json['createdAt']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -2066,20 +2099,17 @@ class ObjectMediaItem extends DataClass implements Insertable { 'id': serializer.toJson(id), 'objectId': serializer.toJson(objectId), 'mediaId': serializer.toJson(mediaId), - 'createdAt': serializer.toJson(createdAt), + 'createdAt': serializer.toJson(createdAt), }; } ObjectMediaItem copyWith( - {int? id, - int? objectId, - int? mediaId, - Value createdAt = const Value.absent()}) => + {int? id, int? objectId, int? mediaId, DateTime? createdAt}) => ObjectMediaItem( id: id ?? this.id, objectId: objectId ?? this.objectId, mediaId: mediaId ?? this.mediaId, - createdAt: createdAt.present ? createdAt.value : this.createdAt, + createdAt: createdAt ?? this.createdAt, ); ObjectMediaItem copyWithCompanion(ObjectMediaItemsCompanion data) { return ObjectMediaItem( @@ -2117,7 +2147,7 @@ class ObjectMediaItemsCompanion extends UpdateCompanion { final Value id; final Value objectId; final Value mediaId; - final Value createdAt; + final Value createdAt; const ObjectMediaItemsCompanion({ this.id = const Value.absent(), this.objectId = const Value.absent(), @@ -2149,7 +2179,7 @@ class ObjectMediaItemsCompanion extends UpdateCompanion { {Value? id, Value? objectId, Value? mediaId, - Value? createdAt}) { + Value? createdAt}) { return ObjectMediaItemsCompanion( id: id ?? this.id, objectId: objectId ?? this.objectId, @@ -2220,15 +2250,17 @@ typedef $$SessionsTableCreateCompanionBuilder = SessionsCompanion Function({ Value id, required String title, required String content, + required SessionStatus status, Value date, - Value createdAt, + Value createdAt, }); typedef $$SessionsTableUpdateCompanionBuilder = SessionsCompanion Function({ Value id, Value title, Value content, + Value status, Value date, - Value createdAt, + Value createdAt, }); final class $$SessionsTableReferences @@ -2271,6 +2303,11 @@ class $$SessionsTableFilterComposer ColumnFilters get content => $composableBuilder( column: $table.content, builder: (column) => ColumnFilters(column)); + ColumnWithTypeConverterFilters + get status => $composableBuilder( + column: $table.status, + builder: (column) => ColumnWithTypeConverterFilters(column)); + ColumnFilters get date => $composableBuilder( column: $table.date, builder: (column) => ColumnFilters(column)); @@ -2317,6 +2354,9 @@ class $$SessionsTableOrderingComposer ColumnOrderings get content => $composableBuilder( column: $table.content, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get status => $composableBuilder( + column: $table.status, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get date => $composableBuilder( column: $table.date, builder: (column) => ColumnOrderings(column)); @@ -2342,6 +2382,9 @@ class $$SessionsTableAnnotationComposer GeneratedColumn get content => $composableBuilder(column: $table.content, builder: (column) => column); + GeneratedColumnWithTypeConverter get status => + $composableBuilder(column: $table.status, builder: (column) => column); + GeneratedColumn get date => $composableBuilder(column: $table.date, builder: (column) => column); @@ -2397,13 +2440,15 @@ class $$SessionsTableTableManager extends RootTableManager< Value id = const Value.absent(), Value title = const Value.absent(), Value content = const Value.absent(), + Value status = const Value.absent(), Value date = const Value.absent(), - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => SessionsCompanion( id: id, title: title, content: content, + status: status, date: date, createdAt: createdAt, ), @@ -2411,13 +2456,15 @@ class $$SessionsTableTableManager extends RootTableManager< Value id = const Value.absent(), required String title, required String content, + required SessionStatus status, Value date = const Value.absent(), - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => SessionsCompanion.insert( id: id, title: title, content: content, + status: status, date: date, createdAt: createdAt, ), @@ -2468,18 +2515,18 @@ typedef $$SessionsTableProcessedTableManager = ProcessedTableManager< typedef $$ActivitiesTableCreateCompanionBuilder = ActivitiesCompanion Function({ Value id, required String title, - required String type, + required ActivityType type, required String description, - required Categories categories, - Value createdAt, + required ActivityCategories category, + Value createdAt, }); typedef $$ActivitiesTableUpdateCompanionBuilder = ActivitiesCompanion Function({ Value id, Value title, - Value type, + Value type, Value description, - Value categories, - Value createdAt, + Value category, + Value createdAt, }); final class $$ActivitiesTableReferences @@ -2536,15 +2583,17 @@ class $$ActivitiesTableFilterComposer ColumnFilters get title => $composableBuilder( column: $table.title, builder: (column) => ColumnFilters(column)); - ColumnFilters get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnFilters(column)); + ColumnWithTypeConverterFilters get type => + $composableBuilder( + column: $table.type, + builder: (column) => ColumnWithTypeConverterFilters(column)); ColumnFilters get description => $composableBuilder( column: $table.description, builder: (column) => ColumnFilters(column)); - ColumnWithTypeConverterFilters - get categories => $composableBuilder( - column: $table.categories, + ColumnWithTypeConverterFilters + get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnWithTypeConverterFilters(column)); ColumnFilters get createdAt => $composableBuilder( @@ -2614,8 +2663,8 @@ class $$ActivitiesTableOrderingComposer ColumnOrderings get description => $composableBuilder( column: $table.description, builder: (column) => ColumnOrderings(column)); - ColumnOrderings get categories => $composableBuilder( - column: $table.categories, builder: (column) => ColumnOrderings(column)); + ColumnOrderings get category => $composableBuilder( + column: $table.category, builder: (column) => ColumnOrderings(column)); ColumnOrderings get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnOrderings(column)); @@ -2636,15 +2685,14 @@ class $$ActivitiesTableAnnotationComposer GeneratedColumn get title => $composableBuilder(column: $table.title, builder: (column) => column); - GeneratedColumn get type => + GeneratedColumnWithTypeConverter get type => $composableBuilder(column: $table.type, builder: (column) => column); GeneratedColumn get description => $composableBuilder( column: $table.description, builder: (column) => column); - GeneratedColumnWithTypeConverter get categories => - $composableBuilder( - column: $table.categories, builder: (column) => column); + GeneratedColumnWithTypeConverter get category => + $composableBuilder(column: $table.category, builder: (column) => column); GeneratedColumn get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column); @@ -2719,33 +2767,33 @@ class $$ActivitiesTableTableManager extends RootTableManager< updateCompanionCallback: ({ Value id = const Value.absent(), Value title = const Value.absent(), - Value type = const Value.absent(), + Value type = const Value.absent(), Value description = const Value.absent(), - Value categories = const Value.absent(), - Value createdAt = const Value.absent(), + Value category = const Value.absent(), + Value createdAt = const Value.absent(), }) => ActivitiesCompanion( id: id, title: title, type: type, description: description, - categories: categories, + category: category, createdAt: createdAt, ), createCompanionCallback: ({ Value id = const Value.absent(), required String title, - required String type, + required ActivityType type, required String description, - required Categories categories, - Value createdAt = const Value.absent(), + required ActivityCategories category, + Value createdAt = const Value.absent(), }) => ActivitiesCompanion.insert( id: id, title: title, type: type, description: description, - categories: categories, + category: category, createdAt: createdAt, ), withReferenceMapper: (p0) => p0 @@ -2814,18 +2862,18 @@ typedef $$SessionActivitiesTableCreateCompanionBuilder Value id, required int sessionId, required int activityId, - required String results, - required String achievements, - Value createdAt, + Value results, + Value achievements, + Value createdAt, }); typedef $$SessionActivitiesTableUpdateCompanionBuilder = SessionActivitiesCompanion Function({ Value id, Value sessionId, Value activityId, - Value results, - Value achievements, - Value createdAt, + Value results, + Value achievements, + Value createdAt, }); final class $$SessionActivitiesTableReferences extends BaseReferences< @@ -3075,9 +3123,9 @@ class $$SessionActivitiesTableTableManager extends RootTableManager< Value id = const Value.absent(), Value sessionId = const Value.absent(), Value activityId = const Value.absent(), - Value results = const Value.absent(), - Value achievements = const Value.absent(), - Value createdAt = const Value.absent(), + Value results = const Value.absent(), + Value achievements = const Value.absent(), + Value createdAt = const Value.absent(), }) => SessionActivitiesCompanion( id: id, @@ -3091,9 +3139,9 @@ class $$SessionActivitiesTableTableManager extends RootTableManager< Value id = const Value.absent(), required int sessionId, required int activityId, - required String results, - required String achievements, - Value createdAt = const Value.absent(), + Value results = const Value.absent(), + Value achievements = const Value.absent(), + Value createdAt = const Value.absent(), }) => SessionActivitiesCompanion.insert( id: id, @@ -3176,14 +3224,14 @@ typedef $$ActionsTableCreateCompanionBuilder = ActionsCompanion Function({ required String title, required String description, required String set, - Value createdAt, + Value createdAt, }); typedef $$ActionsTableUpdateCompanionBuilder = ActionsCompanion Function({ Value id, Value title, Value description, Value set, - Value createdAt, + Value createdAt, }); final class $$ActionsTableReferences @@ -3412,7 +3460,7 @@ class $$ActionsTableTableManager extends RootTableManager< Value title = const Value.absent(), Value description = const Value.absent(), Value set = const Value.absent(), - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => ActionsCompanion( id: id, @@ -3426,7 +3474,7 @@ class $$ActionsTableTableManager extends RootTableManager< required String title, required String description, required String set, - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => ActionsCompanion.insert( id: id, @@ -3499,14 +3547,14 @@ typedef $$ActivityActionsTableCreateCompanionBuilder = ActivityActionsCompanion Value id, required int activityId, required int actionId, - Value createdAt, + Value createdAt, }); typedef $$ActivityActionsTableUpdateCompanionBuilder = ActivityActionsCompanion Function({ Value id, Value activityId, Value actionId, - Value createdAt, + Value createdAt, }); final class $$ActivityActionsTableReferences extends BaseReferences< @@ -3736,7 +3784,7 @@ class $$ActivityActionsTableTableManager extends RootTableManager< Value id = const Value.absent(), Value activityId = const Value.absent(), Value actionId = const Value.absent(), - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => ActivityActionsCompanion( id: id, @@ -3748,7 +3796,7 @@ class $$ActivityActionsTableTableManager extends RootTableManager< Value id = const Value.absent(), required int activityId, required int actionId, - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => ActivityActionsCompanion.insert( id: id, @@ -3828,16 +3876,16 @@ typedef $$MediaItemsTableCreateCompanionBuilder = MediaItemsCompanion Function({ required String title, required String description, required String reference, - required String type, - Value createdAt, + required MediaType type, + Value createdAt, }); typedef $$MediaItemsTableUpdateCompanionBuilder = MediaItemsCompanion Function({ Value id, Value title, Value description, Value reference, - Value type, - Value createdAt, + Value type, + Value createdAt, }); final class $$MediaItemsTableReferences @@ -3883,8 +3931,10 @@ class $$MediaItemsTableFilterComposer ColumnFilters get reference => $composableBuilder( column: $table.reference, builder: (column) => ColumnFilters(column)); - ColumnFilters get type => $composableBuilder( - column: $table.type, builder: (column) => ColumnFilters(column)); + ColumnWithTypeConverterFilters get type => + $composableBuilder( + column: $table.type, + builder: (column) => ColumnWithTypeConverterFilters(column)); ColumnFilters get createdAt => $composableBuilder( column: $table.createdAt, builder: (column) => ColumnFilters(column)); @@ -3960,7 +4010,7 @@ class $$MediaItemsTableAnnotationComposer GeneratedColumn get reference => $composableBuilder(column: $table.reference, builder: (column) => column); - GeneratedColumn get type => + GeneratedColumnWithTypeConverter get type => $composableBuilder(column: $table.type, builder: (column) => column); GeneratedColumn get createdAt => @@ -4015,8 +4065,8 @@ class $$MediaItemsTableTableManager extends RootTableManager< Value title = const Value.absent(), Value description = const Value.absent(), Value reference = const Value.absent(), - Value type = const Value.absent(), - Value createdAt = const Value.absent(), + Value type = const Value.absent(), + Value createdAt = const Value.absent(), }) => MediaItemsCompanion( id: id, @@ -4031,8 +4081,8 @@ class $$MediaItemsTableTableManager extends RootTableManager< required String title, required String description, required String reference, - required String type, - Value createdAt = const Value.absent(), + required MediaType type, + Value createdAt = const Value.absent(), }) => MediaItemsCompanion.insert( id: id, @@ -4093,14 +4143,14 @@ typedef $$ObjectMediaItemsTableCreateCompanionBuilder Value id, required int objectId, required int mediaId, - Value createdAt, + Value createdAt, }); typedef $$ObjectMediaItemsTableUpdateCompanionBuilder = ObjectMediaItemsCompanion Function({ Value id, Value objectId, Value mediaId, - Value createdAt, + Value createdAt, }); final class $$ObjectMediaItemsTableReferences extends BaseReferences< @@ -4330,7 +4380,7 @@ class $$ObjectMediaItemsTableTableManager extends RootTableManager< Value id = const Value.absent(), Value objectId = const Value.absent(), Value mediaId = const Value.absent(), - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => ObjectMediaItemsCompanion( id: id, @@ -4342,7 +4392,7 @@ class $$ObjectMediaItemsTableTableManager extends RootTableManager< Value id = const Value.absent(), required int objectId, required int mediaId, - Value createdAt = const Value.absent(), + Value createdAt = const Value.absent(), }) => ObjectMediaItemsCompanion.insert( id: id, diff --git a/lib/main.dart b/lib/main.dart index 2cdc9b1..6b679f3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,7 @@ +import 'package:drift/drift.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:sendtrain/database.dart'; import 'package:sendtrain/models/activity_timer_model.dart'; import 'package:sendtrain/screens/activities_screen.dart'; import 'package:sendtrain/screens/sessions_screen.dart'; @@ -90,6 +92,52 @@ class _AppState extends State { } void main() { + final database = AppDatabase(); + + // database.into(database.sessions).insert(SessionsCompanion.insert( + // title: 'test session title', + // content: 'test session content description', + // status: SessionStatus.pending, + // date: Value(DateTime.now()))); + + // database.into(database.activities).insert(ActivitiesCompanion.insert( + // title: "test activity", + // type: ActivityType.technical, + // description: "test training activity", + // category: ActivityCategories.fundamentals)); + + // database + // .into(database.sessionActivities) + // .insert(SessionActivitiesCompanion.insert( + // sessionId: 1, + // activityId: 1, + // results: Value("results json, will need to test"), + // achievements: Value("comma, seperated, items"), + // )); + + // database.into(database.actions).insert(ActionsCompanion.insert( + // title: "test action title", + // description: "teste action description", + // set: "not sure how the json will work yet", + // )); + + // database + // .into(database.activityActions) + // .insert(ActivityActionsCompanion.insert( + // activityId: 1, + // actionId: 1, + // )); + + // database.into(database.mediaItems).insert(MediaItemsCompanion.insert( + // title: "test youtube media item", + // description: "this is a test youtube item", + // reference: "sZVAEy9UmoY", + // type: MediaType.youtube)); + + // database + // .into(database.objectMediaItems) + // .insert(ObjectMediaItemsCompanion.insert(objectId: 1, mediaId: 1)); + runApp( ChangeNotifierProvider( create: (context) => ActivityTimerModel(),