Skip to content

Commit 34d10d2

Browse files
committed
use bang key
1 parent 23b758e commit 34d10d2

File tree

7 files changed

+33
-16
lines changed

7 files changed

+33
-16
lines changed

app/lib/features/bangs/data/database/daos/bang.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import 'package:weblibre/features/bangs/data/database/definitions.drift.dart';
2525
import 'package:weblibre/features/bangs/data/models/bang.dart';
2626
import 'package:weblibre/features/bangs/data/models/bang_data.dart';
2727
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
28+
import 'package:weblibre/features/bangs/data/models/bang_key.dart';
2829

2930
@DriftAccessor()
3031
class BangDao extends DatabaseAccessor<BangDatabase> with $BangDaoMixin {
@@ -110,11 +111,11 @@ class BangDao extends DatabaseAccessor<BangDatabase> with $BangDaoMixin {
110111
return selectable;
111112
}
112113

113-
Future<int> increaseBangFrequency(BangGroup group, String trigger) {
114+
Future<int> increaseBangFrequency(BangKey key) {
114115
return db.bangFrequency.insertOne(
115116
BangFrequencyCompanion.insert(
116-
trigger: trigger,
117-
group: group,
117+
trigger: key.trigger,
118+
group: key.group,
118119
frequency: 1,
119120
lastUsed: DateTime.now(),
120121
),

app/lib/features/bangs/domain/providers/search.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class BangSearch extends _$BangSearch {
3434
Future<Uri> triggerBangSearch(BangData bang, String searchQuery) async {
3535
final bangDataNotifier = ref.read(bangDataRepositoryProvider.notifier);
3636

37-
await bangDataNotifier.increaseFrequency(bang.group, bang.trigger);
37+
await bangDataNotifier.increaseFrequency(bang.toKey());
3838
await bangDataNotifier.addSearchEntry(
3939
bang.group,
4040
bang.trigger,

app/lib/features/bangs/domain/providers/search.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/features/bangs/domain/repositories/data.dart

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,8 @@ class BangDataRepository extends _$BangDataRepository {
106106
.watch();
107107
}
108108

109-
Future<void> increaseFrequency(BangGroup group, String trigger) {
110-
return ref
111-
.read(bangDatabaseProvider)
112-
.bangDao
113-
.increaseBangFrequency(group, trigger);
109+
Future<void> increaseFrequency(BangKey key) {
110+
return ref.read(bangDatabaseProvider).bangDao.increaseBangFrequency(key);
114111
}
115112

116113
Future<void> addSearchEntry(
@@ -149,7 +146,9 @@ class BangDataRepository extends _$BangDataRepository {
149146
return ref.read(bangDatabaseProvider).bangDao.upsertBang(bang);
150147
}
151148

152-
Future<void> deleteBang(BangGroup group, String trigger) {
153-
return ref.read(bangDatabaseProvider).syncDao.deleteBangs(group, [trigger]);
149+
Future<void> deleteBang(BangKey key) {
150+
return ref.read(bangDatabaseProvider).syncDao.deleteBangs(key.group, [
151+
key.trigger,
152+
]);
154153
}
155154
}

app/lib/features/bangs/domain/repositories/data.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/lib/features/bangs/presentation/screens/edit.dart

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
66
import 'package:nullability/nullability.dart';
77
import 'package:weblibre/features/bangs/data/models/bang.dart';
88
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
9+
import 'package:weblibre/features/bangs/data/models/bang_key.dart';
910
import 'package:weblibre/features/bangs/domain/providers/bangs.dart';
1011
import 'package:weblibre/features/bangs/domain/repositories/data.dart';
1112
import 'package:weblibre/utils/form_validators.dart';
@@ -64,7 +65,12 @@ class EditBangScreen extends HookConsumerWidget {
6465
initialBang!.trigger != bang.trigger) {
6566
await ref
6667
.read(bangDataRepositoryProvider.notifier)
67-
.deleteBang(BangGroup.user, initialBang!.trigger);
68+
.deleteBang(
69+
BangKey(
70+
group: BangGroup.user,
71+
trigger: initialBang!.trigger,
72+
),
73+
);
6874
}
6975

7076
await ref
@@ -288,7 +294,12 @@ class EditBangScreen extends HookConsumerWidget {
288294
if (result == true) {
289295
await ref
290296
.read(bangDataRepositoryProvider.notifier)
291-
.deleteBang(BangGroup.user, initialBang!.trigger);
297+
.deleteBang(
298+
BangKey(
299+
group: BangGroup.user,
300+
trigger: initialBang!.trigger,
301+
),
302+
);
292303

293304
if (context.mounted) {
294305
context.pop();

app/lib/features/bangs/presentation/screens/user.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flutter_slidable/flutter_slidable.dart';
55
import 'package:hooks_riverpod/hooks_riverpod.dart';
66
import 'package:weblibre/core/routing/routes.dart';
77
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
8+
import 'package:weblibre/features/bangs/data/models/bang_key.dart';
89
import 'package:weblibre/features/bangs/domain/providers/bangs.dart';
910
import 'package:weblibre/features/bangs/domain/repositories/data.dart';
1011
import 'package:weblibre/features/bangs/presentation/widgets/bang_details.dart';
@@ -35,7 +36,12 @@ class UserBangs extends HookConsumerWidget {
3536
onPressed: (context) async {
3637
await ref
3738
.read(bangDataRepositoryProvider.notifier)
38-
.deleteBang(BangGroup.user, bang.trigger);
39+
.deleteBang(
40+
BangKey(
41+
group: BangGroup.user,
42+
trigger: bang.trigger,
43+
),
44+
);
3945
},
4046
backgroundColor: Theme.of(
4147
context,

0 commit comments

Comments
 (0)