jshbrmn/SendTrain
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

db seed fix, cleanup

Browse Source
This commit is contained in:
Joshua Burman 2024-12-20 21:07:05 -05:00
parent 68443b3427
commit 3153bf13f9
5 changed files with 155 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/database/database.dart
View File

@ -6,13 +6,7 @@ import 'package:sendtrain/database/seed.dart';
part 'database.g.dart'; part 'database.g.dart';
enum SessionStatus { pending, started, completed, missed }
enum SessionStatus {
pending,
started,
completed,
missed
}
class Sessions extends Table { class Sessions extends Table {
IntColumn get id => integer().autoIncrement()(); IntColumn get id => integer().autoIncrement()();
@ -20,7 +14,8 @@ class Sessions extends Table {
TextColumn get content => text().named('body')(); TextColumn get content => text().named('body')();
TextColumn get status => textEnum<SessionStatus>()(); TextColumn get status => textEnum<SessionStatus>()();
DateTimeColumn get date => dateTime().nullable()(); DateTimeColumn get date => dateTime().nullable()();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
class SessionActivities extends Table { class SessionActivities extends Table {
@ -29,16 +24,11 @@ class SessionActivities extends Table {
IntColumn get activityId => integer().references(Activities, #id)(); IntColumn get activityId => integer().references(Activities, #id)();
TextColumn get results => text().nullable()(); TextColumn get results => text().nullable()();
TextColumn get achievements => text().nullable()(); TextColumn get achievements => text().nullable()();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
enum ActivityCategories { enum ActivityCategories { fundamentals, conditioning, advanced, custom, pro }
fundamentals,
conditioning,
advanced,
custom,
pro
}
enum ActivityType { enum ActivityType {
strength, strength,
@ -59,14 +49,16 @@ class Activities extends Table {
TextColumn get type => textEnum<ActivityType>()(); TextColumn get type => textEnum<ActivityType>()();
TextColumn get description => text().named('body')(); TextColumn get description => text().named('body')();
TextColumn get category => textEnum<ActivityCategories>()(); TextColumn get category => textEnum<ActivityCategories>()();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
class ActivityActions extends Table { class ActivityActions extends Table {
IntColumn get id => integer().autoIncrement()(); IntColumn get id => integer().autoIncrement()();
IntColumn get activityId => integer().references(Activities, #id)(); IntColumn get activityId => integer().references(Activities, #id)();
IntColumn get actionId => integer().references(Actions, #id)(); IntColumn get actionId => integer().references(Actions, #id)();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
class Actions extends Table { class Actions extends Table {
@ -74,7 +66,8 @@ class Actions extends Table {
TextColumn get title => text().withLength(min: 3, max: 32)(); TextColumn get title => text().withLength(min: 3, max: 32)();
TextColumn get description => text().named('body')(); TextColumn get description => text().named('body')();
TextColumn get set => text()(); TextColumn get set => text()();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
enum ObjectType { enum ObjectType {
@ -82,25 +75,26 @@ enum ObjectType {
activities, activities,
sessions, sessions,
} }
class ObjectMediaItems extends Table { class ObjectMediaItems extends Table {
IntColumn get id => integer().autoIncrement()(); IntColumn get id => integer().autoIncrement()();
IntColumn get objectId => integer()(); IntColumn get objectId => integer()();
TextColumn get objectType => textEnum<ObjectType>()(); TextColumn get objectType => textEnum<ObjectType>()();
IntColumn get mediaId => integer().references(MediaItems, #id)(); IntColumn get mediaId => integer().references(MediaItems, #id)();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
enum MediaType { enum MediaType { youtube, image }
youtube,
image
}
class MediaItems extends Table { class MediaItems extends Table {
IntColumn get id => integer().autoIncrement()(); IntColumn get id => integer().autoIncrement()();
TextColumn get title => text().withLength(min: 3, max: 32)(); TextColumn get title => text().withLength(min: 3, max: 32)();
TextColumn get description => text().named('body')(); TextColumn get description => text().named('body')();
TextColumn get reference => text().withLength(min: 3, max: 256)(); TextColumn get reference => text().withLength(min: 3, max: 256)();
TextColumn get type => textEnum<MediaType>()(); TextColumn get type => textEnum<MediaType>()();
DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))(); DateTimeColumn get createdAt =>
dateTime().withDefault(Variable(DateTime.now()))();
} }
@DriftDatabase(tables: [ @DriftDatabase(tables: [
@ -116,7 +110,6 @@ class MediaItems extends Table {
ActivitiesDao, ActivitiesDao,
MediaItems MediaItems
]) ])
class AppDatabase extends _$AppDatabase { class AppDatabase extends _$AppDatabase {
// After generating code, this class needs to define a `schemaVersion` getter // After generating code, this class needs to define a `schemaVersion` getter
// and a constructor telling drift where the database should be stored. // and a constructor telling drift where the database should be stored.
@ -130,9 +123,14 @@ class AppDatabase extends _$AppDatabase {
MigrationStrategy get migration { MigrationStrategy get migration {
return MigrationStrategy( return MigrationStrategy(
onCreate: (m) async { onCreate: (m) async {
await m.createAll(); // create all tables await m.createAll().then((r) async {
await seedDb(); // seed the tables await seedDb(this);
} }); // create all tablesables
},
beforeOpen: (details) async {
/// Enable foreign_keys
await customStatement('PRAGMA foreign_keys = ON');
},
); );
} }

50
lib/database/seed.dart
View File

@ -3,9 +3,7 @@ import 'dart:math';
import 'package:drift/drift.dart'; import 'package:drift/drift.dart';
import 'package:sendtrain/database/database.dart'; import 'package:sendtrain/database/database.dart';
Future<void> seedDb() async { Future<void> seedDb(AppDatabase database) async {
final database = AppDatabase();
// seed data setup // seed data setup
final List<List> sessionValues = [ final List<List> sessionValues = [
[ [
@ -51,30 +49,29 @@ Future<void> seedDb() async {
if (i == 0) status = SessionStatus.started; if (i == 0) status = SessionStatus.started;
if (i == 1) status = SessionStatus.pending; if (i == 1) status = SessionStatus.pending;
final sessionValue = final sessionValue = sessionValues[random.nextInt(sessionValues.length)];
sessionValues[random.nextInt(sessionValues.length)]; await database
database
.into(database.sessions) .into(database.sessions)
.insert(SessionsCompanion.insert( .insert(SessionsCompanion.insert(
title: sessionValue[0], title: sessionValue[0],
content: sessionValue[1], content: sessionValue[1],
status: status, status: status,
date: Value(DateTime.now()))) date: Value(DateTime.now())))
.then((sessionId) { .then((sessionId) async {
// activities things // activities things
for (int j = 0; j < random.nextInt(totalActivities); j++) { for (int j = 0; j < random.nextInt(totalActivities); j++) {
database await database
.into(database.activities) .into(database.activities)
.insert(ActivitiesCompanion.insert( .insert(ActivitiesCompanion.insert(
title: "test activity $j", title: "test activity $j",
type: ActivityType type: ActivityType
.values[random.nextInt(ActivityType.values.length)], .values[random.nextInt(ActivityType.values.length)],
description: "test training activity $j", description: "test training activity $j",
category: ActivityCategories.values[ category: ActivityCategories
random.nextInt(ActivityCategories.values.length)])) .values[random.nextInt(ActivityCategories.values.length)]))
.then((activityId) { .then((activityId) async {
// session activity relationships // session activity relationships
database await database
.into(database.sessionActivities) .into(database.sessionActivities)
.insert(SessionActivitiesCompanion.insert( .insert(SessionActivitiesCompanion.insert(
sessionId: sessionId, sessionId: sessionId,
@ -85,30 +82,29 @@ Future<void> seedDb() async {
// actions // actions
for (int k = 0; k < random.nextInt(totalActions); k++) { for (int k = 0; k < random.nextInt(totalActions); k++) {
database await database
.into(database.actions) .into(database.actions)
.insert(ActionsCompanion.insert( .insert(ActionsCompanion.insert(
title: 'test action $k', title: 'test action $k',
description: 'test action description $k', description: 'test action description $k',
set: '')) set: ''))
.then((actionId) { .then((actionId) async {
// add activity action association // add activity action association
database.into(database.activityActions).insert( await database.into(database.activityActions).insert(
ActivityActionsCompanion.insert( ActivityActionsCompanion.insert(
activityId: activityId, actionId: actionId)); activityId: activityId, actionId: actionId));
for (int l = 0; l < random.nextInt(totalMedia); l++) { for (int l = 0; l < random.nextInt(totalMedia); l++) {
final mediaItem = final mediaItem = mediaItems[random.nextInt(mediaItems.length)];
mediaItems[random.nextInt(mediaItems.length)]; await database
database
.into(database.mediaItems) .into(database.mediaItems)
.insert(MediaItemsCompanion.insert( .insert(MediaItemsCompanion.insert(
title: 'media title $l', title: 'media title $l',
description: 'media description $l', description: 'media description $l',
reference: mediaItem[0], reference: mediaItem[0],
type: mediaItem[1])) type: mediaItem[1]))
.then((mediaId) { .then((mediaId) async {
database.into(database.objectMediaItems).insert( await database.into(database.objectMediaItems).insert(
ObjectMediaItemsCompanion.insert( ObjectMediaItemsCompanion.insert(
objectId: actionId, objectId: actionId,
mediaId: mediaId, mediaId: mediaId,
@ -120,15 +116,15 @@ Future<void> seedDb() async {
for (int l = 0; l < random.nextInt(totalMedia); l++) { for (int l = 0; l < random.nextInt(totalMedia); l++) {
final mediaItem = mediaItems[random.nextInt(mediaItems.length)]; final mediaItem = mediaItems[random.nextInt(mediaItems.length)];
database await database
.into(database.mediaItems) .into(database.mediaItems)
.insert(MediaItemsCompanion.insert( .insert(MediaItemsCompanion.insert(
title: 'media title $l', title: 'media title $l',
description: 'media description $l', description: 'media description $l',
reference: mediaItem[0], reference: mediaItem[0],
type: mediaItem[1])) type: mediaItem[1]))
.then((mediaId) { .then((mediaId) async {
database.into(database.objectMediaItems).insert( await database.into(database.objectMediaItems).insert(
ObjectMediaItemsCompanion.insert( ObjectMediaItemsCompanion.insert(
objectId: activityId, objectId: activityId,
mediaId: mediaId, mediaId: mediaId,
@ -140,15 +136,15 @@ Future<void> seedDb() async {
for (int l = 0; l < random.nextInt(totalMedia); l++) { for (int l = 0; l < random.nextInt(totalMedia); l++) {
final mediaItem = mediaItems[random.nextInt(mediaItems.length)]; final mediaItem = mediaItems[random.nextInt(mediaItems.length)];
database await database
.into(database.mediaItems) .into(database.mediaItems)
.insert(MediaItemsCompanion.insert( .insert(MediaItemsCompanion.insert(
title: 'media title $l', title: 'media title $l',
description: 'media description $l', description: 'media description $l',
reference: mediaItem[0], reference: mediaItem[0],
type: mediaItem[1])) type: mediaItem[1]))
.then((mediaId) { .then((mediaId) async {
database.into(database.objectMediaItems).insert( await database.into(database.objectMediaItems).insert(
ObjectMediaItemsCompanion.insert( ObjectMediaItemsCompanion.insert(
objectId: sessionId, objectId: sessionId,
mediaId: mediaId, mediaId: mediaId,
@ -157,4 +153,4 @@ Future<void> seedDb() async {
} }
}); });
} }
} }

10
lib/widgets/session_view_achievements.dart
View File

@ -26,12 +26,12 @@ class SessionViewAchievements extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FutureBuilder<List<SessionActivity>>( return FutureBuilder<List<SessionActivity>>(
future: SessionActivitiesDao(Provider.of<AppDatabase>(context)).sessionActivitiesBySessionId(session.id), future: SessionActivitiesDao(Provider.of<AppDatabase>(context))
.sessionActivitiesBySessionId(session.id),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasData) { if (snapshot.hasData) {
final sessionActivities = snapshot.data!; final sessionActivities = snapshot.data!;
final achievements = getAchievements(sessionActivities); final achievements = getAchievements(sessionActivities);
// database.close();
return Column( return Column(
children: [ children: [
@ -58,8 +58,10 @@ class SessionViewAchievements extends StatelessWidget {
], ],
); );
} else { } else {
return Padding(padding: EdgeInsets.all(15), child:CircularProgressIndicator()); return Padding(
padding: EdgeInsets.all(15),
child: CircularProgressIndicator());
} }
}); });
} }
} }

11
lib/widgets/session_view_media.dart
View File

@ -12,11 +12,12 @@ class SessionViewMedia extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FutureBuilder<List<MediaItem>>( return FutureBuilder<List<MediaItem>>(
future: MediaItemsDao(Provider.of<AppDatabase>(context)).mediaItemsFromSession(session), future: MediaItemsDao(Provider.of<AppDatabase>(context))
.mediaItemsFromSession(session),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasData) { if (snapshot.hasData) {
final mediaItems = snapshot.data!; final mediaItems = snapshot.data!;
// database.close();
List<Widget> mediaCards = List.generate( List<Widget> mediaCards = List.generate(
mediaItems.length, (i) => MediaCard(media: mediaItems[i])); mediaItems.length, (i) => MediaCard(media: mediaItems[i]));
@ -35,8 +36,10 @@ class SessionViewMedia extends StatelessWidget {
], ],
); );
} else { } else {
return Padding(padding: EdgeInsets.all(15), child:CircularProgressIndicator()); return Padding(
padding: EdgeInsets.all(15),
child: CircularProgressIndicator());
} }
}); });
} }
} }

184
test/drift/sendtrain/migration_test.dart
View File

@ -1,104 +1,104 @@
// dart format width=80 // // dart format width=80
// ignore_for_file: unused_local_variable, unused_import // // ignore_for_file: unused_local_variable, unused_import
import 'package:drift/drift.dart'; // import 'package:drift/drift.dart';
import 'package:drift_dev/api/migrations_native.dart'; // import 'package:drift_dev/api/migrations_native.dart';
import 'package:sendtrain/database/database.dart'; // import 'package:sendtrain/database/database.dart';
import 'package:test/test.dart'; // import 'package:test/test.dart';
import 'generated/schema.dart'; // import 'generated/schema.dart';
import 'generated/schema_v1.dart' as v1; // import 'generated/schema_v1.dart' as v1;
import 'generated/schema_v2.dart' as v2; // import 'generated/schema_v2.dart' as v2;
void main() { // void main() {
driftRuntimeOptions.dontWarnAboutMultipleDatabases = true; // driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
late SchemaVerifier verifier; // late SchemaVerifier verifier;
setUpAll(() { // setUpAll(() {
verifier = SchemaVerifier(GeneratedHelper()); // verifier = SchemaVerifier(GeneratedHelper());
}); // });
group('simple database migrations', () { // group('simple database migrations', () {
// These simple tests verify all possible schema updates with a simple (no // // These simple tests verify all possible schema updates with a simple (no
// data) migration. This is a quick way to ensure that written database // // data) migration. This is a quick way to ensure that written database
// migrations properly alter the schema. // // migrations properly alter the schema.
final versions = GeneratedHelper.versions; // final versions = GeneratedHelper.versions;
for (final (i, fromVersion) in versions.indexed) { // for (final (i, fromVersion) in versions.indexed) {
group('from $fromVersion', () { // group('from $fromVersion', () {
for (final toVersion in versions.skip(i + 1)) { // for (final toVersion in versions.skip(i + 1)) {
test('to $toVersion', () async { // test('to $toVersion', () async {
final schema = await verifier.schemaAt(fromVersion); // final schema = await verifier.schemaAt(fromVersion);
final db = AppDatabase(schema.newConnection()); // final db = AppDatabase(schema.newConnection());
await verifier.migrateAndValidate(db, toVersion); // await verifier.migrateAndValidate(db, toVersion);
await db.close(); // await db.close();
}); // });
} // }
}); // });
} // }
}); // });
// The following template shows how to write tests ensuring your migrations // // The following template shows how to write tests ensuring your migrations
// preserve existing data. // // preserve existing data.
// Testing this can be useful for migrations that change existing columns // // Testing this can be useful for migrations that change existing columns
// (e.g. by alterating their type or constraints). Migrations that only add // // (e.g. by alterating their type or constraints). Migrations that only add
// tables or columns typically don't need these advanced tests. For more // // tables or columns typically don't need these advanced tests. For more
// information, see https://drift.simonbinder.eu/migrations/tests/#verifying-data-integrity // // information, see https://drift.simonbinder.eu/migrations/tests/#verifying-data-integrity
// TODO: This generated template shows how these tests could be written. Adopt // // TODO: This generated template shows how these tests could be written. Adopt
// it to your own needs when testing migrations with data integrity. // // it to your own needs when testing migrations with data integrity.
test("migration from v1 to v2 does not corrupt data", () async { // test("migration from v1 to v2 does not corrupt data", () async {
// Add data to insert into the old database, and the expected rows after the // // Add data to insert into the old database, and the expected rows after the
// migration. // // migration.
// TODO: Fill these lists // // TODO: Fill these lists
final oldSessionsData = <v1.SessionsData>[]; // final oldSessionsData = <v1.SessionsData>[];
final expectedNewSessionsData = <v2.SessionsData>[]; // final expectedNewSessionsData = <v2.SessionsData>[];
final oldActivitiesData = <v1.ActivitiesData>[]; // final oldActivitiesData = <v1.ActivitiesData>[];
final expectedNewActivitiesData = <v2.ActivitiesData>[]; // final expectedNewActivitiesData = <v2.ActivitiesData>[];
final oldSessionActivitiesData = <v1.SessionActivitiesData>[]; // final oldSessionActivitiesData = <v1.SessionActivitiesData>[];
final expectedNewSessionActivitiesData = <v2.SessionActivitiesData>[]; // final expectedNewSessionActivitiesData = <v2.SessionActivitiesData>[];
final oldActionsData = <v1.ActionsData>[]; // final oldActionsData = <v1.ActionsData>[];
final expectedNewActionsData = <v2.ActionsData>[]; // final expectedNewActionsData = <v2.ActionsData>[];
final oldActivityActionsData = <v1.ActivityActionsData>[]; // final oldActivityActionsData = <v1.ActivityActionsData>[];
final expectedNewActivityActionsData = <v2.ActivityActionsData>[]; // final expectedNewActivityActionsData = <v2.ActivityActionsData>[];
final oldMediaItemsData = <v1.MediaItemsData>[]; // final oldMediaItemsData = <v1.MediaItemsData>[];
final expectedNewMediaItemsData = <v2.MediaItemsData>[]; // final expectedNewMediaItemsData = <v2.MediaItemsData>[];
final oldObjectMediaItemsData = <v1.ObjectMediaItemsData>[]; // final oldObjectMediaItemsData = <v1.ObjectMediaItemsData>[];
final expectedNewObjectMediaItemsData = <v2.ObjectMediaItemsData>[]; // final expectedNewObjectMediaItemsData = <v2.ObjectMediaItemsData>[];
await verifier.testWithDataIntegrity( // await verifier.testWithDataIntegrity(
oldVersion: 1, // oldVersion: 1,
newVersion: 2, // newVersion: 2,
createOld: v1.DatabaseAtV1.new, // createOld: v1.DatabaseAtV1.new,
createNew: v2.DatabaseAtV2.new, // createNew: v2.DatabaseAtV2.new,
openTestedDatabase: AppDatabase.new, // openTestedDatabase: AppDatabase.new,
createItems: (batch, oldDb) { // createItems: (batch, oldDb) {
batch.insertAll(oldDb.sessions, oldSessionsData); // batch.insertAll(oldDb.sessions, oldSessionsData);
batch.insertAll(oldDb.activities, oldActivitiesData); // batch.insertAll(oldDb.activities, oldActivitiesData);
batch.insertAll(oldDb.sessionActivities, oldSessionActivitiesData); // batch.insertAll(oldDb.sessionActivities, oldSessionActivitiesData);
batch.insertAll(oldDb.actions, oldActionsData); // batch.insertAll(oldDb.actions, oldActionsData);
batch.insertAll(oldDb.activityActions, oldActivityActionsData); // batch.insertAll(oldDb.activityActions, oldActivityActionsData);
batch.insertAll(oldDb.mediaItems, oldMediaItemsData); // batch.insertAll(oldDb.mediaItems, oldMediaItemsData);
batch.insertAll(oldDb.objectMediaItems, oldObjectMediaItemsData); // batch.insertAll(oldDb.objectMediaItems, oldObjectMediaItemsData);
}, // },
validateItems: (newDb) async { // validateItems: (newDb) async {
expect( // expect(
expectedNewSessionsData, await newDb.select(newDb.sessions).get()); // expectedNewSessionsData, await newDb.select(newDb.sessions).get());
expect(expectedNewActivitiesData, // expect(expectedNewActivitiesData,
await newDb.select(newDb.activities).get()); // await newDb.select(newDb.activities).get());
expect(expectedNewSessionActivitiesData, // expect(expectedNewSessionActivitiesData,
await newDb.select(newDb.sessionActivities).get()); // await newDb.select(newDb.sessionActivities).get());
expect(expectedNewActionsData, await newDb.select(newDb.actions).get()); // expect(expectedNewActionsData, await newDb.select(newDb.actions).get());
expect(expectedNewActivityActionsData, // expect(expectedNewActivityActionsData,
await newDb.select(newDb.activityActions).get()); // await newDb.select(newDb.activityActions).get());
expect(expectedNewMediaItemsData, // expect(expectedNewMediaItemsData,
await newDb.select(newDb.mediaItems).get()); // await newDb.select(newDb.mediaItems).get());
expect(expectedNewObjectMediaItemsData, // expect(expectedNewObjectMediaItemsData,
await newDb.select(newDb.objectMediaItems).get()); // await newDb.select(newDb.objectMediaItems).get());
}, // },
); // );
}); // });
} // }