diff --git a/lib/content_views/accepted_jobs_page.dart b/lib/content_views/accepted_jobs_page.dart index f3f3e7f..c48a8b4 100644 --- a/lib/content_views/accepted_jobs_page.dart +++ b/lib/content_views/accepted_jobs_page.dart @@ -1,13 +1,13 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart' show DateFormat; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/tour_list_page.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; import '../main.dart'; import '../model/job.dart'; +import '../objectbox.g.dart'; import '../tools/constants.dart'; import '../tools/util.dart'; @@ -34,10 +34,11 @@ class _AcceptedJobsPageState extends State @override void initState() { Future.delayed(const Duration(seconds: 0), () async { - _jobs = await MyApp.isarInstance.jobs - .filter() - .stateEqualTo(Constants.stateAccepted) - .findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(Job_.state.equals(Constants.stateAccepted)).build(); + _jobs = query.find(); + query.close(); + _jobs.sort((job1, job2) { var date1 = DateTime.fromMillisecondsSinceEpoch(job1.ordertime * 1000, isUtc: true).millisecondsSinceEpoch; var date2 = DateTime.fromMillisecondsSinceEpoch(job2.ordertime * 1000, isUtc: true).millisecondsSinceEpoch; diff --git a/lib/content_views/approach_area_page.dart b/lib/content_views/approach_area_page.dart index fc5d9ed..7ed42a4 100644 --- a/lib/content_views/approach_area_page.dart +++ b/lib/content_views/approach_area_page.dart @@ -1,6 +1,5 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:flutter/material.dart'; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:stadtbote/main.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; @@ -38,7 +37,9 @@ class _ApproachAreaPageState extends State super.initState(); Future.delayed(const Duration(seconds: 0), () async { - _ranking = await MyApp.isarInstance.rankings.where().findFirst(); + final box = MyApp.objectBoxStore.box(); + final rankings = box.getAll(); + _ranking = rankings.isNotEmpty ? rankings.first : null; _initCompleted = true; @@ -224,7 +225,9 @@ class _ApproachAreaPageState extends State subscribe( queueId: Constants.messageTopicRankingUpdated, callback: (message) async { - _ranking = await MyApp.isarInstance.rankings.where().findFirst(); + final box = MyApp.objectBoxStore.box(); + final rankings = box.getAll(); + _ranking = rankings.isNotEmpty ? rankings.first : null; if (mounted) { setState(() {}); diff --git a/lib/content_views/assigned_jobs_page.dart b/lib/content_views/assigned_jobs_page.dart index fd706b5..49003bc 100644 --- a/lib/content_views/assigned_jobs_page.dart +++ b/lib/content_views/assigned_jobs_page.dart @@ -2,8 +2,8 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter/material.dart'; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; +import 'package:stadtbote/objectbox.g.dart'; import 'package:intl/intl.dart'; import 'package:badges/badges.dart' as badges; import 'package:stadtbote/messages/pop_content_view_message.dart'; @@ -82,7 +82,11 @@ class _AssignedJobsPageState extends State with ProducerMixin, } Future> _fetchState0Jobs() async { - return await MyApp.isarInstance.jobs.filter().stateEqualTo(Constants.stateAssigned).findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(Job_.state.equals(Constants.stateAssigned)).build(); + final jobs = query.find(); + query.close(); + return jobs; } List _createWidgets() { diff --git a/lib/content_views/finished_jobs_page.dart b/lib/content_views/finished_jobs_page.dart index df91250..324d97e 100644 --- a/lib/content_views/finished_jobs_page.dart +++ b/lib/content_views/finished_jobs_page.dart @@ -1,8 +1,8 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:flutter/material.dart'; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/tour_list_page.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; +import 'package:stadtbote/objectbox.g.dart'; import 'package:intl/intl.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; @@ -34,10 +34,10 @@ class _FinishedJobsPageState extends State @override void initState() { Future.delayed(const Duration(seconds: 0), () async { - _jobs = await MyApp.isarInstance.jobs - .filter() - .stateEqualTo(Constants.stateFinished) - .findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(Job_.state.equals(Constants.stateFinished)).build(); + _jobs = query.find(); + query.close(); _initCompleted = true; diff --git a/lib/content_views/main_page.dart b/lib/content_views/main_page.dart index c3e9820..8e9b4ea 100644 --- a/lib/content_views/main_page.dart +++ b/lib/content_views/main_page.dart @@ -1,8 +1,8 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:flutter/material.dart'; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/accepted_jobs_page.dart'; import 'package:stadtbote/content_views/approach_area_page.dart'; +import 'package:stadtbote/objectbox.g.dart'; import 'package:stadtbote/content_views/assigned_jobs_page.dart'; import 'package:stadtbote/content_views/finished_jobs_page.dart'; import 'package:stadtbote/content_views/messages_page.dart'; @@ -322,14 +322,19 @@ class _MainPageState extends State with ConsumerMixin, ProducerMixin { } void _refreshBadges() async { - _assignedJobsValueNotifier.value = - await MyApp.isarInstance.jobs.filter().stateEqualTo(0).count(); - _acceptedJobsValueNotifier.value = - await MyApp.isarInstance.jobs.filter().stateEqualTo(1).count(); - _messagesValueNotifier.value = await MyApp.isarInstance.chatMessages - .filter() - .readEqualTo(false) - .count(); + final jobBox = MyApp.objectBoxStore.box(); + final assignedQuery = jobBox.query(Job_.state.equals(0)).build(); + _assignedJobsValueNotifier.value = assignedQuery.count(); + assignedQuery.close(); + + final acceptedQuery = jobBox.query(Job_.state.equals(1)).build(); + _acceptedJobsValueNotifier.value = acceptedQuery.count(); + acceptedQuery.close(); + + final messageBox = MyApp.objectBoxStore.box(); + final messageQuery = messageBox.query(ChatMessage_.read.equals(false)).build(); + _messagesValueNotifier.value = messageQuery.count(); + messageQuery.close(); } void _jobReceived(Job job) { @@ -512,10 +517,9 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ConsumerMixin { child: FittedBox( child: GestureDetector( onTap: () async { - var sessionStatus = await MyApp - .isarInstance.sessionStatus - .where() - .findFirst(); + final box = MyApp.objectBoxStore.box(); + final sessions = box.getAll(); + var sessionStatus = sessions.isNotEmpty ? sessions.first : null; showInfosPopup(sessionStatus); }, @@ -643,9 +647,13 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ConsumerMixin { } _updateHeader() async { - var status = await MyApp.isarInstance.locationStatus.where().findFirst(); - var sessionStatus = - await MyApp.isarInstance.sessionStatus.where().findFirst(); + final locationBox = MyApp.objectBoxStore.box(); + final locations = locationBox.getAll(); + var status = locations.isNotEmpty ? locations.first : null; + + final sessionBox = MyApp.objectBoxStore.box(); + final sessions = sessionBox.getAll(); + var sessionStatus = sessions.isNotEmpty ? sessions.first : null; if (status != null) { _zipValueNotifier.value = status.zip; @@ -664,7 +672,9 @@ class _HeaderWidgetState extends State<_HeaderWidget> with ConsumerMixin { /* rightButtonImage: Util.fetchFutureIcon(const Icon(Icons.info_outline, size: 20.0, color: Colors.white)), rightButtonOnPressed: () async { - showInfosPopup(await MyApp.isarInstance.sessionStatus.where().findFirst()); + final box = MyApp.objectBoxStore.box(); + final sessions = box.getAll(); + showInfosPopup(sessions.isNotEmpty ? sessions.first : null); }); */ } diff --git a/lib/content_views/messages_page.dart b/lib/content_views/messages_page.dart index 5a0abc6..d75ee65 100644 --- a/lib/content_views/messages_page.dart +++ b/lib/content_views/messages_page.dart @@ -2,13 +2,12 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:flutter/material.dart'; import 'package:flutter_chat_ui/flutter_chat_ui.dart'; import 'package:flutter_chat_types/flutter_chat_types.dart' as types; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:stadtbote/main.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; import 'package:stadtbote/model/chat_message.dart' as sbmessage; -import 'package:stadtbote/model/chat_message.dart'; import 'package:stadtbote/model/session_status.dart'; +import 'package:stadtbote/objectbox.g.dart'; import 'package:stadtbote/network_messages/messages_showed.dart'; import 'package:stadtbote/tools/constants.dart'; import 'package:stadtbote/tools/messages/publish_payload_message.dart'; @@ -49,7 +48,9 @@ class _MessagesPageState extends State with ProducerMixin { super.initState(); Future.delayed(const Duration(seconds: 0), () async { - var status = await MyApp.isarInstance.sessionStatus.where().findFirst(); + final box = MyApp.objectBoxStore.box(); + final sessions = box.getAll(); + var status = sessions.isNotEmpty ? sessions.first : null; _sid = status != null ? status.sid : 'Unbekannt'; _sendMessagesReadMessage(); @@ -97,9 +98,8 @@ class _MessagesPageState extends State with ProducerMixin { message.read = true; message.id = await sbmessage.ChatMessage.getNextId(); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.chatMessages.put(message); - }); + final box = MyApp.objectBoxStore.box(); + box.put(message); sendMessage( routingKey: Constants.messageTopicPublishPayload, @@ -124,7 +124,9 @@ class _MessagesPageState extends State with ProducerMixin { Future _fetchMessages() async { _messages.clear(); - var messages = await MyApp.isarInstance.chatMessages.where().findAll(); + final box = MyApp.objectBoxStore.box(); + var messages = box.getAll(); + for (var message in messages) { _messages.add(types.TextMessage( author: message.from == _sid ? _user : _central, @@ -136,9 +138,7 @@ class _MessagesPageState extends State with ProducerMixin { _messages.sort((a, b) => b.createdAt! > a.createdAt! ? 1 : 0); message.read = true; - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.chatMessages.put(message); - }); + box.put(message); } setState(() {}); @@ -177,13 +177,8 @@ class _MessagesPageState extends State with ProducerMixin { child: getDefaultButton( 'Ja', () async => { - await MyApp.isarInstance.writeTxn( - () async => { - await MyApp.isarInstance - .chatMessages - .delete(int.parse( - message.id)) - }), + MyApp.objectBoxStore.box() + .remove(int.parse(message.id)), _fetchMessages(), setState(() {}), Navigator.of(MyApp.appNavigatorKey @@ -201,10 +196,10 @@ class _MessagesPageState extends State with ProducerMixin { } void _sendMessagesReadMessage() async { - var unreadChatMessages = await MyApp.isarInstance.chatMessages - .filter() - .readEqualTo(false) - .findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(ChatMessage_.read.equals(false)).build(); + var unreadChatMessages = query.find(); + query.close(); if (unreadChatMessages.isNotEmpty) { List chatMessageIds = []; diff --git a/lib/content_views/task_list_page.dart b/lib/content_views/task_list_page.dart index a4bdae9..f56a655 100644 --- a/lib/content_views/task_list_page.dart +++ b/lib/content_views/task_list_page.dart @@ -4,12 +4,12 @@ import 'package:dart_mq/dart_mq.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; -import 'package:isar/isar.dart'; import 'package:stadtbote/content_views/utils/content_view_widget.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; import 'package:stadtbote/model/job.dart'; import 'package:stadtbote/model/job_tour.dart'; import 'package:stadtbote/model/pictures.dart'; +import 'package:stadtbote/objectbox.g.dart'; import 'package:stadtbote/network_messages/accept_job_message.dart'; import 'package:stadtbote/network_messages/fin_task_message.dart'; import 'package:stadtbote/network_messages/fin_tour_message.dart'; @@ -116,7 +116,7 @@ class _TaskListPageState extends State with ProducerMixin { var textColor = isTaskActive(i) ? Colors.black : const Color(0x33000000); - var optional = taskInfo.task.opt != null && taskInfo.task.opt == true; + var optional = (taskInfo.task?.opt ?? false) == true; steps.add( ListTile( minVerticalPadding: 0, @@ -159,7 +159,7 @@ class _TaskListPageState extends State with ProducerMixin { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - taskInfo.task.topic + (optional ? "" : " *"), + (taskInfo.task?.topic ?? '') + (optional ? "" : " *"), textAlign: TextAlign.left, style: TextStyle( color: textColor, @@ -200,7 +200,10 @@ class _TaskListPageState extends State with ProducerMixin { List taskList = []; for(var task in widget.tour.tasks!) { - var taskInfo = await MyApp.isarInstance.taskInfos.filter().sIdEqualTo(task.sId).findFirst(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(TaskInfo_.sId.equals(task.sId)).build(); + var taskInfo = query.findFirst(); + query.close(); if (taskInfo == null) { taskInfo = TaskInfo(); taskInfo.id = await TaskInfo.getNextId(); @@ -218,7 +221,7 @@ class _TaskListPageState extends State with ProducerMixin { } void _processTask(TaskInfo taskInfo) { - switch(taskInfo.task.type) { + switch(taskInfo.task?.type ?? 0) { case 2: _processSignature(taskInfo); break; @@ -255,7 +258,7 @@ class _TaskListPageState extends State with ProducerMixin { } _processTaskArrivedOrFinished(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); if (!mounted) return; final currentContext = context; @@ -279,7 +282,7 @@ class _TaskListPageState extends State with ProducerMixin { } _processCommissionNumber(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); if (!mounted) return; final currentContext = context; @@ -302,7 +305,7 @@ class _TaskListPageState extends State with ProducerMixin { } /*_processScanBarcodes(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); showScanBarcodesPopup(context, taskInfo, (List barcodes) async { var answer = await _createAnswerHeader(taskInfo); @@ -322,25 +325,30 @@ class _TaskListPageState extends State with ProducerMixin { }*/ _processTakePhotos(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); if (!mounted) return; final currentContext = context; showTakePhotosPopup(currentContext, taskInfo, (List? photos) async { if (photos != null) { - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.pictures.filter().tourIdEqualTo(widget.tour.id).deleteAll(); + final box = MyApp.objectBoxStore.box(); - for (int i = 0; i < photos.length; i++) { - var pictureData = photos[i]; + // Delete existing pictures for this tour + final query = box.query(Picture_.tourId.equals(widget.tour.id)).build(); + final existingPictures = query.find(); + query.close(); + box.removeMany(existingPictures.map((e) => e.id).toList()); - var picture = Picture(); - picture.number = i; - picture.tourId = widget.tour.id; - picture.data = base64Encode(pictureData); - await MyApp.isarInstance.pictures.put(picture); - } - }); + // Add new pictures + for (int i = 0; i < photos.length; i++) { + var pictureData = photos[i]; + + var picture = Picture(); + picture.number = i; + picture.tourId = widget.tour.id; + picture.data = base64Encode(pictureData); + box.put(picture); + } taskInfo.additionalText = "Fotos aufgenommen"; taskInfo.completed = true; @@ -355,7 +363,7 @@ class _TaskListPageState extends State with ProducerMixin { } void _processStationNotice(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); if (!mounted) return; final currentContext = context; @@ -376,7 +384,7 @@ class _TaskListPageState extends State with ProducerMixin { } void _processReceiptGiver(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); if (!mounted) return; final currentContext = context; @@ -398,7 +406,7 @@ class _TaskListPageState extends State with ProducerMixin { } void _processPickupDeliveryStatusTask(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); Future.delayed(const Duration(seconds: 1), () async { if (!context.mounted) return; @@ -421,7 +429,7 @@ class _TaskListPageState extends State with ProducerMixin { } void _processSignature(TaskInfo taskInfo) { - Util.logInfo('Task ${taskInfo.task.sId} called'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} called'); MyApp.suppressAcceptDialog = true; @@ -456,27 +464,26 @@ class _TaskListPageState extends State with ProducerMixin { } _finishTaskProcessing(TaskInfo taskInfo) async { - Util.logInfo('Task ${taskInfo.task.sId} finished'); + Util.logInfo('Task ${taskInfo.task?.sId ?? 0} finished'); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.taskInfos.put(taskInfo); - }); + final box = MyApp.objectBoxStore.box(); + box.put(taskInfo); } bool isTaskActive(int index) { if (!widget.readOnly) { var currentTaskInfo = _taskList[index]; - if (currentTaskInfo.completed && !currentTaskInfo.task.reenter!) return false; + if (currentTaskInfo.completed && !(currentTaskInfo.task?.reenter ?? false)) return false; for (var taskInfo in _taskList) { if (taskInfo == currentTaskInfo) break; - if (!taskInfo.task.opt! && !taskInfo.completed) return false; + if (!(taskInfo.task?.opt ?? false) && !taskInfo.completed) return false; } - if (currentTaskInfo.task.reenter!) return true; + if (currentTaskInfo.task?.reenter ?? false) return true; return true; } @@ -488,7 +495,7 @@ class _TaskListPageState extends State with ProducerMixin { var message = FinTask(); message.trId = widget.tour.id; message.task = Task(); - message.task.sId = taskInfo.task.sId; + message.task.sId = taskInfo.task?.sId ?? 0; message.task.time = Util.nowUnixSecondsUtc(); var position = await MyApp.getCurrentPosition(); @@ -511,7 +518,7 @@ class _TaskListPageState extends State with ProducerMixin { var position = await MyApp.getCurrentPosition(); var finTourTask = FinTourTask(); - finTourTask.sId = taskInfo.task.sId; + finTourTask.sId = taskInfo.task?.sId ?? 0; finTourTask.time = Util.nowUnixSecondsUtc(); if (position != null) { finTourTask.pos = FinTaskPos(); @@ -557,9 +564,8 @@ class _TaskListPageState extends State with ProducerMixin { widget.tour.state = Constants.stateFinishedNotConfirmed; - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.jobs.put(widget.job); - }); + final jobBox = MyApp.objectBoxStore.box(); + jobBox.put(widget.job); _sendImages(); @@ -568,7 +574,10 @@ class _TaskListPageState extends State with ProducerMixin { _sendImages() { Future.delayed(const Duration(seconds: 1), () async { - var pictures = await MyApp.isarInstance.pictures.where().filter().tourIdEqualTo(widget.tour.id).findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(Picture_.tourId.equals(widget.tour.id)).build(); + var pictures = query.find(); + query.close(); if (pictures.isNotEmpty) { for (var picture in pictures) { @@ -583,9 +592,8 @@ class _TaskListPageState extends State with ProducerMixin { payload: PublishPayloadMessage(topic: "pic", message: message.toJson(), acknowledgeRequired: true), ); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.pictures.delete(picture.id); - }); + final box = MyApp.objectBoxStore.box(); + box.remove(picture.id); } } }); @@ -604,9 +612,8 @@ class _TaskListPageState extends State with ProducerMixin { if (jobFinished) { widget.job.state = 2; - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.jobs.put(widget.job); - }); + final box = MyApp.objectBoxStore.box(); + box.put(widget.job); } } } diff --git a/lib/main.dart b/lib/main.dart index 6119ba9..2f3b217 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,20 +5,12 @@ import 'package:synchronized/synchronized.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:geolocator/geolocator.dart'; -import 'package:isar/isar.dart'; import 'package:path_provider/path_provider.dart'; import 'package:shared_map/shared_map.dart'; import 'package:stadtbote/messages/pop_content_view_message.dart'; -import 'package:stadtbote/model/enqueued_message.dart'; import 'package:stadtbote/model/log_entry.dart'; -import 'package:stadtbote/model/chat_message.dart'; -import 'package:stadtbote/model/pictures.dart'; -import 'package:stadtbote/model/rank.dart'; -import 'package:stadtbote/model/location_status.dart'; -import 'package:stadtbote/model/task_info.dart'; import 'package:stadtbote/popups/accept_jobs_popup.dart'; import 'package:stadtbote/tools/colored_safe_area.dart'; -import 'package:stadtbote/model/session_status.dart'; import 'package:stadtbote/tools/connection_status.dart'; import 'package:stadtbote/tools/messages/job_deleted_message.dart'; import 'package:stadtbote/tools/messages/job_received_message.dart'; @@ -31,6 +23,7 @@ import 'content_views/main_page.dart'; import 'content_views/utils/content_view_widget.dart'; import 'content_views/utils/widget_stack.dart'; import 'model/job.dart'; +import 'objectbox.g.dart'; import 'tools/constants.dart'; import 'tools/util.dart'; @@ -62,17 +55,7 @@ Future main() async { MQClient.instance.declareQueue(Constants.messageTopicBWVEnabled); final dir = await getApplicationDocumentsDirectory(); - MyApp.isarInstance = await Isar.open([ - SessionStatusSchema, - LocationStatusSchema, - JobSchema, - TaskInfoSchema, - ChatMessageSchema, - EnqueuedMessageSchema, - LogEntrySchema, - RankingSchema, - PictureSchema - ], directory: dir.path, name: "database_v1"); + MyApp.objectBoxStore = await openStore(directory: dir.path); await _clearLog(); @@ -85,9 +68,12 @@ Future main() async { Future _clearLog() async { var dateTime = DateTime.now().add(const Duration(days: -7)); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.logEntrys.where().filter().timeLessThan(dateTime).deleteAll(); - }); + final box = MyApp.objectBoxStore.box(); + final query = box.query(LogEntry_.time.lessThan(dateTime.millisecondsSinceEpoch)).build(); + final oldEntries = query.find(); + query.close(); + + box.removeMany(oldEntries.map((e) => e.id).toList()); } void _traceUncaughtExceptions(Object error, StackTrace stackTrace) { @@ -100,7 +86,7 @@ class MyApp extends StatefulWidget { static final appNavigatorKey = GlobalKey(); - static late Isar isarInstance; + static late Store objectBoxStore; static Position? _currentPosition; static final Lock _positionLock = Lock(); @@ -394,12 +380,11 @@ class _MainState extends State
with SingleTickerProviderStateMixin, Produc callback: (message) async { var removeJobMessage = message.payload as RemoveJobMessage; - var job = await MyApp.isarInstance.jobs.where().filter().idEqualTo(removeJobMessage.id).findFirst(); + final box = MyApp.objectBoxStore.box(); + var job = box.get(removeJobMessage.id); if (job != null) { - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.jobs.where().filter().idEqualTo(removeJobMessage.id).deleteAll(); - }); + box.remove(removeJobMessage.id); sendMessage( routingKey: Constants.messageTopicJobDeleted, diff --git a/lib/model/chat_message.dart b/lib/model/chat_message.dart index 170c209..d6d598d 100644 --- a/lib/model/chat_message.dart +++ b/lib/model/chat_message.dart @@ -1,14 +1,11 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; +import 'package:objectbox/objectbox.dart'; import 'package:stadtbote/main.dart'; import 'package:stadtbote/tools/util.dart'; -part 'chat_message.g.dart'; - -@collection -@JsonSerializable() +@Entity() class ChatMessage { - late Id id; + @Id() + int id = 0; late int time; @@ -18,16 +15,34 @@ class ChatMessage { late String text; - late bool? read = false; + bool read = false; ChatMessage(); - factory ChatMessage.fromJson(Map json) => _$ChatMessageFromJson(json); + factory ChatMessage.fromJson(Map json) { + final message = ChatMessage(); + message.id = json['id'] as int? ?? 0; + message.time = json['time'] as int; + message.from = json['from'] as String; + message.subj = json['subj'] as String; + message.text = json['text'] as String; + message.read = json['read'] as bool? ?? false; + return message; + } - Map toJson() => _$ChatMessageToJson(this); + Map toJson() { + return { + 'id': id, + 'time': time, + 'from': from, + 'subj': subj, + 'text': text, + 'read': read, + }; + } static Future mergeFromJson(Map json) async { - var availableMessage = await MyApp.isarInstance.chatMessages.filter().idEqualTo(json["id"]).findFirst(); + var availableMessage = MyApp.objectBoxStore.box().get(json["id"] as int); if (availableMessage != null) { availableMessage.id = json["id"]; diff --git a/lib/model/chat_message.g.dart b/lib/model/chat_message.g.dart deleted file mode 100644 index 4955cf1..0000000 --- a/lib/model/chat_message.g.dart +++ /dev/null @@ -1,982 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'chat_message.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetChatMessageCollection on Isar { - IsarCollection get chatMessages => this.collection(); -} - -const ChatMessageSchema = CollectionSchema( - name: r'ChatMessage', - id: 35366979330584919, - properties: { - r'from': PropertySchema( - id: 0, - name: r'from', - type: IsarType.string, - ), - r'read': PropertySchema( - id: 1, - name: r'read', - type: IsarType.bool, - ), - r'subj': PropertySchema( - id: 2, - name: r'subj', - type: IsarType.string, - ), - r'text': PropertySchema( - id: 3, - name: r'text', - type: IsarType.string, - ), - r'time': PropertySchema( - id: 4, - name: r'time', - type: IsarType.long, - ) - }, - estimateSize: _chatMessageEstimateSize, - serialize: _chatMessageSerialize, - deserialize: _chatMessageDeserialize, - deserializeProp: _chatMessageDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _chatMessageGetId, - getLinks: _chatMessageGetLinks, - attach: _chatMessageAttach, - version: '3.1.8', -); - -int _chatMessageEstimateSize( - ChatMessage object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.from.length * 3; - bytesCount += 3 + object.subj.length * 3; - bytesCount += 3 + object.text.length * 3; - return bytesCount; -} - -void _chatMessageSerialize( - ChatMessage object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.from); - writer.writeBool(offsets[1], object.read); - writer.writeString(offsets[2], object.subj); - writer.writeString(offsets[3], object.text); - writer.writeLong(offsets[4], object.time); -} - -ChatMessage _chatMessageDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = ChatMessage(); - object.from = reader.readString(offsets[0]); - object.id = id; - object.read = reader.readBoolOrNull(offsets[1]); - object.subj = reader.readString(offsets[2]); - object.text = reader.readString(offsets[3]); - object.time = reader.readLong(offsets[4]); - return object; -} - -P _chatMessageDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - case 1: - return (reader.readBoolOrNull(offset)) as P; - case 2: - return (reader.readString(offset)) as P; - case 3: - return (reader.readString(offset)) as P; - case 4: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _chatMessageGetId(ChatMessage object) { - return object.id; -} - -List> _chatMessageGetLinks(ChatMessage object) { - return []; -} - -void _chatMessageAttach( - IsarCollection col, Id id, ChatMessage object) { - object.id = id; -} - -extension ChatMessageQueryWhereSort - on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension ChatMessageQueryWhere - on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension ChatMessageQueryFilter - on QueryBuilder { - QueryBuilder fromEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'from', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'from', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'from', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'from', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'from', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'from', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'from', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'from', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder fromIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'from', - value: '', - )); - }); - } - - QueryBuilder - fromIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'from', - value: '', - )); - }); - } - - QueryBuilder idEqualTo( - Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder readIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'read', - )); - }); - } - - QueryBuilder - readIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'read', - )); - }); - } - - QueryBuilder readEqualTo( - bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'read', - value: value, - )); - }); - } - - QueryBuilder subjEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'subj', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'subj', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'subj', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'subj', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'subj', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'subj', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'subj', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'subj', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder subjIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'subj', - value: '', - )); - }); - } - - QueryBuilder - subjIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'subj', - value: '', - )); - }); - } - - QueryBuilder textEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'text', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'text', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'text', - value: '', - )); - }); - } - - QueryBuilder - textIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'text', - value: '', - )); - }); - } - - QueryBuilder timeEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'time', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension ChatMessageQueryObject - on QueryBuilder {} - -extension ChatMessageQueryLinks - on QueryBuilder {} - -extension ChatMessageQuerySortBy - on QueryBuilder { - QueryBuilder sortByFrom() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'from', Sort.asc); - }); - } - - QueryBuilder sortByFromDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'from', Sort.desc); - }); - } - - QueryBuilder sortByRead() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'read', Sort.asc); - }); - } - - QueryBuilder sortByReadDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'read', Sort.desc); - }); - } - - QueryBuilder sortBySubj() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'subj', Sort.asc); - }); - } - - QueryBuilder sortBySubjDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'subj', Sort.desc); - }); - } - - QueryBuilder sortByText() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.asc); - }); - } - - QueryBuilder sortByTextDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.desc); - }); - } - - QueryBuilder sortByTime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.asc); - }); - } - - QueryBuilder sortByTimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.desc); - }); - } -} - -extension ChatMessageQuerySortThenBy - on QueryBuilder { - QueryBuilder thenByFrom() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'from', Sort.asc); - }); - } - - QueryBuilder thenByFromDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'from', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenByRead() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'read', Sort.asc); - }); - } - - QueryBuilder thenByReadDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'read', Sort.desc); - }); - } - - QueryBuilder thenBySubj() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'subj', Sort.asc); - }); - } - - QueryBuilder thenBySubjDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'subj', Sort.desc); - }); - } - - QueryBuilder thenByText() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.asc); - }); - } - - QueryBuilder thenByTextDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.desc); - }); - } - - QueryBuilder thenByTime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.asc); - }); - } - - QueryBuilder thenByTimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.desc); - }); - } -} - -extension ChatMessageQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByFrom( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'from', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByRead() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'read'); - }); - } - - QueryBuilder distinctBySubj( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'subj', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByText( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'text', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByTime() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'time'); - }); - } -} - -extension ChatMessageQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder fromProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'from'); - }); - } - - QueryBuilder readProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'read'); - }); - } - - QueryBuilder subjProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'subj'); - }); - } - - QueryBuilder textProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'text'); - }); - } - - QueryBuilder timeProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'time'); - }); - } -} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -ChatMessage _$ChatMessageFromJson(Map json) => ChatMessage() - ..id = (json['id'] as num).toInt() - ..time = (json['time'] as num).toInt() - ..from = json['from'] as String - ..subj = json['subj'] as String - ..text = json['text'] as String - ..read = json['read'] as bool?; - -Map _$ChatMessageToJson(ChatMessage instance) => - { - 'id': instance.id, - 'time': instance.time, - 'from': instance.from, - 'subj': instance.subj, - 'text': instance.text, - 'read': instance.read, - }; diff --git a/lib/model/enqueued_message.dart b/lib/model/enqueued_message.dart index 4a23f4c..ae0362b 100644 --- a/lib/model/enqueued_message.dart +++ b/lib/model/enqueued_message.dart @@ -1,10 +1,9 @@ -import 'package:isar/isar.dart'; +import 'package:objectbox/objectbox.dart'; -part 'enqueued_message.g.dart'; - -@collection +@Entity() class EnqueuedMessage { - Id id = DateTime.now().millisecondsSinceEpoch; + @Id() + int id = 0; late String messageId; @@ -12,6 +11,6 @@ class EnqueuedMessage { late String payload; - EnqueuedMessage({required this.messageId}); + EnqueuedMessage(); } diff --git a/lib/model/enqueued_message.g.dart b/lib/model/enqueued_message.g.dart deleted file mode 100644 index f919508..0000000 --- a/lib/model/enqueued_message.g.dart +++ /dev/null @@ -1,819 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'enqueued_message.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetEnqueuedMessageCollection on Isar { - IsarCollection get enqueuedMessages => this.collection(); -} - -const EnqueuedMessageSchema = CollectionSchema( - name: r'EnqueuedMessage', - id: 884922652682878785, - properties: { - r'messageId': PropertySchema( - id: 0, - name: r'messageId', - type: IsarType.string, - ), - r'payload': PropertySchema( - id: 1, - name: r'payload', - type: IsarType.string, - ), - r'topic': PropertySchema( - id: 2, - name: r'topic', - type: IsarType.string, - ) - }, - estimateSize: _enqueuedMessageEstimateSize, - serialize: _enqueuedMessageSerialize, - deserialize: _enqueuedMessageDeserialize, - deserializeProp: _enqueuedMessageDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _enqueuedMessageGetId, - getLinks: _enqueuedMessageGetLinks, - attach: _enqueuedMessageAttach, - version: '3.1.8', -); - -int _enqueuedMessageEstimateSize( - EnqueuedMessage object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.messageId.length * 3; - bytesCount += 3 + object.payload.length * 3; - bytesCount += 3 + object.topic.length * 3; - return bytesCount; -} - -void _enqueuedMessageSerialize( - EnqueuedMessage object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.messageId); - writer.writeString(offsets[1], object.payload); - writer.writeString(offsets[2], object.topic); -} - -EnqueuedMessage _enqueuedMessageDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = EnqueuedMessage( - messageId: reader.readString(offsets[0]), - ); - object.id = id; - object.payload = reader.readString(offsets[1]); - object.topic = reader.readString(offsets[2]); - return object; -} - -P _enqueuedMessageDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - case 1: - return (reader.readString(offset)) as P; - case 2: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _enqueuedMessageGetId(EnqueuedMessage object) { - return object.id; -} - -List> _enqueuedMessageGetLinks(EnqueuedMessage object) { - return []; -} - -void _enqueuedMessageAttach( - IsarCollection col, Id id, EnqueuedMessage object) { - object.id = id; -} - -extension EnqueuedMessageQueryWhereSort - on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension EnqueuedMessageQueryWhere - on QueryBuilder { - QueryBuilder idEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder - idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder - idGreaterThan(Id id, {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan( - Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension EnqueuedMessageQueryFilter - on QueryBuilder { - QueryBuilder - idEqualTo(Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - messageIdEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'messageId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'messageId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'messageId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'messageId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'messageId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'messageId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'messageId', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'messageId', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - messageIdIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'messageId', - value: '', - )); - }); - } - - QueryBuilder - messageIdIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'messageId', - value: '', - )); - }); - } - - QueryBuilder - payloadEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'payload', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'payload', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'payload', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'payload', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'payload', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'payload', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'payload', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'payload', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - payloadIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'payload', - value: '', - )); - }); - } - - QueryBuilder - payloadIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'payload', - value: '', - )); - }); - } - - QueryBuilder - topicEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'topic', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'topic', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - topicIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'topic', - value: '', - )); - }); - } - - QueryBuilder - topicIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'topic', - value: '', - )); - }); - } -} - -extension EnqueuedMessageQueryObject - on QueryBuilder {} - -extension EnqueuedMessageQueryLinks - on QueryBuilder {} - -extension EnqueuedMessageQuerySortBy - on QueryBuilder { - QueryBuilder - sortByMessageId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'messageId', Sort.asc); - }); - } - - QueryBuilder - sortByMessageIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'messageId', Sort.desc); - }); - } - - QueryBuilder sortByPayload() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'payload', Sort.asc); - }); - } - - QueryBuilder - sortByPayloadDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'payload', Sort.desc); - }); - } - - QueryBuilder sortByTopic() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'topic', Sort.asc); - }); - } - - QueryBuilder - sortByTopicDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'topic', Sort.desc); - }); - } -} - -extension EnqueuedMessageQuerySortThenBy - on QueryBuilder { - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder - thenByMessageId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'messageId', Sort.asc); - }); - } - - QueryBuilder - thenByMessageIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'messageId', Sort.desc); - }); - } - - QueryBuilder thenByPayload() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'payload', Sort.asc); - }); - } - - QueryBuilder - thenByPayloadDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'payload', Sort.desc); - }); - } - - QueryBuilder thenByTopic() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'topic', Sort.asc); - }); - } - - QueryBuilder - thenByTopicDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'topic', Sort.desc); - }); - } -} - -extension EnqueuedMessageQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByMessageId( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'messageId', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByPayload( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'payload', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByTopic( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'topic', caseSensitive: caseSensitive); - }); - } -} - -extension EnqueuedMessageQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder messageIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'messageId'); - }); - } - - QueryBuilder payloadProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'payload'); - }); - } - - QueryBuilder topicProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'topic'); - }); - } -} diff --git a/lib/model/job.dart b/lib/model/job.dart index 99021ca..db338e3 100644 --- a/lib/model/job.dart +++ b/lib/model/job.dart @@ -1,41 +1,70 @@ +import 'dart:convert'; import 'package:dart_mq/dart_mq.dart'; -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; +import 'package:objectbox/objectbox.dart'; import 'package:stadtbote/model/job_tour.dart'; -import 'package:stadtbote/model/tour_position.dart'; -import 'package:stadtbote/model/tour_task.dart'; -part 'job.g.dart'; - -@collection -@JsonSerializable() +@Entity() class Job with ProducerMixin { - late Id id; - @JsonKey(name: 'ver') + @Id() + int id = 0; + late String ver; - @JsonKey(name: 'state') late int state; - @JsonKey(name: 'cr_filter') - late String? crFilter; - @JsonKey(name: 'ordertime') + String? crFilter; late int ordertime; - @JsonKey(name: 'offs_warn') late int offsWarn; - @JsonKey(name: 'global') late bool global; - @JsonKey(name: 'vht_id') late int vhtId; - @JsonKey(name: 'rem') late String rem; - @JsonKey(name: 'delayOrderTime') late int delayOrderTime; - @JsonKey(name: 'tours') - late List tours; + + // Store tours as JSON string for ObjectBox + String toursJson = '[]'; + + @Transient() + List get tours { + final List decoded = jsonDecode(toursJson); + return decoded.map((e) => JobTour.fromJson(e as Map)).toList(); + } + + set tours(List value) { + toursJson = jsonEncode(value.map((e) => e.toJson()).toList()); + } Job(); - factory Job.fromJson(Map json) => _$JobFromJson(json); + factory Job.fromJson(Map json) { + final job = Job(); + job.id = json['id'] as int? ?? 0; + job.ver = json['ver'] as String; + job.state = json['state'] as int; + job.crFilter = json['cr_filter'] as String?; + job.ordertime = json['ordertime'] as int; + job.offsWarn = json['offs_warn'] as int; + job.global = json['global'] as bool; + job.vhtId = json['vht_id'] as int; + job.rem = json['rem'] as String; + job.delayOrderTime = json['delayOrderTime'] as int; + job.tours = (json['tours'] as List) + .map((e) => JobTour.fromJson(e as Map)) + .toList(); + return job; + } - Map toJson() => _$JobToJson(this); + Map toJson() { + return { + 'id': id, + 'ver': ver, + 'state': state, + 'cr_filter': crFilter, + 'ordertime': ordertime, + 'offs_warn': offsWarn, + 'global': global, + 'vht_id': vhtId, + 'rem': rem, + 'delayOrderTime': delayOrderTime, + 'tours': tours.map((e) => e.toJson()).toList(), + }; + } } diff --git a/lib/model/job.g.dart b/lib/model/job.g.dart deleted file mode 100644 index ef9938c..0000000 --- a/lib/model/job.g.dart +++ /dev/null @@ -1,1497 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'job.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetJobCollection on Isar { - IsarCollection get jobs => this.collection(); -} - -const JobSchema = CollectionSchema( - name: r'Job', - id: -5961302972855324388, - properties: { - r'crFilter': PropertySchema( - id: 0, - name: r'crFilter', - type: IsarType.string, - ), - r'delayOrderTime': PropertySchema( - id: 1, - name: r'delayOrderTime', - type: IsarType.long, - ), - r'global': PropertySchema( - id: 2, - name: r'global', - type: IsarType.bool, - ), - r'offsWarn': PropertySchema( - id: 3, - name: r'offsWarn', - type: IsarType.long, - ), - r'ordertime': PropertySchema( - id: 4, - name: r'ordertime', - type: IsarType.long, - ), - r'rem': PropertySchema( - id: 5, - name: r'rem', - type: IsarType.string, - ), - r'state': PropertySchema( - id: 6, - name: r'state', - type: IsarType.long, - ), - r'tours': PropertySchema( - id: 7, - name: r'tours', - type: IsarType.objectList, - target: r'JobTour', - ), - r'ver': PropertySchema( - id: 8, - name: r'ver', - type: IsarType.string, - ), - r'vhtId': PropertySchema( - id: 9, - name: r'vhtId', - type: IsarType.long, - ) - }, - estimateSize: _jobEstimateSize, - serialize: _jobSerialize, - deserialize: _jobDeserialize, - deserializeProp: _jobDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: { - r'JobTour': JobTourSchema, - r'TourPosition': TourPositionSchema, - r'TourTask': TourTaskSchema, - r'TourEntry': TourEntrySchema - }, - getId: _jobGetId, - getLinks: _jobGetLinks, - attach: _jobAttach, - version: '3.1.8', -); - -int _jobEstimateSize( - Job object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.crFilter; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - bytesCount += 3 + object.rem.length * 3; - bytesCount += 3 + object.tours.length * 3; - { - final offsets = allOffsets[JobTour]!; - for (var i = 0; i < object.tours.length; i++) { - final value = object.tours[i]; - bytesCount += JobTourSchema.estimateSize(value, offsets, allOffsets); - } - } - bytesCount += 3 + object.ver.length * 3; - return bytesCount; -} - -void _jobSerialize( - Job object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.crFilter); - writer.writeLong(offsets[1], object.delayOrderTime); - writer.writeBool(offsets[2], object.global); - writer.writeLong(offsets[3], object.offsWarn); - writer.writeLong(offsets[4], object.ordertime); - writer.writeString(offsets[5], object.rem); - writer.writeLong(offsets[6], object.state); - writer.writeObjectList( - offsets[7], - allOffsets, - JobTourSchema.serialize, - object.tours, - ); - writer.writeString(offsets[8], object.ver); - writer.writeLong(offsets[9], object.vhtId); -} - -Job _jobDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = Job(); - object.crFilter = reader.readStringOrNull(offsets[0]); - object.delayOrderTime = reader.readLong(offsets[1]); - object.global = reader.readBool(offsets[2]); - object.id = id; - object.offsWarn = reader.readLong(offsets[3]); - object.ordertime = reader.readLong(offsets[4]); - object.rem = reader.readString(offsets[5]); - object.state = reader.readLong(offsets[6]); - object.tours = reader.readObjectList( - offsets[7], - JobTourSchema.deserialize, - allOffsets, - JobTour(), - ) ?? - []; - object.ver = reader.readString(offsets[8]); - object.vhtId = reader.readLong(offsets[9]); - return object; -} - -P _jobDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringOrNull(offset)) as P; - case 1: - return (reader.readLong(offset)) as P; - case 2: - return (reader.readBool(offset)) as P; - case 3: - return (reader.readLong(offset)) as P; - case 4: - return (reader.readLong(offset)) as P; - case 5: - return (reader.readString(offset)) as P; - case 6: - return (reader.readLong(offset)) as P; - case 7: - return (reader.readObjectList( - offset, - JobTourSchema.deserialize, - allOffsets, - JobTour(), - ) ?? - []) as P; - case 8: - return (reader.readString(offset)) as P; - case 9: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _jobGetId(Job object) { - return object.id; -} - -List> _jobGetLinks(Job object) { - return []; -} - -void _jobAttach(IsarCollection col, Id id, Job object) { - object.id = id; -} - -extension JobQueryWhereSort on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension JobQueryWhere on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension JobQueryFilter on QueryBuilder { - QueryBuilder crFilterIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'crFilter', - )); - }); - } - - QueryBuilder crFilterIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'crFilter', - )); - }); - } - - QueryBuilder crFilterEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'crFilter', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'crFilter', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'crFilter', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'crFilter', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'crFilter', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'crFilter', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterContains(String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'crFilter', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterMatches(String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'crFilter', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder crFilterIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'crFilter', - value: '', - )); - }); - } - - QueryBuilder crFilterIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'crFilter', - value: '', - )); - }); - } - - QueryBuilder delayOrderTimeEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'delayOrderTime', - value: value, - )); - }); - } - - QueryBuilder delayOrderTimeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'delayOrderTime', - value: value, - )); - }); - } - - QueryBuilder delayOrderTimeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'delayOrderTime', - value: value, - )); - }); - } - - QueryBuilder delayOrderTimeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'delayOrderTime', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder globalEqualTo(bool value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'global', - value: value, - )); - }); - } - - QueryBuilder idEqualTo(Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder offsWarnEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'offsWarn', - value: value, - )); - }); - } - - QueryBuilder offsWarnGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'offsWarn', - value: value, - )); - }); - } - - QueryBuilder offsWarnLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'offsWarn', - value: value, - )); - }); - } - - QueryBuilder offsWarnBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'offsWarn', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder ordertimeEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'ordertime', - value: value, - )); - }); - } - - QueryBuilder ordertimeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'ordertime', - value: value, - )); - }); - } - - QueryBuilder ordertimeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'ordertime', - value: value, - )); - }); - } - - QueryBuilder ordertimeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'ordertime', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder remEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'rem', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remContains(String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remMatches(String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'rem', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'rem', - value: '', - )); - }); - } - - QueryBuilder remIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'rem', - value: '', - )); - }); - } - - QueryBuilder stateEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'state', - value: value, - )); - }); - } - - QueryBuilder stateGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'state', - value: value, - )); - }); - } - - QueryBuilder stateLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'state', - value: value, - )); - }); - } - - QueryBuilder stateBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'state', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder toursLengthEqualTo(int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tours', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder toursIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tours', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder toursIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tours', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder toursLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tours', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder toursLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tours', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder toursLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tours', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } - - QueryBuilder verEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'ver', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'ver', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'ver', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'ver', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'ver', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'ver', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verContains(String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'ver', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verMatches(String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'ver', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder verIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'ver', - value: '', - )); - }); - } - - QueryBuilder verIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'ver', - value: '', - )); - }); - } - - QueryBuilder vhtIdEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'vhtId', - value: value, - )); - }); - } - - QueryBuilder vhtIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'vhtId', - value: value, - )); - }); - } - - QueryBuilder vhtIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'vhtId', - value: value, - )); - }); - } - - QueryBuilder vhtIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'vhtId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension JobQueryObject on QueryBuilder { - QueryBuilder toursElement( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'tours'); - }); - } -} - -extension JobQueryLinks on QueryBuilder {} - -extension JobQuerySortBy on QueryBuilder { - QueryBuilder sortByCrFilter() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crFilter', Sort.asc); - }); - } - - QueryBuilder sortByCrFilterDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crFilter', Sort.desc); - }); - } - - QueryBuilder sortByDelayOrderTime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'delayOrderTime', Sort.asc); - }); - } - - QueryBuilder sortByDelayOrderTimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'delayOrderTime', Sort.desc); - }); - } - - QueryBuilder sortByGlobal() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'global', Sort.asc); - }); - } - - QueryBuilder sortByGlobalDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'global', Sort.desc); - }); - } - - QueryBuilder sortByOffsWarn() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'offsWarn', Sort.asc); - }); - } - - QueryBuilder sortByOffsWarnDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'offsWarn', Sort.desc); - }); - } - - QueryBuilder sortByOrdertime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ordertime', Sort.asc); - }); - } - - QueryBuilder sortByOrdertimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ordertime', Sort.desc); - }); - } - - QueryBuilder sortByRem() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'rem', Sort.asc); - }); - } - - QueryBuilder sortByRemDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'rem', Sort.desc); - }); - } - - QueryBuilder sortByState() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'state', Sort.asc); - }); - } - - QueryBuilder sortByStateDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'state', Sort.desc); - }); - } - - QueryBuilder sortByVer() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ver', Sort.asc); - }); - } - - QueryBuilder sortByVerDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ver', Sort.desc); - }); - } - - QueryBuilder sortByVhtId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.asc); - }); - } - - QueryBuilder sortByVhtIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.desc); - }); - } -} - -extension JobQuerySortThenBy on QueryBuilder { - QueryBuilder thenByCrFilter() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crFilter', Sort.asc); - }); - } - - QueryBuilder thenByCrFilterDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crFilter', Sort.desc); - }); - } - - QueryBuilder thenByDelayOrderTime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'delayOrderTime', Sort.asc); - }); - } - - QueryBuilder thenByDelayOrderTimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'delayOrderTime', Sort.desc); - }); - } - - QueryBuilder thenByGlobal() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'global', Sort.asc); - }); - } - - QueryBuilder thenByGlobalDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'global', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenByOffsWarn() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'offsWarn', Sort.asc); - }); - } - - QueryBuilder thenByOffsWarnDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'offsWarn', Sort.desc); - }); - } - - QueryBuilder thenByOrdertime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ordertime', Sort.asc); - }); - } - - QueryBuilder thenByOrdertimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ordertime', Sort.desc); - }); - } - - QueryBuilder thenByRem() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'rem', Sort.asc); - }); - } - - QueryBuilder thenByRemDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'rem', Sort.desc); - }); - } - - QueryBuilder thenByState() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'state', Sort.asc); - }); - } - - QueryBuilder thenByStateDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'state', Sort.desc); - }); - } - - QueryBuilder thenByVer() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ver', Sort.asc); - }); - } - - QueryBuilder thenByVerDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'ver', Sort.desc); - }); - } - - QueryBuilder thenByVhtId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.asc); - }); - } - - QueryBuilder thenByVhtIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.desc); - }); - } -} - -extension JobQueryWhereDistinct on QueryBuilder { - QueryBuilder distinctByCrFilter( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'crFilter', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByDelayOrderTime() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'delayOrderTime'); - }); - } - - QueryBuilder distinctByGlobal() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'global'); - }); - } - - QueryBuilder distinctByOffsWarn() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'offsWarn'); - }); - } - - QueryBuilder distinctByOrdertime() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'ordertime'); - }); - } - - QueryBuilder distinctByRem({bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'rem', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByState() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'state'); - }); - } - - QueryBuilder distinctByVer({bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'ver', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByVhtId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'vhtId'); - }); - } -} - -extension JobQueryProperty on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder crFilterProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'crFilter'); - }); - } - - QueryBuilder delayOrderTimeProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'delayOrderTime'); - }); - } - - QueryBuilder globalProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'global'); - }); - } - - QueryBuilder offsWarnProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'offsWarn'); - }); - } - - QueryBuilder ordertimeProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'ordertime'); - }); - } - - QueryBuilder remProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'rem'); - }); - } - - QueryBuilder stateProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'state'); - }); - } - - QueryBuilder, QQueryOperations> toursProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'tours'); - }); - } - - QueryBuilder verProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'ver'); - }); - } - - QueryBuilder vhtIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'vhtId'); - }); - } -} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Job _$JobFromJson(Map json) => Job() - ..id = (json['id'] as num).toInt() - ..ver = json['ver'] as String - ..state = (json['state'] as num).toInt() - ..crFilter = json['cr_filter'] as String? - ..ordertime = (json['ordertime'] as num).toInt() - ..offsWarn = (json['offs_warn'] as num).toInt() - ..global = json['global'] as bool - ..vhtId = (json['vht_id'] as num).toInt() - ..rem = json['rem'] as String - ..delayOrderTime = (json['delayOrderTime'] as num).toInt() - ..tours = (json['tours'] as List) - .map((e) => JobTour.fromJson(e as Map)) - .toList(); - -Map _$JobToJson(Job instance) => { - 'id': instance.id, - 'ver': instance.ver, - 'state': instance.state, - 'cr_filter': instance.crFilter, - 'ordertime': instance.ordertime, - 'offs_warn': instance.offsWarn, - 'global': instance.global, - 'vht_id': instance.vhtId, - 'rem': instance.rem, - 'delayOrderTime': instance.delayOrderTime, - 'tours': instance.tours, - }; diff --git a/lib/model/job_tour.dart b/lib/model/job_tour.dart index 018ca13..2de5d45 100644 --- a/lib/model/job_tour.dart +++ b/lib/model/job_tour.dart @@ -1,12 +1,6 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; import 'package:stadtbote/model/tour_position.dart'; import 'package:stadtbote/model/tour_task.dart'; -part 'job_tour.g.dart'; - -@embedded -@JsonSerializable() class JobTour { late int id; late int sort; @@ -14,17 +8,55 @@ class JobTour { late String mode; late String comp; late String person; - late String? phone; + String? phone; late String street; late String city; - late String? com; - late TourPosition? pos; + String? com; + TourPosition? pos; late String rem; - late List? tasks; + List? tasks; JobTour(); - factory JobTour.fromJson(Map json) => _$JobTourFromJson(json); + factory JobTour.fromJson(Map json) { + final tour = JobTour(); + tour.id = json['id'] as int; + tour.sort = json['sort'] as int; + tour.state = json['state'] as int; + tour.mode = json['mode'] as String; + tour.comp = json['comp'] as String; + tour.person = json['person'] as String; + tour.phone = json['phone'] as String?; + tour.street = json['street'] as String; + tour.city = json['city'] as String; + tour.com = json['com'] as String?; + tour.pos = json['pos'] != null + ? TourPosition.fromJson(json['pos'] as Map) + : null; + tour.rem = json['rem'] as String; + tour.tasks = json['tasks'] != null + ? (json['tasks'] as List) + .map((e) => TourTask.fromJson(e as Map)) + .toList() + : null; + return tour; + } - Map toJson() => _$JobTourToJson(this); + Map toJson() { + return { + 'id': id, + 'sort': sort, + 'state': state, + 'mode': mode, + 'comp': comp, + 'person': person, + 'phone': phone, + 'street': street, + 'city': city, + 'com': com, + 'pos': pos?.toJson(), + 'rem': rem, + 'tasks': tasks?.map((e) => e.toJson()).toList(), + }; + } } diff --git a/lib/model/job_tour.g.dart b/lib/model/job_tour.g.dart deleted file mode 100644 index 76a221b..0000000 --- a/lib/model/job_tour.g.dart +++ /dev/null @@ -1,1650 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'job_tour.dart'; - -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const JobTourSchema = Schema( - name: r'JobTour', - id: -2365561616341050237, - properties: { - r'city': PropertySchema( - id: 0, - name: r'city', - type: IsarType.string, - ), - r'com': PropertySchema( - id: 1, - name: r'com', - type: IsarType.string, - ), - r'comp': PropertySchema( - id: 2, - name: r'comp', - type: IsarType.string, - ), - r'id': PropertySchema( - id: 3, - name: r'id', - type: IsarType.long, - ), - r'mode': PropertySchema( - id: 4, - name: r'mode', - type: IsarType.string, - ), - r'person': PropertySchema( - id: 5, - name: r'person', - type: IsarType.string, - ), - r'phone': PropertySchema( - id: 6, - name: r'phone', - type: IsarType.string, - ), - r'pos': PropertySchema( - id: 7, - name: r'pos', - type: IsarType.object, - target: r'TourPosition', - ), - r'rem': PropertySchema( - id: 8, - name: r'rem', - type: IsarType.string, - ), - r'sort': PropertySchema( - id: 9, - name: r'sort', - type: IsarType.long, - ), - r'state': PropertySchema( - id: 10, - name: r'state', - type: IsarType.long, - ), - r'street': PropertySchema( - id: 11, - name: r'street', - type: IsarType.string, - ), - r'tasks': PropertySchema( - id: 12, - name: r'tasks', - type: IsarType.objectList, - target: r'TourTask', - ) - }, - estimateSize: _jobTourEstimateSize, - serialize: _jobTourSerialize, - deserialize: _jobTourDeserialize, - deserializeProp: _jobTourDeserializeProp, -); - -int _jobTourEstimateSize( - JobTour object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.city.length * 3; - { - final value = object.com; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - bytesCount += 3 + object.comp.length * 3; - bytesCount += 3 + object.mode.length * 3; - bytesCount += 3 + object.person.length * 3; - { - final value = object.phone; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - { - final value = object.pos; - if (value != null) { - bytesCount += 3 + - TourPositionSchema.estimateSize( - value, allOffsets[TourPosition]!, allOffsets); - } - } - bytesCount += 3 + object.rem.length * 3; - bytesCount += 3 + object.street.length * 3; - { - final list = object.tasks; - if (list != null) { - bytesCount += 3 + list.length * 3; - { - final offsets = allOffsets[TourTask]!; - for (var i = 0; i < list.length; i++) { - final value = list[i]; - bytesCount += TourTaskSchema.estimateSize(value, offsets, allOffsets); - } - } - } - } - return bytesCount; -} - -void _jobTourSerialize( - JobTour object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.city); - writer.writeString(offsets[1], object.com); - writer.writeString(offsets[2], object.comp); - writer.writeLong(offsets[3], object.id); - writer.writeString(offsets[4], object.mode); - writer.writeString(offsets[5], object.person); - writer.writeString(offsets[6], object.phone); - writer.writeObject( - offsets[7], - allOffsets, - TourPositionSchema.serialize, - object.pos, - ); - writer.writeString(offsets[8], object.rem); - writer.writeLong(offsets[9], object.sort); - writer.writeLong(offsets[10], object.state); - writer.writeString(offsets[11], object.street); - writer.writeObjectList( - offsets[12], - allOffsets, - TourTaskSchema.serialize, - object.tasks, - ); -} - -JobTour _jobTourDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = JobTour(); - object.city = reader.readString(offsets[0]); - object.com = reader.readStringOrNull(offsets[1]); - object.comp = reader.readString(offsets[2]); - object.id = reader.readLong(offsets[3]); - object.mode = reader.readString(offsets[4]); - object.person = reader.readString(offsets[5]); - object.phone = reader.readStringOrNull(offsets[6]); - object.pos = reader.readObjectOrNull( - offsets[7], - TourPositionSchema.deserialize, - allOffsets, - ); - object.rem = reader.readString(offsets[8]); - object.sort = reader.readLong(offsets[9]); - object.state = reader.readLong(offsets[10]); - object.street = reader.readString(offsets[11]); - object.tasks = reader.readObjectList( - offsets[12], - TourTaskSchema.deserialize, - allOffsets, - TourTask(), - ); - return object; -} - -P _jobTourDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - case 1: - return (reader.readStringOrNull(offset)) as P; - case 2: - return (reader.readString(offset)) as P; - case 3: - return (reader.readLong(offset)) as P; - case 4: - return (reader.readString(offset)) as P; - case 5: - return (reader.readString(offset)) as P; - case 6: - return (reader.readStringOrNull(offset)) as P; - case 7: - return (reader.readObjectOrNull( - offset, - TourPositionSchema.deserialize, - allOffsets, - )) as P; - case 8: - return (reader.readString(offset)) as P; - case 9: - return (reader.readLong(offset)) as P; - case 10: - return (reader.readLong(offset)) as P; - case 11: - return (reader.readString(offset)) as P; - case 12: - return (reader.readObjectList( - offset, - TourTaskSchema.deserialize, - allOffsets, - TourTask(), - )) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension JobTourQueryFilter - on QueryBuilder { - QueryBuilder cityEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'city', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'city', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'city', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'city', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'city', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'city', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'city', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'city', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder cityIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'city', - value: '', - )); - }); - } - - QueryBuilder cityIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'city', - value: '', - )); - }); - } - - QueryBuilder comIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'com', - )); - }); - } - - QueryBuilder comIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'com', - )); - }); - } - - QueryBuilder comEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'com', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'com', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'com', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'com', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'com', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'com', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'com', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'com', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder comIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'com', - value: '', - )); - }); - } - - QueryBuilder comIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'com', - value: '', - )); - }); - } - - QueryBuilder compEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'comp', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'comp', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'comp', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'comp', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'comp', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'comp', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'comp', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'comp', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder compIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'comp', - value: '', - )); - }); - } - - QueryBuilder compIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'comp', - value: '', - )); - }); - } - - QueryBuilder idEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder modeEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'mode', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'mode', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'mode', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'mode', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'mode', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'mode', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'mode', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'mode', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder modeIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'mode', - value: '', - )); - }); - } - - QueryBuilder modeIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'mode', - value: '', - )); - }); - } - - QueryBuilder personEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'person', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'person', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'person', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'person', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'person', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'person', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'person', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'person', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder personIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'person', - value: '', - )); - }); - } - - QueryBuilder personIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'person', - value: '', - )); - }); - } - - QueryBuilder phoneIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'phone', - )); - }); - } - - QueryBuilder phoneIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'phone', - )); - }); - } - - QueryBuilder phoneEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'phone', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'phone', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'phone', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'phone', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'phone', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'phone', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'phone', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'phone', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder phoneIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'phone', - value: '', - )); - }); - } - - QueryBuilder phoneIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'phone', - value: '', - )); - }); - } - - QueryBuilder posIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'pos', - )); - }); - } - - QueryBuilder posIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'pos', - )); - }); - } - - QueryBuilder remEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'rem', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'rem', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'rem', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder remIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'rem', - value: '', - )); - }); - } - - QueryBuilder remIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'rem', - value: '', - )); - }); - } - - QueryBuilder sortEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'sort', - value: value, - )); - }); - } - - QueryBuilder sortGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'sort', - value: value, - )); - }); - } - - QueryBuilder sortLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'sort', - value: value, - )); - }); - } - - QueryBuilder sortBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'sort', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder stateEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'state', - value: value, - )); - }); - } - - QueryBuilder stateGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'state', - value: value, - )); - }); - } - - QueryBuilder stateLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'state', - value: value, - )); - }); - } - - QueryBuilder stateBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'state', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder streetEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'street', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'street', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'street', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'street', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'street', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'street', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'street', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'street', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder streetIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'street', - value: '', - )); - }); - } - - QueryBuilder streetIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'street', - value: '', - )); - }); - } - - QueryBuilder tasksIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'tasks', - )); - }); - } - - QueryBuilder tasksIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'tasks', - )); - }); - } - - QueryBuilder tasksLengthEqualTo( - int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tasks', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder tasksIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tasks', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder tasksIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tasks', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder tasksLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tasks', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder tasksLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tasks', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder tasksLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'tasks', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } -} - -extension JobTourQueryObject - on QueryBuilder { - QueryBuilder pos( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'pos'); - }); - } - - QueryBuilder tasksElement( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'tasks'); - }); - } -} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -JobTour _$JobTourFromJson(Map json) => JobTour() - ..id = (json['id'] as num).toInt() - ..sort = (json['sort'] as num).toInt() - ..state = (json['state'] as num).toInt() - ..mode = json['mode'] as String - ..comp = json['comp'] as String - ..person = json['person'] as String - ..phone = json['phone'] as String? - ..street = json['street'] as String - ..city = json['city'] as String - ..com = json['com'] as String? - ..pos = json['pos'] == null - ? null - : TourPosition.fromJson(json['pos'] as Map) - ..rem = json['rem'] as String - ..tasks = (json['tasks'] as List?) - ?.map((e) => TourTask.fromJson(e as Map)) - .toList(); - -Map _$JobTourToJson(JobTour instance) => { - 'id': instance.id, - 'sort': instance.sort, - 'state': instance.state, - 'mode': instance.mode, - 'comp': instance.comp, - 'person': instance.person, - 'phone': instance.phone, - 'street': instance.street, - 'city': instance.city, - 'com': instance.com, - 'pos': instance.pos, - 'rem': instance.rem, - 'tasks': instance.tasks, - }; diff --git a/lib/model/location_status.dart b/lib/model/location_status.dart index 9c7316f..4bfe2c0 100644 --- a/lib/model/location_status.dart +++ b/lib/model/location_status.dart @@ -1,23 +1,33 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; +import 'package:objectbox/objectbox.dart'; -part 'location_status.g.dart'; - -@collection -@JsonSerializable() +@Entity() class LocationStatus { - Id? id = 0; + @Id() + int id = 0; late String zip; late String area; - @JsonKey(name:'zip_real') late String zipReal; LocationStatus(); - factory LocationStatus.fromJson(Map json) => _$LocationStatusFromJson(json); + factory LocationStatus.fromJson(Map json) { + final status = LocationStatus(); + status.id = json['id'] as int? ?? 0; + status.zip = json['zip'] as String; + status.area = json['area'] as String; + status.zipReal = json['zip_real'] as String; + return status; + } - Map toJson() => _$LocationStatusToJson(this); + Map toJson() { + return { + 'id': id, + 'zip': zip, + 'area': area, + 'zip_real': zipReal, + }; + } } diff --git a/lib/model/location_status.g.dart b/lib/model/location_status.g.dart deleted file mode 100644 index 63b76d6..0000000 --- a/lib/model/location_status.g.dart +++ /dev/null @@ -1,849 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'location_status.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetLocationStatusCollection on Isar { - IsarCollection get locationStatus => this.collection(); -} - -const LocationStatusSchema = CollectionSchema( - name: r'LocationStatus', - id: 8870762975868385860, - properties: { - r'area': PropertySchema( - id: 0, - name: r'area', - type: IsarType.string, - ), - r'zip': PropertySchema( - id: 1, - name: r'zip', - type: IsarType.string, - ), - r'zipReal': PropertySchema( - id: 2, - name: r'zipReal', - type: IsarType.string, - ) - }, - estimateSize: _locationStatusEstimateSize, - serialize: _locationStatusSerialize, - deserialize: _locationStatusDeserialize, - deserializeProp: _locationStatusDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _locationStatusGetId, - getLinks: _locationStatusGetLinks, - attach: _locationStatusAttach, - version: '3.1.8', -); - -int _locationStatusEstimateSize( - LocationStatus object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.area.length * 3; - bytesCount += 3 + object.zip.length * 3; - bytesCount += 3 + object.zipReal.length * 3; - return bytesCount; -} - -void _locationStatusSerialize( - LocationStatus object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.area); - writer.writeString(offsets[1], object.zip); - writer.writeString(offsets[2], object.zipReal); -} - -LocationStatus _locationStatusDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = LocationStatus(); - object.area = reader.readString(offsets[0]); - object.id = id; - object.zip = reader.readString(offsets[1]); - object.zipReal = reader.readString(offsets[2]); - return object; -} - -P _locationStatusDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - case 1: - return (reader.readString(offset)) as P; - case 2: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _locationStatusGetId(LocationStatus object) { - return object.id ?? Isar.autoIncrement; -} - -List> _locationStatusGetLinks(LocationStatus object) { - return []; -} - -void _locationStatusAttach( - IsarCollection col, Id id, LocationStatus object) { - object.id = id; -} - -extension LocationStatusQueryWhereSort - on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension LocationStatusQueryWhere - on QueryBuilder { - QueryBuilder idEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan( - Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan( - Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension LocationStatusQueryFilter - on QueryBuilder { - QueryBuilder - areaEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'area', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'area', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - areaIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'area', - value: '', - )); - }); - } - - QueryBuilder - areaIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'area', - value: '', - )); - }); - } - - QueryBuilder - idIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'id', - )); - }); - } - - QueryBuilder - idIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'id', - )); - }); - } - - QueryBuilder idEqualTo( - Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - zipEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'zip', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'zip', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: '', - )); - }); - } - - QueryBuilder - zipIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'zip', - value: '', - )); - }); - } - - QueryBuilder - zipRealEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'zipReal', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'zipReal', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - zipRealIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zipReal', - value: '', - )); - }); - } - - QueryBuilder - zipRealIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'zipReal', - value: '', - )); - }); - } -} - -extension LocationStatusQueryObject - on QueryBuilder {} - -extension LocationStatusQueryLinks - on QueryBuilder {} - -extension LocationStatusQuerySortBy - on QueryBuilder { - QueryBuilder sortByArea() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'area', Sort.asc); - }); - } - - QueryBuilder sortByAreaDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'area', Sort.desc); - }); - } - - QueryBuilder sortByZip() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zip', Sort.asc); - }); - } - - QueryBuilder sortByZipDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zip', Sort.desc); - }); - } - - QueryBuilder sortByZipReal() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zipReal', Sort.asc); - }); - } - - QueryBuilder - sortByZipRealDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zipReal', Sort.desc); - }); - } -} - -extension LocationStatusQuerySortThenBy - on QueryBuilder { - QueryBuilder thenByArea() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'area', Sort.asc); - }); - } - - QueryBuilder thenByAreaDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'area', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenByZip() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zip', Sort.asc); - }); - } - - QueryBuilder thenByZipDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zip', Sort.desc); - }); - } - - QueryBuilder thenByZipReal() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zipReal', Sort.asc); - }); - } - - QueryBuilder - thenByZipRealDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'zipReal', Sort.desc); - }); - } -} - -extension LocationStatusQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByArea( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'area', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByZip( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'zip', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByZipReal( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'zipReal', caseSensitive: caseSensitive); - }); - } -} - -extension LocationStatusQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder areaProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'area'); - }); - } - - QueryBuilder zipProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'zip'); - }); - } - - QueryBuilder zipRealProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'zipReal'); - }); - } -} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -LocationStatus _$LocationStatusFromJson(Map json) => - LocationStatus() - ..id = (json['id'] as num?)?.toInt() - ..zip = json['zip'] as String - ..area = json['area'] as String - ..zipReal = json['zip_real'] as String; - -Map _$LocationStatusToJson(LocationStatus instance) => - { - 'id': instance.id, - 'zip': instance.zip, - 'area': instance.area, - 'zip_real': instance.zipReal, - }; diff --git a/lib/model/log_entry.dart b/lib/model/log_entry.dart index b8d223e..f7ec8ae 100644 --- a/lib/model/log_entry.dart +++ b/lib/model/log_entry.dart @@ -1,7 +1,4 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; - -part 'log_entry.g.dart'; +import 'package:objectbox/objectbox.dart'; enum LogEntrySeverityEnum { info, @@ -9,21 +6,20 @@ enum LogEntrySeverityEnum { error } -@collection -@JsonSerializable() +@Entity() class LogEntry { - late Id id = Isar.autoIncrement; + @Id() + int id = 0; + @Property(type: PropertyType.date) late DateTime time; - @enumerated - late LogEntrySeverityEnum severity; + late int severity; // Store enum as int late String text; LogEntry(); - factory LogEntry.fromJson(Map json) => _$LogEntryFromJson(json); - - Map toJson() => _$LogEntryToJson(this); + LogEntrySeverityEnum get severityEnum => LogEntrySeverityEnum.values[severity]; + set severityEnum(LogEntrySeverityEnum value) => severity = value.index; } \ No newline at end of file diff --git a/lib/model/log_entry.g.dart b/lib/model/log_entry.g.dart deleted file mode 100644 index d830226..0000000 --- a/lib/model/log_entry.g.dart +++ /dev/null @@ -1,662 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'log_entry.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetLogEntryCollection on Isar { - IsarCollection get logEntrys => this.collection(); -} - -const LogEntrySchema = CollectionSchema( - name: r'LogEntry', - id: -8268688274231935295, - properties: { - r'severity': PropertySchema( - id: 0, - name: r'severity', - type: IsarType.byte, - enumMap: _LogEntryseverityEnumValueMap, - ), - r'text': PropertySchema( - id: 1, - name: r'text', - type: IsarType.string, - ), - r'time': PropertySchema( - id: 2, - name: r'time', - type: IsarType.dateTime, - ) - }, - estimateSize: _logEntryEstimateSize, - serialize: _logEntrySerialize, - deserialize: _logEntryDeserialize, - deserializeProp: _logEntryDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _logEntryGetId, - getLinks: _logEntryGetLinks, - attach: _logEntryAttach, - version: '3.1.8', -); - -int _logEntryEstimateSize( - LogEntry object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.text.length * 3; - return bytesCount; -} - -void _logEntrySerialize( - LogEntry object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeByte(offsets[0], object.severity.index); - writer.writeString(offsets[1], object.text); - writer.writeDateTime(offsets[2], object.time); -} - -LogEntry _logEntryDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = LogEntry(); - object.id = id; - object.severity = - _LogEntryseverityValueEnumMap[reader.readByteOrNull(offsets[0])] ?? - LogEntrySeverityEnum.info; - object.text = reader.readString(offsets[1]); - object.time = reader.readDateTime(offsets[2]); - return object; -} - -P _logEntryDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (_LogEntryseverityValueEnumMap[reader.readByteOrNull(offset)] ?? - LogEntrySeverityEnum.info) as P; - case 1: - return (reader.readString(offset)) as P; - case 2: - return (reader.readDateTime(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -const _LogEntryseverityEnumValueMap = { - 'info': 0, - 'debug': 1, - 'error': 2, -}; -const _LogEntryseverityValueEnumMap = { - 0: LogEntrySeverityEnum.info, - 1: LogEntrySeverityEnum.debug, - 2: LogEntrySeverityEnum.error, -}; - -Id _logEntryGetId(LogEntry object) { - return object.id; -} - -List> _logEntryGetLinks(LogEntry object) { - return []; -} - -void _logEntryAttach(IsarCollection col, Id id, LogEntry object) { - object.id = id; -} - -extension LogEntryQueryWhereSort on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension LogEntryQueryWhere on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension LogEntryQueryFilter - on QueryBuilder { - QueryBuilder idEqualTo(Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder severityEqualTo( - LogEntrySeverityEnum value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'severity', - value: value, - )); - }); - } - - QueryBuilder severityGreaterThan( - LogEntrySeverityEnum value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'severity', - value: value, - )); - }); - } - - QueryBuilder severityLessThan( - LogEntrySeverityEnum value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'severity', - value: value, - )); - }); - } - - QueryBuilder severityBetween( - LogEntrySeverityEnum lower, - LogEntrySeverityEnum upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'severity', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder textEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'text', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'text', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'text', - value: '', - )); - }); - } - - QueryBuilder textIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'text', - value: '', - )); - }); - } - - QueryBuilder timeEqualTo( - DateTime value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeGreaterThan( - DateTime value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeLessThan( - DateTime value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeBetween( - DateTime lower, - DateTime upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'time', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension LogEntryQueryObject - on QueryBuilder {} - -extension LogEntryQueryLinks - on QueryBuilder {} - -extension LogEntryQuerySortBy on QueryBuilder { - QueryBuilder sortBySeverity() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'severity', Sort.asc); - }); - } - - QueryBuilder sortBySeverityDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'severity', Sort.desc); - }); - } - - QueryBuilder sortByText() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.asc); - }); - } - - QueryBuilder sortByTextDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.desc); - }); - } - - QueryBuilder sortByTime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.asc); - }); - } - - QueryBuilder sortByTimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.desc); - }); - } -} - -extension LogEntryQuerySortThenBy - on QueryBuilder { - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenBySeverity() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'severity', Sort.asc); - }); - } - - QueryBuilder thenBySeverityDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'severity', Sort.desc); - }); - } - - QueryBuilder thenByText() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.asc); - }); - } - - QueryBuilder thenByTextDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'text', Sort.desc); - }); - } - - QueryBuilder thenByTime() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.asc); - }); - } - - QueryBuilder thenByTimeDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'time', Sort.desc); - }); - } -} - -extension LogEntryQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctBySeverity() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'severity'); - }); - } - - QueryBuilder distinctByText( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'text', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByTime() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'time'); - }); - } -} - -extension LogEntryQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder - severityProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'severity'); - }); - } - - QueryBuilder textProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'text'); - }); - } - - QueryBuilder timeProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'time'); - }); - } -} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -LogEntry _$LogEntryFromJson(Map json) => LogEntry() - ..id = (json['id'] as num).toInt() - ..time = DateTime.parse(json['time'] as String) - ..severity = $enumDecode(_$LogEntrySeverityEnumEnumMap, json['severity']) - ..text = json['text'] as String; - -Map _$LogEntryToJson(LogEntry instance) => { - 'id': instance.id, - 'time': instance.time.toIso8601String(), - 'severity': _$LogEntrySeverityEnumEnumMap[instance.severity]!, - 'text': instance.text, - }; - -const _$LogEntrySeverityEnumEnumMap = { - LogEntrySeverityEnum.info: 'info', - LogEntrySeverityEnum.debug: 'debug', - LogEntrySeverityEnum.error: 'error', -}; diff --git a/lib/model/pictures.dart b/lib/model/pictures.dart index 9444da9..c7dd521 100644 --- a/lib/model/pictures.dart +++ b/lib/model/pictures.dart @@ -1,10 +1,9 @@ -import 'package:isar/isar.dart'; +import 'package:objectbox/objectbox.dart'; -part 'pictures.g.dart'; - -@collection +@Entity() class Picture { - late Id id; + @Id() + int id = 0; late int tourId; @@ -12,8 +11,6 @@ class Picture { late String data; - Picture() { - id = Isar.autoIncrement; - } + Picture(); } diff --git a/lib/model/pictures.g.dart b/lib/model/pictures.g.dart deleted file mode 100644 index be787a2..0000000 --- a/lib/model/pictures.g.dart +++ /dev/null @@ -1,623 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'pictures.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetPictureCollection on Isar { - IsarCollection get pictures => this.collection(); -} - -const PictureSchema = CollectionSchema( - name: r'Picture', - id: 985668904418580614, - properties: { - r'data': PropertySchema( - id: 0, - name: r'data', - type: IsarType.string, - ), - r'number': PropertySchema( - id: 1, - name: r'number', - type: IsarType.long, - ), - r'tourId': PropertySchema( - id: 2, - name: r'tourId', - type: IsarType.long, - ) - }, - estimateSize: _pictureEstimateSize, - serialize: _pictureSerialize, - deserialize: _pictureDeserialize, - deserializeProp: _pictureDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _pictureGetId, - getLinks: _pictureGetLinks, - attach: _pictureAttach, - version: '3.1.8', -); - -int _pictureEstimateSize( - Picture object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.data.length * 3; - return bytesCount; -} - -void _pictureSerialize( - Picture object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.data); - writer.writeLong(offsets[1], object.number); - writer.writeLong(offsets[2], object.tourId); -} - -Picture _pictureDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = Picture(); - object.data = reader.readString(offsets[0]); - object.id = id; - object.number = reader.readLong(offsets[1]); - object.tourId = reader.readLong(offsets[2]); - return object; -} - -P _pictureDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - case 1: - return (reader.readLong(offset)) as P; - case 2: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _pictureGetId(Picture object) { - return object.id; -} - -List> _pictureGetLinks(Picture object) { - return []; -} - -void _pictureAttach(IsarCollection col, Id id, Picture object) { - object.id = id; -} - -extension PictureQueryWhereSort on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension PictureQueryWhere on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension PictureQueryFilter - on QueryBuilder { - QueryBuilder dataEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'data', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'data', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'data', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'data', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'data', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'data', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'data', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'data', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder dataIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'data', - value: '', - )); - }); - } - - QueryBuilder dataIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'data', - value: '', - )); - }); - } - - QueryBuilder idEqualTo(Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder numberEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'number', - value: value, - )); - }); - } - - QueryBuilder numberGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'number', - value: value, - )); - }); - } - - QueryBuilder numberLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'number', - value: value, - )); - }); - } - - QueryBuilder numberBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'number', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder tourIdEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'tourId', - value: value, - )); - }); - } - - QueryBuilder tourIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'tourId', - value: value, - )); - }); - } - - QueryBuilder tourIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'tourId', - value: value, - )); - }); - } - - QueryBuilder tourIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'tourId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension PictureQueryObject - on QueryBuilder {} - -extension PictureQueryLinks - on QueryBuilder {} - -extension PictureQuerySortBy on QueryBuilder { - QueryBuilder sortByData() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'data', Sort.asc); - }); - } - - QueryBuilder sortByDataDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'data', Sort.desc); - }); - } - - QueryBuilder sortByNumber() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'number', Sort.asc); - }); - } - - QueryBuilder sortByNumberDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'number', Sort.desc); - }); - } - - QueryBuilder sortByTourId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'tourId', Sort.asc); - }); - } - - QueryBuilder sortByTourIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'tourId', Sort.desc); - }); - } -} - -extension PictureQuerySortThenBy - on QueryBuilder { - QueryBuilder thenByData() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'data', Sort.asc); - }); - } - - QueryBuilder thenByDataDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'data', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenByNumber() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'number', Sort.asc); - }); - } - - QueryBuilder thenByNumberDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'number', Sort.desc); - }); - } - - QueryBuilder thenByTourId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'tourId', Sort.asc); - }); - } - - QueryBuilder thenByTourIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'tourId', Sort.desc); - }); - } -} - -extension PictureQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByData( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'data', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByNumber() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'number'); - }); - } - - QueryBuilder distinctByTourId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'tourId'); - }); - } -} - -extension PictureQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder dataProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'data'); - }); - } - - QueryBuilder numberProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'number'); - }); - } - - QueryBuilder tourIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'tourId'); - }); - } -} diff --git a/lib/model/rank.dart b/lib/model/rank.dart index 373b7e5..b20fef1 100644 --- a/lib/model/rank.dart +++ b/lib/model/rank.dart @@ -1,57 +1,95 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; +import 'dart:convert'; +import 'package:objectbox/objectbox.dart'; -part 'rank.g.dart'; - -@collection -@JsonSerializable() +@Entity() class Ranking { - @JsonValue(0) - late Id? id = Isar.autoIncrement; + @Id() + int id = 0; - @JsonKey(name: "ranking") - late List ranks; + // Store ranks as JSON string + String ranksJson = '[]'; + + @Transient() + List get ranks { + final List decoded = jsonDecode(ranksJson); + return decoded.map((e) => Rank.fromJson(e as Map)).toList(); + } + + set ranks(List value) { + ranksJson = jsonEncode(value.map((e) => e.toJson()).toList()); + } Ranking(); - factory Ranking.fromJson(Map json) => _$RankingFromJson(json); + factory Ranking.fromJson(Map json) { + final ranking = Ranking(); + ranking.id = json['id'] as int? ?? 0; + ranking.ranks = (json['ranking'] as List) + .map((e) => Rank.fromJson(e as Map)) + .toList(); + return ranking; + } - Map toJson() => _$RankingToJson(this); + Map toJson() { + return { + 'id': id, + 'ranking': ranks.map((e) => e.toJson()).toList(), + }; + } } -@embedded -@JsonSerializable() class Rank { late int id; - late String zip; - String? area; - late List vehicles; Rank(); - factory Rank.fromJson(Map json) => _$RankFromJson(json); + factory Rank.fromJson(Map json) { + final rank = Rank(); + rank.id = json['id'] as int; + rank.zip = json['zip'] as String; + rank.area = json['area'] as String?; + rank.vehicles = (json['vehicles'] as List) + .map((e) => Vehicle.fromJson(e as Map)) + .toList(); + return rank; + } - Map toJson() => _$RankToJson(this); + Map toJson() { + return { + 'id': id, + 'zip': zip, + 'area': area, + 'vehicles': vehicles.map((e) => e.toJson()).toList(), + }; + } } -@embedded -@JsonSerializable() class Vehicle { late int id; - late int type; - - late int? cnt; - - @JsonKey(name: 'self', defaultValue: false) - late bool? self; + int? cnt; + bool? self; Vehicle(); - factory Vehicle.fromJson(Map json) => _$VehicleFromJson(json); + factory Vehicle.fromJson(Map json) { + final vehicle = Vehicle(); + vehicle.id = json['id'] as int; + vehicle.type = json['type'] as int; + vehicle.cnt = json['cnt'] as int?; + vehicle.self = json['self'] as bool? ?? false; + return vehicle; + } - Map toJson() => _$VehicleToJson(this); + Map toJson() { + return { + 'id': id, + 'type': type, + 'cnt': cnt, + 'self': self, + }; + } } diff --git a/lib/model/rank.g.dart b/lib/model/rank.g.dart deleted file mode 100644 index ddce3cd..0000000 --- a/lib/model/rank.g.dart +++ /dev/null @@ -1,1279 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'rank.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetRankingCollection on Isar { - IsarCollection get rankings => this.collection(); -} - -const RankingSchema = CollectionSchema( - name: r'Ranking', - id: 923686411839286896, - properties: { - r'ranks': PropertySchema( - id: 0, - name: r'ranks', - type: IsarType.objectList, - target: r'Rank', - ) - }, - estimateSize: _rankingEstimateSize, - serialize: _rankingSerialize, - deserialize: _rankingDeserialize, - deserializeProp: _rankingDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {r'Rank': RankSchema, r'Vehicle': VehicleSchema}, - getId: _rankingGetId, - getLinks: _rankingGetLinks, - attach: _rankingAttach, - version: '3.1.8', -); - -int _rankingEstimateSize( - Ranking object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.ranks.length * 3; - { - final offsets = allOffsets[Rank]!; - for (var i = 0; i < object.ranks.length; i++) { - final value = object.ranks[i]; - bytesCount += RankSchema.estimateSize(value, offsets, allOffsets); - } - } - return bytesCount; -} - -void _rankingSerialize( - Ranking object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeObjectList( - offsets[0], - allOffsets, - RankSchema.serialize, - object.ranks, - ); -} - -Ranking _rankingDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = Ranking(); - object.id = id; - object.ranks = reader.readObjectList( - offsets[0], - RankSchema.deserialize, - allOffsets, - Rank(), - ) ?? - []; - return object; -} - -P _rankingDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readObjectList( - offset, - RankSchema.deserialize, - allOffsets, - Rank(), - ) ?? - []) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _rankingGetId(Ranking object) { - return object.id ?? Isar.autoIncrement; -} - -List> _rankingGetLinks(Ranking object) { - return []; -} - -void _rankingAttach(IsarCollection col, Id id, Ranking object) { - object.id = id; -} - -extension RankingQueryWhereSort on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension RankingQueryWhere on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension RankingQueryFilter - on QueryBuilder { - QueryBuilder idIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'id', - )); - }); - } - - QueryBuilder idIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'id', - )); - }); - } - - QueryBuilder idEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder ranksLengthEqualTo( - int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'ranks', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder ranksIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'ranks', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder ranksIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'ranks', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder ranksLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'ranks', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder ranksLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'ranks', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder ranksLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'ranks', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } -} - -extension RankingQueryObject - on QueryBuilder { - QueryBuilder ranksElement( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'ranks'); - }); - } -} - -extension RankingQueryLinks - on QueryBuilder {} - -extension RankingQuerySortBy on QueryBuilder {} - -extension RankingQuerySortThenBy - on QueryBuilder { - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } -} - -extension RankingQueryWhereDistinct - on QueryBuilder {} - -extension RankingQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder, QQueryOperations> ranksProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'ranks'); - }); - } -} - -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const RankSchema = Schema( - name: r'Rank', - id: 4990427334210593033, - properties: { - r'area': PropertySchema( - id: 0, - name: r'area', - type: IsarType.string, - ), - r'id': PropertySchema( - id: 1, - name: r'id', - type: IsarType.long, - ), - r'vehicles': PropertySchema( - id: 2, - name: r'vehicles', - type: IsarType.objectList, - target: r'Vehicle', - ), - r'zip': PropertySchema( - id: 3, - name: r'zip', - type: IsarType.string, - ) - }, - estimateSize: _rankEstimateSize, - serialize: _rankSerialize, - deserialize: _rankDeserialize, - deserializeProp: _rankDeserializeProp, -); - -int _rankEstimateSize( - Rank object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.area; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - bytesCount += 3 + object.vehicles.length * 3; - { - final offsets = allOffsets[Vehicle]!; - for (var i = 0; i < object.vehicles.length; i++) { - final value = object.vehicles[i]; - bytesCount += VehicleSchema.estimateSize(value, offsets, allOffsets); - } - } - bytesCount += 3 + object.zip.length * 3; - return bytesCount; -} - -void _rankSerialize( - Rank object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.area); - writer.writeLong(offsets[1], object.id); - writer.writeObjectList( - offsets[2], - allOffsets, - VehicleSchema.serialize, - object.vehicles, - ); - writer.writeString(offsets[3], object.zip); -} - -Rank _rankDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = Rank(); - object.area = reader.readStringOrNull(offsets[0]); - object.id = reader.readLong(offsets[1]); - object.vehicles = reader.readObjectList( - offsets[2], - VehicleSchema.deserialize, - allOffsets, - Vehicle(), - ) ?? - []; - object.zip = reader.readString(offsets[3]); - return object; -} - -P _rankDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringOrNull(offset)) as P; - case 1: - return (reader.readLong(offset)) as P; - case 2: - return (reader.readObjectList( - offset, - VehicleSchema.deserialize, - allOffsets, - Vehicle(), - ) ?? - []) as P; - case 3: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension RankQueryFilter on QueryBuilder { - QueryBuilder areaIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'area', - )); - }); - } - - QueryBuilder areaIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'area', - )); - }); - } - - QueryBuilder areaEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'area', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaContains(String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaMatches(String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'area', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'area', - value: '', - )); - }); - } - - QueryBuilder areaIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'area', - value: '', - )); - }); - } - - QueryBuilder idEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder vehiclesLengthEqualTo( - int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'vehicles', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder vehiclesIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'vehicles', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder vehiclesIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'vehicles', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder vehiclesLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'vehicles', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder vehiclesLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'vehicles', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder vehiclesLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'vehicles', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } - - QueryBuilder zipEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'zip', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipContains(String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipMatches(String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'zip', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: '', - )); - }); - } - - QueryBuilder zipIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'zip', - value: '', - )); - }); - } -} - -extension RankQueryObject on QueryBuilder { - QueryBuilder vehiclesElement( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'vehicles'); - }); - } -} - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const VehicleSchema = Schema( - name: r'Vehicle', - id: -21624847921258799, - properties: { - r'cnt': PropertySchema( - id: 0, - name: r'cnt', - type: IsarType.long, - ), - r'id': PropertySchema( - id: 1, - name: r'id', - type: IsarType.long, - ), - r'self': PropertySchema( - id: 2, - name: r'self', - type: IsarType.bool, - ), - r'type': PropertySchema( - id: 3, - name: r'type', - type: IsarType.long, - ) - }, - estimateSize: _vehicleEstimateSize, - serialize: _vehicleSerialize, - deserialize: _vehicleDeserialize, - deserializeProp: _vehicleDeserializeProp, -); - -int _vehicleEstimateSize( - Vehicle object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - return bytesCount; -} - -void _vehicleSerialize( - Vehicle object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeLong(offsets[0], object.cnt); - writer.writeLong(offsets[1], object.id); - writer.writeBool(offsets[2], object.self); - writer.writeLong(offsets[3], object.type); -} - -Vehicle _vehicleDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = Vehicle(); - object.cnt = reader.readLongOrNull(offsets[0]); - object.id = reader.readLong(offsets[1]); - object.self = reader.readBoolOrNull(offsets[2]); - object.type = reader.readLong(offsets[3]); - return object; -} - -P _vehicleDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readLongOrNull(offset)) as P; - case 1: - return (reader.readLong(offset)) as P; - case 2: - return (reader.readBoolOrNull(offset)) as P; - case 3: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension VehicleQueryFilter - on QueryBuilder { - QueryBuilder cntIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'cnt', - )); - }); - } - - QueryBuilder cntIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'cnt', - )); - }); - } - - QueryBuilder cntEqualTo(int? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'cnt', - value: value, - )); - }); - } - - QueryBuilder cntGreaterThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'cnt', - value: value, - )); - }); - } - - QueryBuilder cntLessThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'cnt', - value: value, - )); - }); - } - - QueryBuilder cntBetween( - int? lower, - int? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'cnt', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder idEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder selfIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'self', - )); - }); - } - - QueryBuilder selfIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'self', - )); - }); - } - - QueryBuilder selfEqualTo( - bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'self', - value: value, - )); - }); - } - - QueryBuilder typeEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'type', - value: value, - )); - }); - } - - QueryBuilder typeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'type', - value: value, - )); - }); - } - - QueryBuilder typeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'type', - value: value, - )); - }); - } - - QueryBuilder typeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'type', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension VehicleQueryObject - on QueryBuilder {} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Ranking _$RankingFromJson(Map json) => Ranking() - ..id = (json['id'] as num?)?.toInt() - ..ranks = (json['ranking'] as List) - .map((e) => Rank.fromJson(e as Map)) - .toList(); - -Map _$RankingToJson(Ranking instance) => { - 'id': instance.id, - 'ranking': instance.ranks, - }; - -Rank _$RankFromJson(Map json) => Rank() - ..id = (json['id'] as num).toInt() - ..zip = json['zip'] as String - ..area = json['area'] as String? - ..vehicles = (json['vehicles'] as List) - .map((e) => Vehicle.fromJson(e as Map)) - .toList(); - -Map _$RankToJson(Rank instance) => { - 'id': instance.id, - 'zip': instance.zip, - 'area': instance.area, - 'vehicles': instance.vehicles, - }; - -Vehicle _$VehicleFromJson(Map json) => Vehicle() - ..id = (json['id'] as num).toInt() - ..type = (json['type'] as num).toInt() - ..cnt = (json['cnt'] as num?)?.toInt() - ..self = json['self'] as bool? ?? false; - -Map _$VehicleToJson(Vehicle instance) => { - 'id': instance.id, - 'type': instance.type, - 'cnt': instance.cnt, - 'self': instance.self, - }; diff --git a/lib/model/session_status.dart b/lib/model/session_status.dart index 36219b7..2ad4d57 100644 --- a/lib/model/session_status.dart +++ b/lib/model/session_status.dart @@ -1,37 +1,52 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; +import 'package:objectbox/objectbox.dart'; -part 'session_status.g.dart'; - -@collection -@JsonSerializable() +@Entity() class SessionStatus { - final Id id = 0; + @Id() + int id = 0; - @JsonKey(name: 'cust_id') late int custId; - @JsonKey(name: 'hq_id') late int hqId; - @JsonKey(name: 'usr_id') late int usrId; - @JsonKey(name: 'cr_id') late int crId; - @JsonKey(name: 'sid') late String sid; - @JsonKey(name: 'vht_id') late int vhtId; - @JsonKey(name: 'loc_zip') late String locZip; - @JsonKey(name: 'server_version') late String serverVersion; - @JsonKey(name: 'server_instance') late String serverInstance; - @JsonKey(name: 'bwv', defaultValue: false, required: false) - late bool bwvEnabled; + bool bwvEnabled = false; SessionStatus(); - factory SessionStatus.fromJson(Map json) => _$SessionStatusFromJson(json); + factory SessionStatus.fromJson(Map json) { + final status = SessionStatus(); + status.id = json['id'] as int? ?? 0; + status.custId = json['cust_id'] as int; + status.hqId = json['hq_id'] as int; + status.usrId = json['usr_id'] as int; + status.crId = json['cr_id'] as int; + status.sid = json['sid'] as String; + status.vhtId = json['vht_id'] as int; + status.locZip = json['loc_zip'] as String; + status.serverVersion = json['server_version'] as String; + status.serverInstance = json['server_instance'] as String; + status.bwvEnabled = json['bwv'] as bool? ?? false; + return status; + } - Map toJson() => _$SessionStatusToJson(this); + Map toJson() { + return { + 'id': id, + 'cust_id': custId, + 'hq_id': hqId, + 'usr_id': usrId, + 'cr_id': crId, + 'sid': sid, + 'vht_id': vhtId, + 'loc_zip': locZip, + 'server_version': serverVersion, + 'server_instance': serverInstance, + 'bwv': bwvEnabled, + }; + } } diff --git a/lib/model/session_status.g.dart b/lib/model/session_status.g.dart deleted file mode 100644 index adba675..0000000 --- a/lib/model/session_status.g.dart +++ /dev/null @@ -1,1590 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'session_status.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetSessionStatusCollection on Isar { - IsarCollection get sessionStatus => this.collection(); -} - -const SessionStatusSchema = CollectionSchema( - name: r'SessionStatus', - id: -8915225926978838405, - properties: { - r'bwvEnabled': PropertySchema( - id: 0, - name: r'bwvEnabled', - type: IsarType.bool, - ), - r'crId': PropertySchema( - id: 1, - name: r'crId', - type: IsarType.long, - ), - r'custId': PropertySchema( - id: 2, - name: r'custId', - type: IsarType.long, - ), - r'hqId': PropertySchema( - id: 3, - name: r'hqId', - type: IsarType.long, - ), - r'locZip': PropertySchema( - id: 4, - name: r'locZip', - type: IsarType.string, - ), - r'serverInstance': PropertySchema( - id: 5, - name: r'serverInstance', - type: IsarType.string, - ), - r'serverVersion': PropertySchema( - id: 6, - name: r'serverVersion', - type: IsarType.string, - ), - r'sid': PropertySchema( - id: 7, - name: r'sid', - type: IsarType.string, - ), - r'usrId': PropertySchema( - id: 8, - name: r'usrId', - type: IsarType.long, - ), - r'vhtId': PropertySchema( - id: 9, - name: r'vhtId', - type: IsarType.long, - ) - }, - estimateSize: _sessionStatusEstimateSize, - serialize: _sessionStatusSerialize, - deserialize: _sessionStatusDeserialize, - deserializeProp: _sessionStatusDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _sessionStatusGetId, - getLinks: _sessionStatusGetLinks, - attach: _sessionStatusAttach, - version: '3.1.8', -); - -int _sessionStatusEstimateSize( - SessionStatus object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.locZip.length * 3; - bytesCount += 3 + object.serverInstance.length * 3; - bytesCount += 3 + object.serverVersion.length * 3; - bytesCount += 3 + object.sid.length * 3; - return bytesCount; -} - -void _sessionStatusSerialize( - SessionStatus object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeBool(offsets[0], object.bwvEnabled); - writer.writeLong(offsets[1], object.crId); - writer.writeLong(offsets[2], object.custId); - writer.writeLong(offsets[3], object.hqId); - writer.writeString(offsets[4], object.locZip); - writer.writeString(offsets[5], object.serverInstance); - writer.writeString(offsets[6], object.serverVersion); - writer.writeString(offsets[7], object.sid); - writer.writeLong(offsets[8], object.usrId); - writer.writeLong(offsets[9], object.vhtId); -} - -SessionStatus _sessionStatusDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = SessionStatus(); - object.bwvEnabled = reader.readBool(offsets[0]); - object.crId = reader.readLong(offsets[1]); - object.custId = reader.readLong(offsets[2]); - object.hqId = reader.readLong(offsets[3]); - object.locZip = reader.readString(offsets[4]); - object.serverInstance = reader.readString(offsets[5]); - object.serverVersion = reader.readString(offsets[6]); - object.sid = reader.readString(offsets[7]); - object.usrId = reader.readLong(offsets[8]); - object.vhtId = reader.readLong(offsets[9]); - return object; -} - -P _sessionStatusDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readBool(offset)) as P; - case 1: - return (reader.readLong(offset)) as P; - case 2: - return (reader.readLong(offset)) as P; - case 3: - return (reader.readLong(offset)) as P; - case 4: - return (reader.readString(offset)) as P; - case 5: - return (reader.readString(offset)) as P; - case 6: - return (reader.readString(offset)) as P; - case 7: - return (reader.readString(offset)) as P; - case 8: - return (reader.readLong(offset)) as P; - case 9: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _sessionStatusGetId(SessionStatus object) { - return object.id; -} - -List> _sessionStatusGetLinks(SessionStatus object) { - return []; -} - -void _sessionStatusAttach( - IsarCollection col, Id id, SessionStatus object) {} - -extension SessionStatusQueryWhereSort - on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension SessionStatusQueryWhere - on QueryBuilder { - QueryBuilder idEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo( - Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan( - Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan( - Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension SessionStatusQueryFilter - on QueryBuilder { - QueryBuilder - bwvEnabledEqualTo(bool value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'bwvEnabled', - value: value, - )); - }); - } - - QueryBuilder crIdEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'crId', - value: value, - )); - }); - } - - QueryBuilder - crIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'crId', - value: value, - )); - }); - } - - QueryBuilder - crIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'crId', - value: value, - )); - }); - } - - QueryBuilder crIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'crId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - custIdEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'custId', - value: value, - )); - }); - } - - QueryBuilder - custIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'custId', - value: value, - )); - }); - } - - QueryBuilder - custIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'custId', - value: value, - )); - }); - } - - QueryBuilder - custIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'custId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder hqIdEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'hqId', - value: value, - )); - }); - } - - QueryBuilder - hqIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'hqId', - value: value, - )); - }); - } - - QueryBuilder - hqIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'hqId', - value: value, - )); - }); - } - - QueryBuilder hqIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'hqId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder idEqualTo( - Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder - idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - locZipEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'locZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'locZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'locZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'locZip', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'locZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'locZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'locZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'locZip', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - locZipIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'locZip', - value: '', - )); - }); - } - - QueryBuilder - locZipIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'locZip', - value: '', - )); - }); - } - - QueryBuilder - serverInstanceEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'serverInstance', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'serverInstance', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'serverInstance', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'serverInstance', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'serverInstance', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'serverInstance', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'serverInstance', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'serverInstance', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverInstanceIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'serverInstance', - value: '', - )); - }); - } - - QueryBuilder - serverInstanceIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'serverInstance', - value: '', - )); - }); - } - - QueryBuilder - serverVersionEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'serverVersion', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'serverVersion', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'serverVersion', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'serverVersion', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'serverVersion', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'serverVersion', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'serverVersion', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'serverVersion', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - serverVersionIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'serverVersion', - value: '', - )); - }); - } - - QueryBuilder - serverVersionIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'serverVersion', - value: '', - )); - }); - } - - QueryBuilder sidEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'sid', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - sidGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'sid', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder sidLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'sid', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder sidBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'sid', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - sidStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'sid', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder sidEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'sid', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder sidContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'sid', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder sidMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'sid', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - sidIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'sid', - value: '', - )); - }); - } - - QueryBuilder - sidIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'sid', - value: '', - )); - }); - } - - QueryBuilder - usrIdEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'usrId', - value: value, - )); - }); - } - - QueryBuilder - usrIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'usrId', - value: value, - )); - }); - } - - QueryBuilder - usrIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'usrId', - value: value, - )); - }); - } - - QueryBuilder - usrIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'usrId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder - vhtIdEqualTo(int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'vhtId', - value: value, - )); - }); - } - - QueryBuilder - vhtIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'vhtId', - value: value, - )); - }); - } - - QueryBuilder - vhtIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'vhtId', - value: value, - )); - }); - } - - QueryBuilder - vhtIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'vhtId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension SessionStatusQueryObject - on QueryBuilder {} - -extension SessionStatusQueryLinks - on QueryBuilder {} - -extension SessionStatusQuerySortBy - on QueryBuilder { - QueryBuilder sortByBwvEnabled() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'bwvEnabled', Sort.asc); - }); - } - - QueryBuilder - sortByBwvEnabledDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'bwvEnabled', Sort.desc); - }); - } - - QueryBuilder sortByCrId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crId', Sort.asc); - }); - } - - QueryBuilder sortByCrIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crId', Sort.desc); - }); - } - - QueryBuilder sortByCustId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'custId', Sort.asc); - }); - } - - QueryBuilder sortByCustIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'custId', Sort.desc); - }); - } - - QueryBuilder sortByHqId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hqId', Sort.asc); - }); - } - - QueryBuilder sortByHqIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hqId', Sort.desc); - }); - } - - QueryBuilder sortByLocZip() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'locZip', Sort.asc); - }); - } - - QueryBuilder sortByLocZipDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'locZip', Sort.desc); - }); - } - - QueryBuilder - sortByServerInstance() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverInstance', Sort.asc); - }); - } - - QueryBuilder - sortByServerInstanceDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverInstance', Sort.desc); - }); - } - - QueryBuilder - sortByServerVersion() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverVersion', Sort.asc); - }); - } - - QueryBuilder - sortByServerVersionDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverVersion', Sort.desc); - }); - } - - QueryBuilder sortBySid() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sid', Sort.asc); - }); - } - - QueryBuilder sortBySidDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sid', Sort.desc); - }); - } - - QueryBuilder sortByUsrId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'usrId', Sort.asc); - }); - } - - QueryBuilder sortByUsrIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'usrId', Sort.desc); - }); - } - - QueryBuilder sortByVhtId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.asc); - }); - } - - QueryBuilder sortByVhtIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.desc); - }); - } -} - -extension SessionStatusQuerySortThenBy - on QueryBuilder { - QueryBuilder thenByBwvEnabled() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'bwvEnabled', Sort.asc); - }); - } - - QueryBuilder - thenByBwvEnabledDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'bwvEnabled', Sort.desc); - }); - } - - QueryBuilder thenByCrId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crId', Sort.asc); - }); - } - - QueryBuilder thenByCrIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'crId', Sort.desc); - }); - } - - QueryBuilder thenByCustId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'custId', Sort.asc); - }); - } - - QueryBuilder thenByCustIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'custId', Sort.desc); - }); - } - - QueryBuilder thenByHqId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hqId', Sort.asc); - }); - } - - QueryBuilder thenByHqIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'hqId', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenByLocZip() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'locZip', Sort.asc); - }); - } - - QueryBuilder thenByLocZipDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'locZip', Sort.desc); - }); - } - - QueryBuilder - thenByServerInstance() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverInstance', Sort.asc); - }); - } - - QueryBuilder - thenByServerInstanceDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverInstance', Sort.desc); - }); - } - - QueryBuilder - thenByServerVersion() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverVersion', Sort.asc); - }); - } - - QueryBuilder - thenByServerVersionDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'serverVersion', Sort.desc); - }); - } - - QueryBuilder thenBySid() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sid', Sort.asc); - }); - } - - QueryBuilder thenBySidDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sid', Sort.desc); - }); - } - - QueryBuilder thenByUsrId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'usrId', Sort.asc); - }); - } - - QueryBuilder thenByUsrIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'usrId', Sort.desc); - }); - } - - QueryBuilder thenByVhtId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.asc); - }); - } - - QueryBuilder thenByVhtIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'vhtId', Sort.desc); - }); - } -} - -extension SessionStatusQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByBwvEnabled() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'bwvEnabled'); - }); - } - - QueryBuilder distinctByCrId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'crId'); - }); - } - - QueryBuilder distinctByCustId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'custId'); - }); - } - - QueryBuilder distinctByHqId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'hqId'); - }); - } - - QueryBuilder distinctByLocZip( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'locZip', caseSensitive: caseSensitive); - }); - } - - QueryBuilder - distinctByServerInstance({bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'serverInstance', - caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByServerVersion( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'serverVersion', - caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctBySid( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'sid', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByUsrId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'usrId'); - }); - } - - QueryBuilder distinctByVhtId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'vhtId'); - }); - } -} - -extension SessionStatusQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder bwvEnabledProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'bwvEnabled'); - }); - } - - QueryBuilder crIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'crId'); - }); - } - - QueryBuilder custIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'custId'); - }); - } - - QueryBuilder hqIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'hqId'); - }); - } - - QueryBuilder locZipProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'locZip'); - }); - } - - QueryBuilder - serverInstanceProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'serverInstance'); - }); - } - - QueryBuilder - serverVersionProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'serverVersion'); - }); - } - - QueryBuilder sidProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'sid'); - }); - } - - QueryBuilder usrIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'usrId'); - }); - } - - QueryBuilder vhtIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'vhtId'); - }); - } -} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -SessionStatus _$SessionStatusFromJson(Map json) => - SessionStatus() - ..custId = (json['cust_id'] as num).toInt() - ..hqId = (json['hq_id'] as num).toInt() - ..usrId = (json['usr_id'] as num).toInt() - ..crId = (json['cr_id'] as num).toInt() - ..sid = json['sid'] as String - ..vhtId = (json['vht_id'] as num).toInt() - ..locZip = json['loc_zip'] as String - ..serverVersion = json['server_version'] as String - ..serverInstance = json['server_instance'] as String - ..bwvEnabled = json['bwv'] as bool? ?? false; - -Map _$SessionStatusToJson(SessionStatus instance) => - { - 'cust_id': instance.custId, - 'hq_id': instance.hqId, - 'usr_id': instance.usrId, - 'cr_id': instance.crId, - 'sid': instance.sid, - 'vht_id': instance.vhtId, - 'loc_zip': instance.locZip, - 'server_version': instance.serverVersion, - 'server_instance': instance.serverInstance, - 'bwv': instance.bwvEnabled, - }; diff --git a/lib/model/status.dart b/lib/model/status.dart index 6f654e9..f37580a 100644 --- a/lib/model/status.dart +++ b/lib/model/status.dart @@ -1,35 +1,58 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; +import 'package:objectbox/objectbox.dart'; -part 'status.g.dart'; - -@collection -@JsonSerializable() +@Entity() class Status { - late Id? id; + @Id() + int id = 0; - late StatusPos pos; + late String posZip; + late String posArea; + late String posZipReal; Status(); - factory Status.fromJson(Map json) => _$StatusFromJson(json); + factory Status.fromJson(Map json) { + final status = Status(); + status.id = json['id'] as int? ?? 0; + final pos = json['pos'] as Map; + status.posZip = pos['zip'] as String; + status.posArea = pos['area'] as String; + status.posZipReal = pos['zip_real'] as String; + return status; + } - Map toJson() => _$StatusToJson(this); + Map toJson() { + return { + 'id': id, + 'pos': { + 'zip': posZip, + 'area': posArea, + 'zip_real': posZipReal, + }, + }; + } } -@embedded -@JsonSerializable() class StatusPos { late String zip; - late String area; - - @JsonKey(name:'zip_real') late String zipReal; StatusPos(); - factory StatusPos.fromJson(Map json) => _$StatusPosFromJson(json); + factory StatusPos.fromJson(Map json) { + final pos = StatusPos(); + pos.zip = json['zip'] as String; + pos.area = json['area'] as String; + pos.zipReal = json['zip_real'] as String; + return pos; + } - Map toJson() => _$StatusPosToJson(this); + Map toJson() { + return { + 'zip': zip, + 'area': area, + 'zip_real': zipReal, + }; + } } diff --git a/lib/model/status.g.dart b/lib/model/status.g.dart deleted file mode 100644 index 2e52bd8..0000000 --- a/lib/model/status.g.dart +++ /dev/null @@ -1,809 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'status.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetStatusCollection on Isar { - IsarCollection get status => this.collection(); -} - -const StatusSchema = CollectionSchema( - name: r'Status', - id: -8158262482337811485, - properties: { - r'pos': PropertySchema( - id: 0, - name: r'pos', - type: IsarType.object, - target: r'StatusPos', - ) - }, - estimateSize: _statusEstimateSize, - serialize: _statusSerialize, - deserialize: _statusDeserialize, - deserializeProp: _statusDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {r'StatusPos': StatusPosSchema}, - getId: _statusGetId, - getLinks: _statusGetLinks, - attach: _statusAttach, - version: '3.1.8', -); - -int _statusEstimateSize( - Status object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + - StatusPosSchema.estimateSize( - object.pos, allOffsets[StatusPos]!, allOffsets); - return bytesCount; -} - -void _statusSerialize( - Status object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeObject( - offsets[0], - allOffsets, - StatusPosSchema.serialize, - object.pos, - ); -} - -Status _statusDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = Status(); - object.id = id; - object.pos = reader.readObjectOrNull( - offsets[0], - StatusPosSchema.deserialize, - allOffsets, - ) ?? - StatusPos(); - return object; -} - -P _statusDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readObjectOrNull( - offset, - StatusPosSchema.deserialize, - allOffsets, - ) ?? - StatusPos()) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _statusGetId(Status object) { - return object.id ?? Isar.autoIncrement; -} - -List> _statusGetLinks(Status object) { - return []; -} - -void _statusAttach(IsarCollection col, Id id, Status object) { - object.id = id; -} - -extension StatusQueryWhereSort on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension StatusQueryWhere on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension StatusQueryFilter on QueryBuilder { - QueryBuilder idIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'id', - )); - }); - } - - QueryBuilder idIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'id', - )); - }); - } - - QueryBuilder idEqualTo(Id? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id? lower, - Id? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension StatusQueryObject on QueryBuilder { - QueryBuilder pos( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'pos'); - }); - } -} - -extension StatusQueryLinks on QueryBuilder {} - -extension StatusQuerySortBy on QueryBuilder {} - -extension StatusQuerySortThenBy on QueryBuilder { - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } -} - -extension StatusQueryWhereDistinct on QueryBuilder {} - -extension StatusQueryProperty on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder posProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'pos'); - }); - } -} - -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const StatusPosSchema = Schema( - name: r'StatusPos', - id: 5472875660639986729, - properties: { - r'area': PropertySchema( - id: 0, - name: r'area', - type: IsarType.string, - ), - r'zip': PropertySchema( - id: 1, - name: r'zip', - type: IsarType.string, - ), - r'zipReal': PropertySchema( - id: 2, - name: r'zipReal', - type: IsarType.string, - ) - }, - estimateSize: _statusPosEstimateSize, - serialize: _statusPosSerialize, - deserialize: _statusPosDeserialize, - deserializeProp: _statusPosDeserializeProp, -); - -int _statusPosEstimateSize( - StatusPos object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.area.length * 3; - bytesCount += 3 + object.zip.length * 3; - bytesCount += 3 + object.zipReal.length * 3; - return bytesCount; -} - -void _statusPosSerialize( - StatusPos object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.area); - writer.writeString(offsets[1], object.zip); - writer.writeString(offsets[2], object.zipReal); -} - -StatusPos _statusPosDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = StatusPos(); - object.area = reader.readString(offsets[0]); - object.zip = reader.readString(offsets[1]); - object.zipReal = reader.readString(offsets[2]); - return object; -} - -P _statusPosDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - case 1: - return (reader.readString(offset)) as P; - case 2: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension StatusPosQueryFilter - on QueryBuilder { - QueryBuilder areaEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'area', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'area', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'area', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder areaIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'area', - value: '', - )); - }); - } - - QueryBuilder areaIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'area', - value: '', - )); - }); - } - - QueryBuilder zipEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'zip', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'zip', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: '', - )); - }); - } - - QueryBuilder zipIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'zip', - value: '', - )); - }); - } - - QueryBuilder zipRealEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'zipReal', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'zipReal', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'zipReal', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipRealIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zipReal', - value: '', - )); - }); - } - - QueryBuilder - zipRealIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'zipReal', - value: '', - )); - }); - } -} - -extension StatusPosQueryObject - on QueryBuilder {} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Status _$StatusFromJson(Map json) => Status() - ..id = (json['id'] as num?)?.toInt() - ..pos = StatusPos.fromJson(json['pos'] as Map); - -Map _$StatusToJson(Status instance) => { - 'id': instance.id, - 'pos': instance.pos, - }; - -StatusPos _$StatusPosFromJson(Map json) => StatusPos() - ..zip = json['zip'] as String - ..area = json['area'] as String - ..zipReal = json['zip_real'] as String; - -Map _$StatusPosToJson(StatusPos instance) => { - 'zip': instance.zip, - 'area': instance.area, - 'zip_real': instance.zipReal, - }; diff --git a/lib/model/task_info.dart b/lib/model/task_info.dart index d051af9..d4f8417 100644 --- a/lib/model/task_info.dart +++ b/lib/model/task_info.dart @@ -1,24 +1,23 @@ -import 'package:isar/isar.dart'; +import 'package:objectbox/objectbox.dart'; import 'package:stadtbote/model/tour_task.dart'; import '../tools/util.dart'; -part 'task_info.g.dart'; - -@collection +@Entity() class TaskInfo { - late Id id; + @Id() + int id = 0; late int sId; - late String? additionalText; + String? additionalText; - late String? answer; + String? answer; late bool completed; - @ignore - late TourTask task; + @Transient() + TourTask? task; TaskInfo(); diff --git a/lib/model/task_info.g.dart b/lib/model/task_info.g.dart deleted file mode 100644 index 5a586df..0000000 --- a/lib/model/task_info.g.dart +++ /dev/null @@ -1,807 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'task_info.dart'; - -// ************************************************************************** -// IsarCollectionGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -extension GetTaskInfoCollection on Isar { - IsarCollection get taskInfos => this.collection(); -} - -const TaskInfoSchema = CollectionSchema( - name: r'TaskInfo', - id: 3341968002652240051, - properties: { - r'additionalText': PropertySchema( - id: 0, - name: r'additionalText', - type: IsarType.string, - ), - r'answer': PropertySchema( - id: 1, - name: r'answer', - type: IsarType.string, - ), - r'completed': PropertySchema( - id: 2, - name: r'completed', - type: IsarType.bool, - ), - r'sId': PropertySchema( - id: 3, - name: r'sId', - type: IsarType.long, - ) - }, - estimateSize: _taskInfoEstimateSize, - serialize: _taskInfoSerialize, - deserialize: _taskInfoDeserialize, - deserializeProp: _taskInfoDeserializeProp, - idName: r'id', - indexes: {}, - links: {}, - embeddedSchemas: {}, - getId: _taskInfoGetId, - getLinks: _taskInfoGetLinks, - attach: _taskInfoAttach, - version: '3.1.8', -); - -int _taskInfoEstimateSize( - TaskInfo object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.additionalText; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - { - final value = object.answer; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - return bytesCount; -} - -void _taskInfoSerialize( - TaskInfo object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.additionalText); - writer.writeString(offsets[1], object.answer); - writer.writeBool(offsets[2], object.completed); - writer.writeLong(offsets[3], object.sId); -} - -TaskInfo _taskInfoDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = TaskInfo(); - object.additionalText = reader.readStringOrNull(offsets[0]); - object.answer = reader.readStringOrNull(offsets[1]); - object.completed = reader.readBool(offsets[2]); - object.id = id; - object.sId = reader.readLong(offsets[3]); - return object; -} - -P _taskInfoDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readStringOrNull(offset)) as P; - case 1: - return (reader.readStringOrNull(offset)) as P; - case 2: - return (reader.readBool(offset)) as P; - case 3: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -Id _taskInfoGetId(TaskInfo object) { - return object.id; -} - -List> _taskInfoGetLinks(TaskInfo object) { - return []; -} - -void _taskInfoAttach(IsarCollection col, Id id, TaskInfo object) { - object.id = id; -} - -extension TaskInfoQueryWhereSort on QueryBuilder { - QueryBuilder anyId() { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(const IdWhereClause.any()); - }); - } -} - -extension TaskInfoQueryWhere on QueryBuilder { - QueryBuilder idEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: id, - upper: id, - )); - }); - } - - QueryBuilder idNotEqualTo(Id id) { - return QueryBuilder.apply(this, (query) { - if (query.whereSort == Sort.asc) { - return query - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ) - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ); - } else { - return query - .addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: false), - ) - .addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: false), - ); - } - }); - } - - QueryBuilder idGreaterThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.greaterThan(lower: id, includeLower: include), - ); - }); - } - - QueryBuilder idLessThan(Id id, - {bool include = false}) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause( - IdWhereClause.lessThan(upper: id, includeUpper: include), - ); - }); - } - - QueryBuilder idBetween( - Id lowerId, - Id upperId, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addWhereClause(IdWhereClause.between( - lower: lowerId, - includeLower: includeLower, - upper: upperId, - includeUpper: includeUpper, - )); - }); - } -} - -extension TaskInfoQueryFilter - on QueryBuilder { - QueryBuilder - additionalTextIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'additionalText', - )); - }); - } - - QueryBuilder - additionalTextIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'additionalText', - )); - }); - } - - QueryBuilder additionalTextEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'additionalText', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - additionalTextGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'additionalText', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - additionalTextLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'additionalText', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder additionalTextBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'additionalText', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - additionalTextStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'additionalText', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - additionalTextEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'additionalText', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - additionalTextContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'additionalText', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder additionalTextMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'additionalText', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - additionalTextIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'additionalText', - value: '', - )); - }); - } - - QueryBuilder - additionalTextIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'additionalText', - value: '', - )); - }); - } - - QueryBuilder answerIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'answer', - )); - }); - } - - QueryBuilder answerIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'answer', - )); - }); - } - - QueryBuilder answerEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'answer', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'answer', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'answer', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'answer', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'answer', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'answer', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'answer', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'answer', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder answerIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'answer', - value: '', - )); - }); - } - - QueryBuilder answerIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'answer', - value: '', - )); - }); - } - - QueryBuilder completedEqualTo( - bool value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'completed', - value: value, - )); - }); - } - - QueryBuilder idEqualTo(Id value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idGreaterThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idLessThan( - Id value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'id', - value: value, - )); - }); - } - - QueryBuilder idBetween( - Id lower, - Id upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'id', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder sIdEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'sId', - value: value, - )); - }); - } - - QueryBuilder sIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'sId', - value: value, - )); - }); - } - - QueryBuilder sIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'sId', - value: value, - )); - }); - } - - QueryBuilder sIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'sId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension TaskInfoQueryObject - on QueryBuilder {} - -extension TaskInfoQueryLinks - on QueryBuilder {} - -extension TaskInfoQuerySortBy on QueryBuilder { - QueryBuilder sortByAdditionalText() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'additionalText', Sort.asc); - }); - } - - QueryBuilder sortByAdditionalTextDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'additionalText', Sort.desc); - }); - } - - QueryBuilder sortByAnswer() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'answer', Sort.asc); - }); - } - - QueryBuilder sortByAnswerDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'answer', Sort.desc); - }); - } - - QueryBuilder sortByCompleted() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'completed', Sort.asc); - }); - } - - QueryBuilder sortByCompletedDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'completed', Sort.desc); - }); - } - - QueryBuilder sortBySId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sId', Sort.asc); - }); - } - - QueryBuilder sortBySIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sId', Sort.desc); - }); - } -} - -extension TaskInfoQuerySortThenBy - on QueryBuilder { - QueryBuilder thenByAdditionalText() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'additionalText', Sort.asc); - }); - } - - QueryBuilder thenByAdditionalTextDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'additionalText', Sort.desc); - }); - } - - QueryBuilder thenByAnswer() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'answer', Sort.asc); - }); - } - - QueryBuilder thenByAnswerDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'answer', Sort.desc); - }); - } - - QueryBuilder thenByCompleted() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'completed', Sort.asc); - }); - } - - QueryBuilder thenByCompletedDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'completed', Sort.desc); - }); - } - - QueryBuilder thenById() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.asc); - }); - } - - QueryBuilder thenByIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'id', Sort.desc); - }); - } - - QueryBuilder thenBySId() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sId', Sort.asc); - }); - } - - QueryBuilder thenBySIdDesc() { - return QueryBuilder.apply(this, (query) { - return query.addSortBy(r'sId', Sort.desc); - }); - } -} - -extension TaskInfoQueryWhereDistinct - on QueryBuilder { - QueryBuilder distinctByAdditionalText( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'additionalText', - caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByAnswer( - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'answer', caseSensitive: caseSensitive); - }); - } - - QueryBuilder distinctByCompleted() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'completed'); - }); - } - - QueryBuilder distinctBySId() { - return QueryBuilder.apply(this, (query) { - return query.addDistinctBy(r'sId'); - }); - } -} - -extension TaskInfoQueryProperty - on QueryBuilder { - QueryBuilder idProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'id'); - }); - } - - QueryBuilder additionalTextProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'additionalText'); - }); - } - - QueryBuilder answerProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'answer'); - }); - } - - QueryBuilder completedProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'completed'); - }); - } - - QueryBuilder sIdProperty() { - return QueryBuilder.apply(this, (query) { - return query.addPropertyName(r'sId'); - }); - } -} diff --git a/lib/model/tour_position.dart b/lib/model/tour_position.dart index 7bf3380..00ff66f 100644 --- a/lib/model/tour_position.dart +++ b/lib/model/tour_position.dart @@ -1,18 +1,21 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; - -part 'tour_position.g.dart'; - -@embedded -@JsonSerializable() class TourPosition { late double lat; late double long; TourPosition(); - factory TourPosition.fromJson(Map json) => _$TourPositionFromJson(json); + factory TourPosition.fromJson(Map json) { + final pos = TourPosition(); + pos.lat = (json['lat'] as num).toDouble(); + pos.long = (json['long'] as num).toDouble(); + return pos; + } - Map toJson() => _$TourPositionToJson(this); + Map toJson() { + return { + 'lat': lat, + 'long': long, + }; + } } diff --git a/lib/model/tour_position.g.dart b/lib/model/tour_position.g.dart deleted file mode 100644 index 903a2ac..0000000 --- a/lib/model/tour_position.g.dart +++ /dev/null @@ -1,224 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'tour_position.dart'; - -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const TourPositionSchema = Schema( - name: r'TourPosition', - id: -30020497969214738, - properties: { - r'lat': PropertySchema( - id: 0, - name: r'lat', - type: IsarType.double, - ), - r'long': PropertySchema( - id: 1, - name: r'long', - type: IsarType.double, - ) - }, - estimateSize: _tourPositionEstimateSize, - serialize: _tourPositionSerialize, - deserialize: _tourPositionDeserialize, - deserializeProp: _tourPositionDeserializeProp, -); - -int _tourPositionEstimateSize( - TourPosition object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - return bytesCount; -} - -void _tourPositionSerialize( - TourPosition object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeDouble(offsets[0], object.lat); - writer.writeDouble(offsets[1], object.long); -} - -TourPosition _tourPositionDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = TourPosition(); - object.lat = reader.readDouble(offsets[0]); - object.long = reader.readDouble(offsets[1]); - return object; -} - -P _tourPositionDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readDouble(offset)) as P; - case 1: - return (reader.readDouble(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension TourPositionQueryFilter - on QueryBuilder { - QueryBuilder latEqualTo( - double value, { - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder - latGreaterThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latLessThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latBetween( - double lower, - double upper, { - bool includeLower = true, - bool includeUpper = true, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'lat', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longEqualTo( - double value, { - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder - longGreaterThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longLessThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longBetween( - double lower, - double upper, { - bool includeLower = true, - bool includeUpper = true, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'long', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - epsilon: epsilon, - )); - }); - } -} - -extension TourPositionQueryObject - on QueryBuilder {} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -TourPosition _$TourPositionFromJson(Map json) => TourPosition() - ..lat = (json['lat'] as num).toDouble() - ..long = (json['long'] as num).toDouble(); - -Map _$TourPositionToJson(TourPosition instance) => - { - 'lat': instance.lat, - 'long': instance.long, - }; diff --git a/lib/model/tour_task.dart b/lib/model/tour_task.dart index f5ffc91..1cf451d 100644 --- a/lib/model/tour_task.dart +++ b/lib/model/tour_task.dart @@ -1,52 +1,84 @@ -import 'package:isar/isar.dart'; -import 'package:json_annotation/json_annotation.dart'; - -part 'tour_task.g.dart'; - -@embedded -@JsonSerializable() class TourTask { - @JsonKey(name: 's_id') late int sId; late int type; late String topic; - @JsonKey(name: 'opt', defaultValue: false) - late bool? opt; - @JsonKey(name: 'reenter', defaultValue: false) - late bool? reenter; - late int? min; - late int? max; - @JsonKey(name: 'max_len') - late int? maxLen; - late bool? rt; - late bool? track; - late String? txt; - @JsonKey(name: 'task_arrival') - late int? taskArrival; - @JsonKey(name: 'task_fin_work') - late int? taskFinWork; - late List? entries; + bool? opt; + bool? reenter; + int? min; + int? max; + int? maxLen; + bool? rt; + bool? track; + String? txt; + int? taskArrival; + int? taskFinWork; + List? entries; TourTask(); - factory TourTask.fromJson(Map json) => _$TourTaskFromJson(json); + factory TourTask.fromJson(Map json) { + final task = TourTask(); + task.sId = json['s_id'] as int; + task.type = json['type'] as int; + task.topic = json['topic'] as String; + task.opt = json['opt'] as bool? ?? false; + task.reenter = json['reenter'] as bool? ?? false; + task.min = json['min'] as int?; + task.max = json['max'] as int?; + task.maxLen = json['max_len'] as int?; + task.rt = json['rt'] as bool?; + task.track = json['track'] as bool?; + task.txt = json['txt'] as String?; + task.taskArrival = json['task_arrival'] as int?; + task.taskFinWork = json['task_fin_work'] as int?; + task.entries = json['entries'] != null + ? (json['entries'] as List) + .map((e) => TourEntry.fromJson(e as Map)) + .toList() + : null; + return task; + } - Map toJson() => _$TourTaskToJson(this); + Map toJson() { + return { + 's_id': sId, + 'type': type, + 'topic': topic, + 'opt': opt, + 'reenter': reenter, + 'min': min, + 'max': max, + 'max_len': maxLen, + 'rt': rt, + 'track': track, + 'txt': txt, + 'task_arrival': taskArrival, + 'task_fin_work': taskFinWork, + 'entries': entries?.map((e) => e.toJson()).toList(), + }; + } } -@embedded -@JsonSerializable() class TourEntry { late int code; - late String text; - - @JsonKey(name: 'query_remark') late bool queryRemark; TourEntry(); - factory TourEntry.fromJson(Map json) => _$TourEntryFromJson(json); + factory TourEntry.fromJson(Map json) { + final entry = TourEntry(); + entry.code = json['code'] as int; + entry.text = json['text'] as String; + entry.queryRemark = json['query_remark'] as bool; + return entry; + } - Map toJson() => _$TourEntryToJson(this); + Map toJson() { + return { + 'code': code, + 'text': text, + 'query_remark': queryRemark, + }; + } } \ No newline at end of file diff --git a/lib/model/tour_task.g.dart b/lib/model/tour_task.g.dart deleted file mode 100644 index ccab7d0..0000000 --- a/lib/model/tour_task.g.dart +++ /dev/null @@ -1,1502 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'tour_task.dart'; - -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const TourTaskSchema = Schema( - name: r'TourTask', - id: -3019997418839113825, - properties: { - r'entries': PropertySchema( - id: 0, - name: r'entries', - type: IsarType.objectList, - target: r'TourEntry', - ), - r'max': PropertySchema( - id: 1, - name: r'max', - type: IsarType.long, - ), - r'maxLen': PropertySchema( - id: 2, - name: r'maxLen', - type: IsarType.long, - ), - r'min': PropertySchema( - id: 3, - name: r'min', - type: IsarType.long, - ), - r'opt': PropertySchema( - id: 4, - name: r'opt', - type: IsarType.bool, - ), - r'reenter': PropertySchema( - id: 5, - name: r'reenter', - type: IsarType.bool, - ), - r'rt': PropertySchema( - id: 6, - name: r'rt', - type: IsarType.bool, - ), - r'sId': PropertySchema( - id: 7, - name: r'sId', - type: IsarType.long, - ), - r'taskArrival': PropertySchema( - id: 8, - name: r'taskArrival', - type: IsarType.long, - ), - r'taskFinWork': PropertySchema( - id: 9, - name: r'taskFinWork', - type: IsarType.long, - ), - r'topic': PropertySchema( - id: 10, - name: r'topic', - type: IsarType.string, - ), - r'track': PropertySchema( - id: 11, - name: r'track', - type: IsarType.bool, - ), - r'txt': PropertySchema( - id: 12, - name: r'txt', - type: IsarType.string, - ), - r'type': PropertySchema( - id: 13, - name: r'type', - type: IsarType.long, - ) - }, - estimateSize: _tourTaskEstimateSize, - serialize: _tourTaskSerialize, - deserialize: _tourTaskDeserialize, - deserializeProp: _tourTaskDeserializeProp, -); - -int _tourTaskEstimateSize( - TourTask object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final list = object.entries; - if (list != null) { - bytesCount += 3 + list.length * 3; - { - final offsets = allOffsets[TourEntry]!; - for (var i = 0; i < list.length; i++) { - final value = list[i]; - bytesCount += - TourEntrySchema.estimateSize(value, offsets, allOffsets); - } - } - } - } - bytesCount += 3 + object.topic.length * 3; - { - final value = object.txt; - if (value != null) { - bytesCount += 3 + value.length * 3; - } - } - return bytesCount; -} - -void _tourTaskSerialize( - TourTask object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeObjectList( - offsets[0], - allOffsets, - TourEntrySchema.serialize, - object.entries, - ); - writer.writeLong(offsets[1], object.max); - writer.writeLong(offsets[2], object.maxLen); - writer.writeLong(offsets[3], object.min); - writer.writeBool(offsets[4], object.opt); - writer.writeBool(offsets[5], object.reenter); - writer.writeBool(offsets[6], object.rt); - writer.writeLong(offsets[7], object.sId); - writer.writeLong(offsets[8], object.taskArrival); - writer.writeLong(offsets[9], object.taskFinWork); - writer.writeString(offsets[10], object.topic); - writer.writeBool(offsets[11], object.track); - writer.writeString(offsets[12], object.txt); - writer.writeLong(offsets[13], object.type); -} - -TourTask _tourTaskDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = TourTask(); - object.entries = reader.readObjectList( - offsets[0], - TourEntrySchema.deserialize, - allOffsets, - TourEntry(), - ); - object.max = reader.readLongOrNull(offsets[1]); - object.maxLen = reader.readLongOrNull(offsets[2]); - object.min = reader.readLongOrNull(offsets[3]); - object.opt = reader.readBoolOrNull(offsets[4]); - object.reenter = reader.readBoolOrNull(offsets[5]); - object.rt = reader.readBoolOrNull(offsets[6]); - object.sId = reader.readLong(offsets[7]); - object.taskArrival = reader.readLongOrNull(offsets[8]); - object.taskFinWork = reader.readLongOrNull(offsets[9]); - object.topic = reader.readString(offsets[10]); - object.track = reader.readBoolOrNull(offsets[11]); - object.txt = reader.readStringOrNull(offsets[12]); - object.type = reader.readLong(offsets[13]); - return object; -} - -P _tourTaskDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readObjectList( - offset, - TourEntrySchema.deserialize, - allOffsets, - TourEntry(), - )) as P; - case 1: - return (reader.readLongOrNull(offset)) as P; - case 2: - return (reader.readLongOrNull(offset)) as P; - case 3: - return (reader.readLongOrNull(offset)) as P; - case 4: - return (reader.readBoolOrNull(offset)) as P; - case 5: - return (reader.readBoolOrNull(offset)) as P; - case 6: - return (reader.readBoolOrNull(offset)) as P; - case 7: - return (reader.readLong(offset)) as P; - case 8: - return (reader.readLongOrNull(offset)) as P; - case 9: - return (reader.readLongOrNull(offset)) as P; - case 10: - return (reader.readString(offset)) as P; - case 11: - return (reader.readBoolOrNull(offset)) as P; - case 12: - return (reader.readStringOrNull(offset)) as P; - case 13: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension TourTaskQueryFilter - on QueryBuilder { - QueryBuilder entriesIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'entries', - )); - }); - } - - QueryBuilder entriesIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'entries', - )); - }); - } - - QueryBuilder entriesLengthEqualTo( - int length) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'entries', - length, - true, - length, - true, - ); - }); - } - - QueryBuilder entriesIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'entries', - 0, - true, - 0, - true, - ); - }); - } - - QueryBuilder entriesIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'entries', - 0, - false, - 999999, - true, - ); - }); - } - - QueryBuilder entriesLengthLessThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'entries', - 0, - true, - length, - include, - ); - }); - } - - QueryBuilder - entriesLengthGreaterThan( - int length, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'entries', - length, - include, - 999999, - true, - ); - }); - } - - QueryBuilder entriesLengthBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.listLength( - r'entries', - lower, - includeLower, - upper, - includeUpper, - ); - }); - } - - QueryBuilder maxIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'max', - )); - }); - } - - QueryBuilder maxIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'max', - )); - }); - } - - QueryBuilder maxEqualTo( - int? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'max', - value: value, - )); - }); - } - - QueryBuilder maxGreaterThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'max', - value: value, - )); - }); - } - - QueryBuilder maxLessThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'max', - value: value, - )); - }); - } - - QueryBuilder maxBetween( - int? lower, - int? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'max', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder maxLenIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'maxLen', - )); - }); - } - - QueryBuilder maxLenIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'maxLen', - )); - }); - } - - QueryBuilder maxLenEqualTo( - int? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'maxLen', - value: value, - )); - }); - } - - QueryBuilder maxLenGreaterThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'maxLen', - value: value, - )); - }); - } - - QueryBuilder maxLenLessThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'maxLen', - value: value, - )); - }); - } - - QueryBuilder maxLenBetween( - int? lower, - int? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'maxLen', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder minIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'min', - )); - }); - } - - QueryBuilder minIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'min', - )); - }); - } - - QueryBuilder minEqualTo( - int? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'min', - value: value, - )); - }); - } - - QueryBuilder minGreaterThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'min', - value: value, - )); - }); - } - - QueryBuilder minLessThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'min', - value: value, - )); - }); - } - - QueryBuilder minBetween( - int? lower, - int? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'min', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder optIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'opt', - )); - }); - } - - QueryBuilder optIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'opt', - )); - }); - } - - QueryBuilder optEqualTo( - bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'opt', - value: value, - )); - }); - } - - QueryBuilder reenterIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'reenter', - )); - }); - } - - QueryBuilder reenterIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'reenter', - )); - }); - } - - QueryBuilder reenterEqualTo( - bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'reenter', - value: value, - )); - }); - } - - QueryBuilder rtIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'rt', - )); - }); - } - - QueryBuilder rtIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'rt', - )); - }); - } - - QueryBuilder rtEqualTo( - bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'rt', - value: value, - )); - }); - } - - QueryBuilder sIdEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'sId', - value: value, - )); - }); - } - - QueryBuilder sIdGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'sId', - value: value, - )); - }); - } - - QueryBuilder sIdLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'sId', - value: value, - )); - }); - } - - QueryBuilder sIdBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'sId', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder taskArrivalIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'taskArrival', - )); - }); - } - - QueryBuilder - taskArrivalIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'taskArrival', - )); - }); - } - - QueryBuilder taskArrivalEqualTo( - int? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'taskArrival', - value: value, - )); - }); - } - - QueryBuilder - taskArrivalGreaterThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'taskArrival', - value: value, - )); - }); - } - - QueryBuilder taskArrivalLessThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'taskArrival', - value: value, - )); - }); - } - - QueryBuilder taskArrivalBetween( - int? lower, - int? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'taskArrival', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder taskFinWorkIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'taskFinWork', - )); - }); - } - - QueryBuilder - taskFinWorkIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'taskFinWork', - )); - }); - } - - QueryBuilder taskFinWorkEqualTo( - int? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'taskFinWork', - value: value, - )); - }); - } - - QueryBuilder - taskFinWorkGreaterThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'taskFinWork', - value: value, - )); - }); - } - - QueryBuilder taskFinWorkLessThan( - int? value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'taskFinWork', - value: value, - )); - }); - } - - QueryBuilder taskFinWorkBetween( - int? lower, - int? upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'taskFinWork', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder topicEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'topic', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'topic', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'topic', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder topicIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'topic', - value: '', - )); - }); - } - - QueryBuilder topicIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'topic', - value: '', - )); - }); - } - - QueryBuilder trackIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'track', - )); - }); - } - - QueryBuilder trackIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'track', - )); - }); - } - - QueryBuilder trackEqualTo( - bool? value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'track', - value: value, - )); - }); - } - - QueryBuilder txtIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'txt', - )); - }); - } - - QueryBuilder txtIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'txt', - )); - }); - } - - QueryBuilder txtEqualTo( - String? value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'txt', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtGreaterThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'txt', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtLessThan( - String? value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'txt', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtBetween( - String? lower, - String? upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'txt', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'txt', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'txt', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'txt', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'txt', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder txtIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'txt', - value: '', - )); - }); - } - - QueryBuilder txtIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'txt', - value: '', - )); - }); - } - - QueryBuilder typeEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'type', - value: value, - )); - }); - } - - QueryBuilder typeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'type', - value: value, - )); - }); - } - - QueryBuilder typeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'type', - value: value, - )); - }); - } - - QueryBuilder typeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'type', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension TourTaskQueryObject - on QueryBuilder { - QueryBuilder entriesElement( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'entries'); - }); - } -} - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const TourEntrySchema = Schema( - name: r'TourEntry', - id: 5357864103781579158, - properties: { - r'code': PropertySchema( - id: 0, - name: r'code', - type: IsarType.long, - ), - r'queryRemark': PropertySchema( - id: 1, - name: r'queryRemark', - type: IsarType.bool, - ), - r'text': PropertySchema( - id: 2, - name: r'text', - type: IsarType.string, - ) - }, - estimateSize: _tourEntryEstimateSize, - serialize: _tourEntrySerialize, - deserialize: _tourEntryDeserialize, - deserializeProp: _tourEntryDeserializeProp, -); - -int _tourEntryEstimateSize( - TourEntry object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.text.length * 3; - return bytesCount; -} - -void _tourEntrySerialize( - TourEntry object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeLong(offsets[0], object.code); - writer.writeBool(offsets[1], object.queryRemark); - writer.writeString(offsets[2], object.text); -} - -TourEntry _tourEntryDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = TourEntry(); - object.code = reader.readLong(offsets[0]); - object.queryRemark = reader.readBool(offsets[1]); - object.text = reader.readString(offsets[2]); - return object; -} - -P _tourEntryDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readLong(offset)) as P; - case 1: - return (reader.readBool(offset)) as P; - case 2: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension TourEntryQueryFilter - on QueryBuilder { - QueryBuilder codeEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'code', - value: value, - )); - }); - } - - QueryBuilder codeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'code', - value: value, - )); - }); - } - - QueryBuilder codeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'code', - value: value, - )); - }); - } - - QueryBuilder codeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'code', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder queryRemarkEqualTo( - bool value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'queryRemark', - value: value, - )); - }); - } - - QueryBuilder textEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'text', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'text', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'text', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder textIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'text', - value: '', - )); - }); - } - - QueryBuilder textIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'text', - value: '', - )); - }); - } -} - -extension TourEntryQueryObject - on QueryBuilder {} - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -TourTask _$TourTaskFromJson(Map json) => TourTask() - ..sId = (json['s_id'] as num).toInt() - ..type = (json['type'] as num).toInt() - ..topic = json['topic'] as String - ..opt = json['opt'] as bool? ?? false - ..reenter = json['reenter'] as bool? ?? false - ..min = (json['min'] as num?)?.toInt() - ..max = (json['max'] as num?)?.toInt() - ..maxLen = (json['max_len'] as num?)?.toInt() - ..rt = json['rt'] as bool? - ..track = json['track'] as bool? - ..txt = json['txt'] as String? - ..taskArrival = (json['task_arrival'] as num?)?.toInt() - ..taskFinWork = (json['task_fin_work'] as num?)?.toInt() - ..entries = (json['entries'] as List?) - ?.map((e) => TourEntry.fromJson(e as Map)) - .toList(); - -Map _$TourTaskToJson(TourTask instance) => { - 's_id': instance.sId, - 'type': instance.type, - 'topic': instance.topic, - 'opt': instance.opt, - 'reenter': instance.reenter, - 'min': instance.min, - 'max': instance.max, - 'max_len': instance.maxLen, - 'rt': instance.rt, - 'track': instance.track, - 'txt': instance.txt, - 'task_arrival': instance.taskArrival, - 'task_fin_work': instance.taskFinWork, - 'entries': instance.entries, - }; - -TourEntry _$TourEntryFromJson(Map json) => TourEntry() - ..code = (json['code'] as num).toInt() - ..text = json['text'] as String - ..queryRemark = json['query_remark'] as bool; - -Map _$TourEntryToJson(TourEntry instance) => { - 'code': instance.code, - 'text': instance.text, - 'query_remark': instance.queryRemark, - }; diff --git a/lib/network_messages/device_log_response.dart b/lib/network_messages/device_log_response.dart index 44ed022..46e10c9 100644 --- a/lib/network_messages/device_log_response.dart +++ b/lib/network_messages/device_log_response.dart @@ -1,15 +1,33 @@ -import 'package:json_annotation/json_annotation.dart'; import 'package:stadtbote/model/log_entry.dart'; -part 'device_log_response.g.dart'; - -@JsonSerializable() class DeviceLogResponse { late List entries; DeviceLogResponse(); - Map toJson() => _$DeviceLogResponseToJson(this); + Map toJson() { + return { + 'entries': entries.map((e) => { + 'id': e.id, + 'time': e.time.millisecondsSinceEpoch, + 'severity': e.severity, + 'message': e.text, + }).toList(), + }; + } - factory DeviceLogResponse.fromJson(Map json) => _$DeviceLogResponseFromJson(json); + factory DeviceLogResponse.fromJson(Map json) { + final response = DeviceLogResponse(); + response.entries = (json['entries'] as List) + .map((e) { + final entry = LogEntry(); + entry.id = e['id'] as int? ?? 0; + entry.time = DateTime.fromMillisecondsSinceEpoch(e['time'] as int); + entry.severity = e['severity'] as int; + entry.text = e['message'] as String; + return entry; + }) + .toList(); + return response; + } } diff --git a/lib/network_messages/device_log_response.g.dart b/lib/network_messages/device_log_response.g.dart deleted file mode 100644 index afd2517..0000000 --- a/lib/network_messages/device_log_response.g.dart +++ /dev/null @@ -1,18 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'device_log_response.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -DeviceLogResponse _$DeviceLogResponseFromJson(Map json) => - DeviceLogResponse() - ..entries = (json['entries'] as List) - .map((e) => LogEntry.fromJson(e as Map)) - .toList(); - -Map _$DeviceLogResponseToJson(DeviceLogResponse instance) => - { - 'entries': instance.entries, - }; diff --git a/lib/network_messages/fin_task_message.dart b/lib/network_messages/fin_task_message.dart index 7f83537..6a2f1df 100644 --- a/lib/network_messages/fin_task_message.dart +++ b/lib/network_messages/fin_task_message.dart @@ -1,4 +1,3 @@ -import 'package:isar/isar.dart'; import 'package:json_annotation/json_annotation.dart'; part 'fin_task_message.g.dart'; @@ -44,7 +43,6 @@ class Task { Map toJson() => _$TaskToJson(this); } -@embedded @JsonSerializable() class FinTaskPos { late int time; diff --git a/lib/network_messages/fin_task_message.g.dart b/lib/network_messages/fin_task_message.g.dart index 32e20b8..71c81a3 100644 --- a/lib/network_messages/fin_task_message.g.dart +++ b/lib/network_messages/fin_task_message.g.dart @@ -2,335 +2,6 @@ part of 'fin_task_message.dart'; -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const FinTaskPosSchema = Schema( - name: r'FinTaskPos', - id: 7757904122564928017, - properties: { - r'acc': PropertySchema( - id: 0, - name: r'acc', - type: IsarType.long, - ), - r'lat': PropertySchema( - id: 1, - name: r'lat', - type: IsarType.double, - ), - r'long': PropertySchema( - id: 2, - name: r'long', - type: IsarType.double, - ), - r'time': PropertySchema( - id: 3, - name: r'time', - type: IsarType.long, - ) - }, - estimateSize: _finTaskPosEstimateSize, - serialize: _finTaskPosSerialize, - deserialize: _finTaskPosDeserialize, - deserializeProp: _finTaskPosDeserializeProp, -); - -int _finTaskPosEstimateSize( - FinTaskPos object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - return bytesCount; -} - -void _finTaskPosSerialize( - FinTaskPos object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeLong(offsets[0], object.acc); - writer.writeDouble(offsets[1], object.lat); - writer.writeDouble(offsets[2], object.long); - writer.writeLong(offsets[3], object.time); -} - -FinTaskPos _finTaskPosDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = FinTaskPos(); - object.acc = reader.readLong(offsets[0]); - object.lat = reader.readDouble(offsets[1]); - object.long = reader.readDouble(offsets[2]); - object.time = reader.readLong(offsets[3]); - return object; -} - -P _finTaskPosDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readLong(offset)) as P; - case 1: - return (reader.readDouble(offset)) as P; - case 2: - return (reader.readDouble(offset)) as P; - case 3: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension FinTaskPosQueryFilter - on QueryBuilder { - QueryBuilder accEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'acc', - value: value, - )); - }); - } - - QueryBuilder accGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'acc', - value: value, - )); - }); - } - - QueryBuilder accLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'acc', - value: value, - )); - }); - } - - QueryBuilder accBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'acc', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder latEqualTo( - double value, { - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latGreaterThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latLessThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latBetween( - double lower, - double upper, { - bool includeLower = true, - bool includeUpper = true, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'lat', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longEqualTo( - double value, { - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longGreaterThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longLessThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longBetween( - double lower, - double upper, { - bool includeLower = true, - bool includeUpper = true, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'long', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - epsilon: epsilon, - )); - }); - } - - QueryBuilder timeEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'time', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension FinTaskPosQueryObject - on QueryBuilder {} - // ************************************************************************** // JsonSerializableGenerator // ************************************************************************** diff --git a/lib/network_messages/set_desired_zip_message.dart b/lib/network_messages/set_desired_zip_message.dart index be9d8c5..273f129 100644 --- a/lib/network_messages/set_desired_zip_message.dart +++ b/lib/network_messages/set_desired_zip_message.dart @@ -1,9 +1,7 @@ -import 'package:isar/isar.dart'; import 'package:json_annotation/json_annotation.dart'; part 'set_desired_zip_message.g.dart'; -@embedded @JsonSerializable() class SetDesiredZipMessage { @JsonKey(name: "desired_zip") diff --git a/lib/network_messages/set_desired_zip_message.g.dart b/lib/network_messages/set_desired_zip_message.g.dart index d3227a6..1d6d394 100644 --- a/lib/network_messages/set_desired_zip_message.g.dart +++ b/lib/network_messages/set_desired_zip_message.g.dart @@ -2,217 +2,6 @@ part of 'set_desired_zip_message.dart'; -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const SetDesiredZipMessageSchema = Schema( - name: r'SetDesiredZipMessage', - id: -4167972906487221318, - properties: { - r'desiredZip': PropertySchema( - id: 0, - name: r'desiredZip', - type: IsarType.string, - ) - }, - estimateSize: _setDesiredZipMessageEstimateSize, - serialize: _setDesiredZipMessageSerialize, - deserialize: _setDesiredZipMessageDeserialize, - deserializeProp: _setDesiredZipMessageDeserializeProp, -); - -int _setDesiredZipMessageEstimateSize( - SetDesiredZipMessage object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - bytesCount += 3 + object.desiredZip.length * 3; - return bytesCount; -} - -void _setDesiredZipMessageSerialize( - SetDesiredZipMessage object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeString(offsets[0], object.desiredZip); -} - -SetDesiredZipMessage _setDesiredZipMessageDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = SetDesiredZipMessage(); - object.desiredZip = reader.readString(offsets[0]); - return object; -} - -P _setDesiredZipMessageDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension SetDesiredZipMessageQueryFilter on QueryBuilder { - QueryBuilder desiredZipEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'desiredZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder desiredZipGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'desiredZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder desiredZipLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'desiredZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder desiredZipBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'desiredZip', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder desiredZipStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'desiredZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder desiredZipEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'desiredZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - desiredZipContains(String value, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'desiredZip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder - desiredZipMatches(String pattern, {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'desiredZip', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder desiredZipIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'desiredZip', - value: '', - )); - }); - } - - QueryBuilder desiredZipIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'desiredZip', - value: '', - )); - }); - } -} - -extension SetDesiredZipMessageQueryObject on QueryBuilder {} - // ************************************************************************** // JsonSerializableGenerator // ************************************************************************** diff --git a/lib/network_messages/zip_message.dart b/lib/network_messages/zip_message.dart index 48f276d..6a1d1b1 100644 --- a/lib/network_messages/zip_message.dart +++ b/lib/network_messages/zip_message.dart @@ -1,9 +1,7 @@ -import 'package:isar/isar.dart'; import 'package:json_annotation/json_annotation.dart'; part 'zip_message.g.dart'; -@embedded @JsonSerializable() class ZipSetPos { late String zip; @@ -17,7 +15,6 @@ class ZipSetPos { Map toJson() => _$ZipSetPosToJson(this); } -@embedded @JsonSerializable() class ZipTrack { late int time; @@ -31,7 +28,6 @@ class ZipTrack { Map toJson() => _$ZipTrackToJson(this); } -@embedded @JsonSerializable() class ZipTrackPos { late double lat; diff --git a/lib/network_messages/zip_message.g.dart b/lib/network_messages/zip_message.g.dart index 5130a66..14b6c50 100644 --- a/lib/network_messages/zip_message.g.dart +++ b/lib/network_messages/zip_message.g.dart @@ -2,700 +2,6 @@ part of 'zip_message.dart'; -// ************************************************************************** -// IsarEmbeddedGenerator -// ************************************************************************** - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const ZipSetPosSchema = Schema( - name: r'ZipSetPos', - id: 2736271830323112702, - properties: { - r'track': PropertySchema( - id: 0, - name: r'track', - type: IsarType.object, - target: r'ZipTrack', - ), - r'zip': PropertySchema( - id: 1, - name: r'zip', - type: IsarType.string, - ) - }, - estimateSize: _zipSetPosEstimateSize, - serialize: _zipSetPosSerialize, - deserialize: _zipSetPosDeserialize, - deserializeProp: _zipSetPosDeserializeProp, -); - -int _zipSetPosEstimateSize( - ZipSetPos object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.track; - if (value != null) { - bytesCount += 3 + - ZipTrackSchema.estimateSize(value, allOffsets[ZipTrack]!, allOffsets); - } - } - bytesCount += 3 + object.zip.length * 3; - return bytesCount; -} - -void _zipSetPosSerialize( - ZipSetPos object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeObject( - offsets[0], - allOffsets, - ZipTrackSchema.serialize, - object.track, - ); - writer.writeString(offsets[1], object.zip); -} - -ZipSetPos _zipSetPosDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = ZipSetPos(); - object.track = reader.readObjectOrNull( - offsets[0], - ZipTrackSchema.deserialize, - allOffsets, - ); - object.zip = reader.readString(offsets[1]); - return object; -} - -P _zipSetPosDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readObjectOrNull( - offset, - ZipTrackSchema.deserialize, - allOffsets, - )) as P; - case 1: - return (reader.readString(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension ZipSetPosQueryFilter - on QueryBuilder { - QueryBuilder trackIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'track', - )); - }); - } - - QueryBuilder trackIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'track', - )); - }); - } - - QueryBuilder zipEqualTo( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipGreaterThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipLessThan( - String value, { - bool include = false, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipBetween( - String lower, - String upper, { - bool includeLower = true, - bool includeUpper = true, - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'zip', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipStartsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.startsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipEndsWith( - String value, { - bool caseSensitive = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.endsWith( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipContains( - String value, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.contains( - property: r'zip', - value: value, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipMatches( - String pattern, - {bool caseSensitive = true}) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.matches( - property: r'zip', - wildcard: pattern, - caseSensitive: caseSensitive, - )); - }); - } - - QueryBuilder zipIsEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'zip', - value: '', - )); - }); - } - - QueryBuilder zipIsNotEmpty() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - property: r'zip', - value: '', - )); - }); - } -} - -extension ZipSetPosQueryObject - on QueryBuilder { - QueryBuilder track( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'track'); - }); - } -} - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const ZipTrackSchema = Schema( - name: r'ZipTrack', - id: 8605425681395793610, - properties: { - r'pos': PropertySchema( - id: 0, - name: r'pos', - type: IsarType.object, - target: r'ZipTrackPos', - ), - r'time': PropertySchema( - id: 1, - name: r'time', - type: IsarType.long, - ) - }, - estimateSize: _zipTrackEstimateSize, - serialize: _zipTrackSerialize, - deserialize: _zipTrackDeserialize, - deserializeProp: _zipTrackDeserializeProp, -); - -int _zipTrackEstimateSize( - ZipTrack object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - { - final value = object.pos; - if (value != null) { - bytesCount += 3 + - ZipTrackPosSchema.estimateSize( - value, allOffsets[ZipTrackPos]!, allOffsets); - } - } - return bytesCount; -} - -void _zipTrackSerialize( - ZipTrack object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeObject( - offsets[0], - allOffsets, - ZipTrackPosSchema.serialize, - object.pos, - ); - writer.writeLong(offsets[1], object.time); -} - -ZipTrack _zipTrackDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = ZipTrack(); - object.pos = reader.readObjectOrNull( - offsets[0], - ZipTrackPosSchema.deserialize, - allOffsets, - ); - object.time = reader.readLong(offsets[1]); - return object; -} - -P _zipTrackDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readObjectOrNull( - offset, - ZipTrackPosSchema.deserialize, - allOffsets, - )) as P; - case 1: - return (reader.readLong(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension ZipTrackQueryFilter - on QueryBuilder { - QueryBuilder posIsNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNull( - property: r'pos', - )); - }); - } - - QueryBuilder posIsNotNull() { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(const FilterCondition.isNotNull( - property: r'pos', - )); - }); - } - - QueryBuilder timeEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'time', - value: value, - )); - }); - } - - QueryBuilder timeBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'time', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } -} - -extension ZipTrackQueryObject - on QueryBuilder { - QueryBuilder pos( - FilterQuery q) { - return QueryBuilder.apply(this, (query) { - return query.object(q, r'pos'); - }); - } -} - -// coverage:ignore-file -// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types - -const ZipTrackPosSchema = Schema( - name: r'ZipTrackPos', - id: 7837584470752293488, - properties: { - r'acc': PropertySchema( - id: 0, - name: r'acc', - type: IsarType.long, - ), - r'lat': PropertySchema( - id: 1, - name: r'lat', - type: IsarType.double, - ), - r'long': PropertySchema( - id: 2, - name: r'long', - type: IsarType.double, - ) - }, - estimateSize: _zipTrackPosEstimateSize, - serialize: _zipTrackPosSerialize, - deserialize: _zipTrackPosDeserialize, - deserializeProp: _zipTrackPosDeserializeProp, -); - -int _zipTrackPosEstimateSize( - ZipTrackPos object, - List offsets, - Map> allOffsets, -) { - var bytesCount = offsets.last; - return bytesCount; -} - -void _zipTrackPosSerialize( - ZipTrackPos object, - IsarWriter writer, - List offsets, - Map> allOffsets, -) { - writer.writeLong(offsets[0], object.acc); - writer.writeDouble(offsets[1], object.lat); - writer.writeDouble(offsets[2], object.long); -} - -ZipTrackPos _zipTrackPosDeserialize( - Id id, - IsarReader reader, - List offsets, - Map> allOffsets, -) { - final object = ZipTrackPos(); - object.acc = reader.readLong(offsets[0]); - object.lat = reader.readDouble(offsets[1]); - object.long = reader.readDouble(offsets[2]); - return object; -} - -P _zipTrackPosDeserializeProp

( - IsarReader reader, - int propertyId, - int offset, - Map> allOffsets, -) { - switch (propertyId) { - case 0: - return (reader.readLong(offset)) as P; - case 1: - return (reader.readDouble(offset)) as P; - case 2: - return (reader.readDouble(offset)) as P; - default: - throw IsarError('Unknown property with id $propertyId'); - } -} - -extension ZipTrackPosQueryFilter - on QueryBuilder { - QueryBuilder accEqualTo( - int value) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'acc', - value: value, - )); - }); - } - - QueryBuilder accGreaterThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'acc', - value: value, - )); - }); - } - - QueryBuilder accLessThan( - int value, { - bool include = false, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'acc', - value: value, - )); - }); - } - - QueryBuilder accBetween( - int lower, - int upper, { - bool includeLower = true, - bool includeUpper = true, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'acc', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - )); - }); - } - - QueryBuilder latEqualTo( - double value, { - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latGreaterThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latLessThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'lat', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder latBetween( - double lower, - double upper, { - bool includeLower = true, - bool includeUpper = true, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'lat', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longEqualTo( - double value, { - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.equalTo( - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longGreaterThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.greaterThan( - include: include, - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longLessThan( - double value, { - bool include = false, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.lessThan( - include: include, - property: r'long', - value: value, - epsilon: epsilon, - )); - }); - } - - QueryBuilder longBetween( - double lower, - double upper, { - bool includeLower = true, - bool includeUpper = true, - double epsilon = Query.epsilon, - }) { - return QueryBuilder.apply(this, (query) { - return query.addFilterCondition(FilterCondition.between( - property: r'long', - lower: lower, - includeLower: includeLower, - upper: upper, - includeUpper: includeUpper, - epsilon: epsilon, - )); - }); - } -} - -extension ZipTrackPosQueryObject - on QueryBuilder {} - // ************************************************************************** // JsonSerializableGenerator // ************************************************************************** diff --git a/lib/objectbox-model.json b/lib/objectbox-model.json new file mode 100644 index 0000000..9ac5b58 --- /dev/null +++ b/lib/objectbox-model.json @@ -0,0 +1,398 @@ +{ + "_note1": "KEEP THIS FILE! Check it into a version control system (VCS) like git.", + "_note2": "ObjectBox manages crucial IDs for your object model. See docs for details.", + "_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.", + "entities": [ + { + "id": "2:1900005481935470756", + "lastPropertyId": "4:4315208696498141362", + "name": "EnqueuedMessage", + "properties": [ + { + "id": "1:3300983318147351068", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:9210049710668674502", + "name": "messageId", + "type": 9 + }, + { + "id": "3:7408744652169267115", + "name": "topic", + "type": 9 + }, + { + "id": "4:4315208696498141362", + "name": "payload", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "3:808686831791135454", + "lastPropertyId": "11:3214338916427673014", + "name": "Job", + "properties": [ + { + "id": "1:5216786081620356305", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:8894906213962654908", + "name": "ver", + "type": 9 + }, + { + "id": "3:3303839163899107532", + "name": "state", + "type": 6 + }, + { + "id": "4:3119487970513925946", + "name": "crFilter", + "type": 9 + }, + { + "id": "5:4732141596159047170", + "name": "ordertime", + "type": 6 + }, + { + "id": "6:1449947228203387059", + "name": "offsWarn", + "type": 6 + }, + { + "id": "7:3209886298748159414", + "name": "global", + "type": 1 + }, + { + "id": "8:6098449484765014411", + "name": "vhtId", + "type": 6 + }, + { + "id": "9:1076725124291766663", + "name": "rem", + "type": 9 + }, + { + "id": "10:3500399465824083528", + "name": "delayOrderTime", + "type": 6 + }, + { + "id": "11:3214338916427673014", + "name": "toursJson", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "4:8465470793923038042", + "lastPropertyId": "4:946656881802398278", + "name": "LocationStatus", + "properties": [ + { + "id": "1:7878463571761872972", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:5068730443811682471", + "name": "zip", + "type": 9 + }, + { + "id": "3:2759928435998483383", + "name": "area", + "type": 9 + }, + { + "id": "4:946656881802398278", + "name": "zipReal", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "5:2550695273986067070", + "lastPropertyId": "4:25366889950650452", + "name": "LogEntry", + "properties": [ + { + "id": "1:7926124814316455592", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:7429096942006040633", + "name": "time", + "type": 10 + }, + { + "id": "3:142738454977074579", + "name": "severity", + "type": 6 + }, + { + "id": "4:25366889950650452", + "name": "text", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "6:8578494735294491413", + "lastPropertyId": "4:8471947406218406695", + "name": "Picture", + "properties": [ + { + "id": "1:8233658715755176189", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:3598678677730019293", + "name": "tourId", + "type": 6 + }, + { + "id": "3:8439819560525061668", + "name": "number", + "type": 6 + }, + { + "id": "4:8471947406218406695", + "name": "data", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "7:2548574384262878250", + "lastPropertyId": "2:1452725296922082150", + "name": "Ranking", + "properties": [ + { + "id": "1:7118038767191691106", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:1452725296922082150", + "name": "ranksJson", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "8:2017786340054665973", + "lastPropertyId": "11:3261302622742923576", + "name": "SessionStatus", + "properties": [ + { + "id": "1:3031533826735683075", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:7909042823552092798", + "name": "custId", + "type": 6 + }, + { + "id": "3:7042631773737541316", + "name": "hqId", + "type": 6 + }, + { + "id": "4:2110246729553520570", + "name": "usrId", + "type": 6 + }, + { + "id": "5:1816167905802287907", + "name": "crId", + "type": 6 + }, + { + "id": "6:6893748738418511496", + "name": "sid", + "type": 9 + }, + { + "id": "7:5132625371004843897", + "name": "vhtId", + "type": 6 + }, + { + "id": "8:497003757522498160", + "name": "locZip", + "type": 9 + }, + { + "id": "9:7881671035561328160", + "name": "serverVersion", + "type": 9 + }, + { + "id": "10:8539036586265341170", + "name": "serverInstance", + "type": 9 + }, + { + "id": "11:3261302622742923576", + "name": "bwvEnabled", + "type": 1 + } + ], + "relations": [] + }, + { + "id": "9:3249643184099511839", + "lastPropertyId": "4:4970112377686786436", + "name": "Status", + "properties": [ + { + "id": "1:7475926067533914770", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:3333419739867469217", + "name": "posZip", + "type": 9 + }, + { + "id": "3:7999157864794363157", + "name": "posArea", + "type": 9 + }, + { + "id": "4:4970112377686786436", + "name": "posZipReal", + "type": 9 + } + ], + "relations": [] + }, + { + "id": "11:8606238749478059367", + "lastPropertyId": "6:7798301556204918939", + "name": "ChatMessage", + "properties": [ + { + "id": "1:3236243497308902958", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:1689142031630531044", + "name": "time", + "type": 6 + }, + { + "id": "3:9168654785572108691", + "name": "from", + "type": 9 + }, + { + "id": "4:3167039386322657979", + "name": "subj", + "type": 9 + }, + { + "id": "5:371212500165499194", + "name": "text", + "type": 9 + }, + { + "id": "6:7798301556204918939", + "name": "read", + "type": 1 + } + ], + "relations": [] + }, + { + "id": "12:4865606913057136676", + "lastPropertyId": "5:4858121848992922038", + "name": "TaskInfo", + "properties": [ + { + "id": "1:8874807593467526189", + "name": "id", + "type": 6, + "flags": 1 + }, + { + "id": "2:1555074981837956508", + "name": "sId", + "type": 6 + }, + { + "id": "3:4882275733695652364", + "name": "additionalText", + "type": 9 + }, + { + "id": "4:8255231557511579852", + "name": "answer", + "type": 9 + }, + { + "id": "5:4858121848992922038", + "name": "completed", + "type": 1 + } + ], + "relations": [] + } + ], + "lastEntityId": "12:4865606913057136676", + "lastIndexId": "0:0", + "lastRelationId": "0:0", + "lastSequenceId": "0:0", + "modelVersion": 5, + "modelVersionParserMinimum": 5, + "retiredEntityUids": [ + 3121960281516643928, + 3330049220205502332 + ], + "retiredIndexUids": [], + "retiredPropertyUids": [ + 2911299806708299572, + 5499360845675591736, + 6629677753597654195, + 2459198878504939029, + 1821648847924307341, + 2516901162497323279, + 7500431799407089850, + 3530187464938423960, + 2939471599149775609, + 4870701960967093484, + 9072329172508444422 + ], + "retiredRelationUids": [], + "version": 1 +} \ No newline at end of file diff --git a/lib/objectbox.g.dart b/lib/objectbox.g.dart new file mode 100644 index 0000000..3329218 --- /dev/null +++ b/lib/objectbox.g.dart @@ -0,0 +1,1282 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// This code was generated by ObjectBox. To update it run the generator again +// with `dart run build_runner build`. +// See also https://docs.objectbox.io/getting-started#generate-objectbox-code + +// ignore_for_file: camel_case_types, depend_on_referenced_packages +// coverage:ignore-file + +import 'dart:typed_data'; + +import 'package:flat_buffers/flat_buffers.dart' as fb; +import 'package:objectbox/internal.dart' + as obx_int; // generated code can access "internal" functionality +import 'package:objectbox/objectbox.dart' as obx; +import 'package:objectbox_flutter_libs/objectbox_flutter_libs.dart'; + +import 'model/chat_message.dart'; +import 'model/enqueued_message.dart'; +import 'model/job.dart'; +import 'model/location_status.dart'; +import 'model/log_entry.dart'; +import 'model/pictures.dart'; +import 'model/rank.dart'; +import 'model/session_status.dart'; +import 'model/status.dart'; +import 'model/task_info.dart'; + +export 'package:objectbox/objectbox.dart'; // so that callers only have to import this file + +final _entities = [ + obx_int.ModelEntity( + id: const obx_int.IdUid(2, 1900005481935470756), + name: 'EnqueuedMessage', + lastPropertyId: const obx_int.IdUid(4, 4315208696498141362), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 3300983318147351068), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 9210049710668674502), + name: 'messageId', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 7408744652169267115), + name: 'topic', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 4315208696498141362), + name: 'payload', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(3, 808686831791135454), + name: 'Job', + lastPropertyId: const obx_int.IdUid(11, 3214338916427673014), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 5216786081620356305), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 8894906213962654908), + name: 'ver', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 3303839163899107532), + name: 'state', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 3119487970513925946), + name: 'crFilter', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(5, 4732141596159047170), + name: 'ordertime', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(6, 1449947228203387059), + name: 'offsWarn', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(7, 3209886298748159414), + name: 'global', + type: 1, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(8, 6098449484765014411), + name: 'vhtId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(9, 1076725124291766663), + name: 'rem', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(10, 3500399465824083528), + name: 'delayOrderTime', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(11, 3214338916427673014), + name: 'toursJson', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(4, 8465470793923038042), + name: 'LocationStatus', + lastPropertyId: const obx_int.IdUid(4, 946656881802398278), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 7878463571761872972), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 5068730443811682471), + name: 'zip', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 2759928435998483383), + name: 'area', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 946656881802398278), + name: 'zipReal', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(5, 2550695273986067070), + name: 'LogEntry', + lastPropertyId: const obx_int.IdUid(4, 25366889950650452), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 7926124814316455592), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 7429096942006040633), + name: 'time', + type: 10, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 142738454977074579), + name: 'severity', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 25366889950650452), + name: 'text', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(6, 8578494735294491413), + name: 'Picture', + lastPropertyId: const obx_int.IdUid(4, 8471947406218406695), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 8233658715755176189), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 3598678677730019293), + name: 'tourId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 8439819560525061668), + name: 'number', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 8471947406218406695), + name: 'data', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(7, 2548574384262878250), + name: 'Ranking', + lastPropertyId: const obx_int.IdUid(2, 1452725296922082150), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 7118038767191691106), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 1452725296922082150), + name: 'ranksJson', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(8, 2017786340054665973), + name: 'SessionStatus', + lastPropertyId: const obx_int.IdUid(11, 3261302622742923576), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 3031533826735683075), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 7909042823552092798), + name: 'custId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 7042631773737541316), + name: 'hqId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 2110246729553520570), + name: 'usrId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(5, 1816167905802287907), + name: 'crId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(6, 6893748738418511496), + name: 'sid', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(7, 5132625371004843897), + name: 'vhtId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(8, 497003757522498160), + name: 'locZip', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(9, 7881671035561328160), + name: 'serverVersion', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(10, 8539036586265341170), + name: 'serverInstance', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(11, 3261302622742923576), + name: 'bwvEnabled', + type: 1, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(9, 3249643184099511839), + name: 'Status', + lastPropertyId: const obx_int.IdUid(4, 4970112377686786436), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 7475926067533914770), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 3333419739867469217), + name: 'posZip', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 7999157864794363157), + name: 'posArea', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 4970112377686786436), + name: 'posZipReal', + type: 9, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(11, 8606238749478059367), + name: 'ChatMessage', + lastPropertyId: const obx_int.IdUid(6, 7798301556204918939), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 3236243497308902958), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 1689142031630531044), + name: 'time', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 9168654785572108691), + name: 'from', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 3167039386322657979), + name: 'subj', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(5, 371212500165499194), + name: 'text', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(6, 7798301556204918939), + name: 'read', + type: 1, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), + obx_int.ModelEntity( + id: const obx_int.IdUid(12, 4865606913057136676), + name: 'TaskInfo', + lastPropertyId: const obx_int.IdUid(5, 4858121848992922038), + flags: 0, + properties: [ + obx_int.ModelProperty( + id: const obx_int.IdUid(1, 8874807593467526189), + name: 'id', + type: 6, + flags: 1, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(2, 1555074981837956508), + name: 'sId', + type: 6, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(3, 4882275733695652364), + name: 'additionalText', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(4, 8255231557511579852), + name: 'answer', + type: 9, + flags: 0, + ), + obx_int.ModelProperty( + id: const obx_int.IdUid(5, 4858121848992922038), + name: 'completed', + type: 1, + flags: 0, + ), + ], + relations: [], + backlinks: [], + ), +]; + +/// Shortcut for [obx.Store.new] that passes [getObjectBoxModel] and for Flutter +/// apps by default a [directory] using `defaultStoreDirectory()` from the +/// ObjectBox Flutter library. +/// +/// Note: for desktop apps it is recommended to specify a unique [directory]. +/// +/// See [obx.Store.new] for an explanation of all parameters. +/// +/// For Flutter apps, also calls `loadObjectBoxLibraryAndroidCompat()` from +/// the ObjectBox Flutter library to fix loading the native ObjectBox library +/// on Android 6 and older. +Future openStore({ + String? directory, + int? maxDBSizeInKB, + int? maxDataSizeInKB, + int? fileMode, + int? maxReaders, + bool queriesCaseSensitiveDefault = true, + String? macosApplicationGroup, +}) async { + await loadObjectBoxLibraryAndroidCompat(); + return obx.Store( + getObjectBoxModel(), + directory: directory ?? (await defaultStoreDirectory()).path, + maxDBSizeInKB: maxDBSizeInKB, + maxDataSizeInKB: maxDataSizeInKB, + fileMode: fileMode, + maxReaders: maxReaders, + queriesCaseSensitiveDefault: queriesCaseSensitiveDefault, + macosApplicationGroup: macosApplicationGroup, + ); +} + +/// Returns the ObjectBox model definition for this project for use with +/// [obx.Store.new]. +obx_int.ModelDefinition getObjectBoxModel() { + final model = obx_int.ModelInfo( + entities: _entities, + lastEntityId: const obx_int.IdUid(12, 4865606913057136676), + lastIndexId: const obx_int.IdUid(0, 0), + lastRelationId: const obx_int.IdUid(0, 0), + lastSequenceId: const obx_int.IdUid(0, 0), + retiredEntityUids: const [3121960281516643928, 3330049220205502332], + retiredIndexUids: const [], + retiredPropertyUids: const [ + 2911299806708299572, + 5499360845675591736, + 6629677753597654195, + 2459198878504939029, + 1821648847924307341, + 2516901162497323279, + 7500431799407089850, + 3530187464938423960, + 2939471599149775609, + 4870701960967093484, + 9072329172508444422, + ], + retiredRelationUids: const [], + modelVersion: 5, + modelVersionParserMinimum: 5, + version: 1, + ); + + final bindings = { + EnqueuedMessage: obx_int.EntityDefinition( + model: _entities[0], + toOneRelations: (EnqueuedMessage object) => [], + toManyRelations: (EnqueuedMessage object) => {}, + getId: (EnqueuedMessage object) => object.id, + setId: (EnqueuedMessage object, int id) { + object.id = id; + }, + objectToFB: (EnqueuedMessage object, fb.Builder fbb) { + final messageIdOffset = fbb.writeString(object.messageId); + final topicOffset = fbb.writeString(object.topic); + final payloadOffset = fbb.writeString(object.payload); + fbb.startTable(5); + fbb.addInt64(0, object.id); + fbb.addOffset(1, messageIdOffset); + fbb.addOffset(2, topicOffset); + fbb.addOffset(3, payloadOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = EnqueuedMessage() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..messageId = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 6, '') + ..topic = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 8, '') + ..payload = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 10, ''); + + return object; + }, + ), + Job: obx_int.EntityDefinition( + model: _entities[1], + toOneRelations: (Job object) => [], + toManyRelations: (Job object) => {}, + getId: (Job object) => object.id, + setId: (Job object, int id) { + object.id = id; + }, + objectToFB: (Job object, fb.Builder fbb) { + final verOffset = fbb.writeString(object.ver); + final crFilterOffset = object.crFilter == null + ? null + : fbb.writeString(object.crFilter!); + final remOffset = fbb.writeString(object.rem); + final toursJsonOffset = fbb.writeString(object.toursJson); + fbb.startTable(12); + fbb.addInt64(0, object.id); + fbb.addOffset(1, verOffset); + fbb.addInt64(2, object.state); + fbb.addOffset(3, crFilterOffset); + fbb.addInt64(4, object.ordertime); + fbb.addInt64(5, object.offsWarn); + fbb.addBool(6, object.global); + fbb.addInt64(7, object.vhtId); + fbb.addOffset(8, remOffset); + fbb.addInt64(9, object.delayOrderTime); + fbb.addOffset(10, toursJsonOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = Job() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..ver = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 6, '') + ..state = const fb.Int64Reader().vTableGet(buffer, rootOffset, 8, 0) + ..crFilter = const fb.StringReader( + asciiOptimization: true, + ).vTableGetNullable(buffer, rootOffset, 10) + ..ordertime = const fb.Int64Reader().vTableGet( + buffer, + rootOffset, + 12, + 0, + ) + ..offsWarn = const fb.Int64Reader().vTableGet( + buffer, + rootOffset, + 14, + 0, + ) + ..global = const fb.BoolReader().vTableGet( + buffer, + rootOffset, + 16, + false, + ) + ..vhtId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 18, 0) + ..rem = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 20, '') + ..delayOrderTime = const fb.Int64Reader().vTableGet( + buffer, + rootOffset, + 22, + 0, + ) + ..toursJson = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 24, ''); + + return object; + }, + ), + LocationStatus: obx_int.EntityDefinition( + model: _entities[2], + toOneRelations: (LocationStatus object) => [], + toManyRelations: (LocationStatus object) => {}, + getId: (LocationStatus object) => object.id, + setId: (LocationStatus object, int id) { + object.id = id; + }, + objectToFB: (LocationStatus object, fb.Builder fbb) { + final zipOffset = fbb.writeString(object.zip); + final areaOffset = fbb.writeString(object.area); + final zipRealOffset = fbb.writeString(object.zipReal); + fbb.startTable(5); + fbb.addInt64(0, object.id); + fbb.addOffset(1, zipOffset); + fbb.addOffset(2, areaOffset); + fbb.addOffset(3, zipRealOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = LocationStatus() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..zip = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 6, '') + ..area = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 8, '') + ..zipReal = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 10, ''); + + return object; + }, + ), + LogEntry: obx_int.EntityDefinition( + model: _entities[3], + toOneRelations: (LogEntry object) => [], + toManyRelations: (LogEntry object) => {}, + getId: (LogEntry object) => object.id, + setId: (LogEntry object, int id) { + object.id = id; + }, + objectToFB: (LogEntry object, fb.Builder fbb) { + final textOffset = fbb.writeString(object.text); + fbb.startTable(5); + fbb.addInt64(0, object.id); + fbb.addInt64(1, object.time.millisecondsSinceEpoch); + fbb.addInt64(2, object.severity); + fbb.addOffset(3, textOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = LogEntry() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..time = DateTime.fromMillisecondsSinceEpoch( + const fb.Int64Reader().vTableGet(buffer, rootOffset, 6, 0), + ) + ..severity = const fb.Int64Reader().vTableGet( + buffer, + rootOffset, + 8, + 0, + ) + ..text = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 10, ''); + + return object; + }, + ), + Picture: obx_int.EntityDefinition( + model: _entities[4], + toOneRelations: (Picture object) => [], + toManyRelations: (Picture object) => {}, + getId: (Picture object) => object.id, + setId: (Picture object, int id) { + object.id = id; + }, + objectToFB: (Picture object, fb.Builder fbb) { + final dataOffset = fbb.writeString(object.data); + fbb.startTable(5); + fbb.addInt64(0, object.id); + fbb.addInt64(1, object.tourId); + fbb.addInt64(2, object.number); + fbb.addOffset(3, dataOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = Picture() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..tourId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 6, 0) + ..number = const fb.Int64Reader().vTableGet(buffer, rootOffset, 8, 0) + ..data = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 10, ''); + + return object; + }, + ), + Ranking: obx_int.EntityDefinition( + model: _entities[5], + toOneRelations: (Ranking object) => [], + toManyRelations: (Ranking object) => {}, + getId: (Ranking object) => object.id, + setId: (Ranking object, int id) { + object.id = id; + }, + objectToFB: (Ranking object, fb.Builder fbb) { + final ranksJsonOffset = fbb.writeString(object.ranksJson); + fbb.startTable(3); + fbb.addInt64(0, object.id); + fbb.addOffset(1, ranksJsonOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = Ranking() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..ranksJson = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 6, ''); + + return object; + }, + ), + SessionStatus: obx_int.EntityDefinition( + model: _entities[6], + toOneRelations: (SessionStatus object) => [], + toManyRelations: (SessionStatus object) => {}, + getId: (SessionStatus object) => object.id, + setId: (SessionStatus object, int id) { + object.id = id; + }, + objectToFB: (SessionStatus object, fb.Builder fbb) { + final sidOffset = fbb.writeString(object.sid); + final locZipOffset = fbb.writeString(object.locZip); + final serverVersionOffset = fbb.writeString(object.serverVersion); + final serverInstanceOffset = fbb.writeString(object.serverInstance); + fbb.startTable(12); + fbb.addInt64(0, object.id); + fbb.addInt64(1, object.custId); + fbb.addInt64(2, object.hqId); + fbb.addInt64(3, object.usrId); + fbb.addInt64(4, object.crId); + fbb.addOffset(5, sidOffset); + fbb.addInt64(6, object.vhtId); + fbb.addOffset(7, locZipOffset); + fbb.addOffset(8, serverVersionOffset); + fbb.addOffset(9, serverInstanceOffset); + fbb.addBool(10, object.bwvEnabled); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = SessionStatus() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..custId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 6, 0) + ..hqId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 8, 0) + ..usrId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 10, 0) + ..crId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 12, 0) + ..sid = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 14, '') + ..vhtId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 16, 0) + ..locZip = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 18, '') + ..serverVersion = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 20, '') + ..serverInstance = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 22, '') + ..bwvEnabled = const fb.BoolReader().vTableGet( + buffer, + rootOffset, + 24, + false, + ); + + return object; + }, + ), + Status: obx_int.EntityDefinition( + model: _entities[7], + toOneRelations: (Status object) => [], + toManyRelations: (Status object) => {}, + getId: (Status object) => object.id, + setId: (Status object, int id) { + object.id = id; + }, + objectToFB: (Status object, fb.Builder fbb) { + final posZipOffset = fbb.writeString(object.posZip); + final posAreaOffset = fbb.writeString(object.posArea); + final posZipRealOffset = fbb.writeString(object.posZipReal); + fbb.startTable(5); + fbb.addInt64(0, object.id); + fbb.addOffset(1, posZipOffset); + fbb.addOffset(2, posAreaOffset); + fbb.addOffset(3, posZipRealOffset); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = Status() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..posZip = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 6, '') + ..posArea = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 8, '') + ..posZipReal = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 10, ''); + + return object; + }, + ), + ChatMessage: obx_int.EntityDefinition( + model: _entities[8], + toOneRelations: (ChatMessage object) => [], + toManyRelations: (ChatMessage object) => {}, + getId: (ChatMessage object) => object.id, + setId: (ChatMessage object, int id) { + object.id = id; + }, + objectToFB: (ChatMessage object, fb.Builder fbb) { + final fromOffset = fbb.writeString(object.from); + final subjOffset = fbb.writeString(object.subj); + final textOffset = fbb.writeString(object.text); + fbb.startTable(7); + fbb.addInt64(0, object.id); + fbb.addInt64(1, object.time); + fbb.addOffset(2, fromOffset); + fbb.addOffset(3, subjOffset); + fbb.addOffset(4, textOffset); + fbb.addBool(5, object.read); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = ChatMessage() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..time = const fb.Int64Reader().vTableGet(buffer, rootOffset, 6, 0) + ..from = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 8, '') + ..subj = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 10, '') + ..text = const fb.StringReader( + asciiOptimization: true, + ).vTableGet(buffer, rootOffset, 12, '') + ..read = const fb.BoolReader().vTableGet( + buffer, + rootOffset, + 14, + false, + ); + + return object; + }, + ), + TaskInfo: obx_int.EntityDefinition( + model: _entities[9], + toOneRelations: (TaskInfo object) => [], + toManyRelations: (TaskInfo object) => {}, + getId: (TaskInfo object) => object.id, + setId: (TaskInfo object, int id) { + object.id = id; + }, + objectToFB: (TaskInfo object, fb.Builder fbb) { + final additionalTextOffset = object.additionalText == null + ? null + : fbb.writeString(object.additionalText!); + final answerOffset = object.answer == null + ? null + : fbb.writeString(object.answer!); + fbb.startTable(6); + fbb.addInt64(0, object.id); + fbb.addInt64(1, object.sId); + fbb.addOffset(2, additionalTextOffset); + fbb.addOffset(3, answerOffset); + fbb.addBool(4, object.completed); + fbb.finish(fbb.endTable()); + return object.id; + }, + objectFromFB: (obx.Store store, ByteData fbData) { + final buffer = fb.BufferContext(fbData); + final rootOffset = buffer.derefObject(0); + + final object = TaskInfo() + ..id = const fb.Int64Reader().vTableGet(buffer, rootOffset, 4, 0) + ..sId = const fb.Int64Reader().vTableGet(buffer, rootOffset, 6, 0) + ..additionalText = const fb.StringReader( + asciiOptimization: true, + ).vTableGetNullable(buffer, rootOffset, 8) + ..answer = const fb.StringReader( + asciiOptimization: true, + ).vTableGetNullable(buffer, rootOffset, 10) + ..completed = const fb.BoolReader().vTableGet( + buffer, + rootOffset, + 12, + false, + ); + + return object; + }, + ), + }; + + return obx_int.ModelDefinition(model, bindings); +} + +/// [EnqueuedMessage] entity fields to define ObjectBox queries. +class EnqueuedMessage_ { + /// See [EnqueuedMessage.id]. + static final id = obx.QueryIntegerProperty( + _entities[0].properties[0], + ); + + /// See [EnqueuedMessage.messageId]. + static final messageId = obx.QueryStringProperty( + _entities[0].properties[1], + ); + + /// See [EnqueuedMessage.topic]. + static final topic = obx.QueryStringProperty( + _entities[0].properties[2], + ); + + /// See [EnqueuedMessage.payload]. + static final payload = obx.QueryStringProperty( + _entities[0].properties[3], + ); +} + +/// [Job] entity fields to define ObjectBox queries. +class Job_ { + /// See [Job.id]. + static final id = obx.QueryIntegerProperty(_entities[1].properties[0]); + + /// See [Job.ver]. + static final ver = obx.QueryStringProperty(_entities[1].properties[1]); + + /// See [Job.state]. + static final state = obx.QueryIntegerProperty( + _entities[1].properties[2], + ); + + /// See [Job.crFilter]. + static final crFilter = obx.QueryStringProperty( + _entities[1].properties[3], + ); + + /// See [Job.ordertime]. + static final ordertime = obx.QueryIntegerProperty( + _entities[1].properties[4], + ); + + /// See [Job.offsWarn]. + static final offsWarn = obx.QueryIntegerProperty( + _entities[1].properties[5], + ); + + /// See [Job.global]. + static final global = obx.QueryBooleanProperty( + _entities[1].properties[6], + ); + + /// See [Job.vhtId]. + static final vhtId = obx.QueryIntegerProperty( + _entities[1].properties[7], + ); + + /// See [Job.rem]. + static final rem = obx.QueryStringProperty(_entities[1].properties[8]); + + /// See [Job.delayOrderTime]. + static final delayOrderTime = obx.QueryIntegerProperty( + _entities[1].properties[9], + ); + + /// See [Job.toursJson]. + static final toursJson = obx.QueryStringProperty( + _entities[1].properties[10], + ); +} + +/// [LocationStatus] entity fields to define ObjectBox queries. +class LocationStatus_ { + /// See [LocationStatus.id]. + static final id = obx.QueryIntegerProperty( + _entities[2].properties[0], + ); + + /// See [LocationStatus.zip]. + static final zip = obx.QueryStringProperty( + _entities[2].properties[1], + ); + + /// See [LocationStatus.area]. + static final area = obx.QueryStringProperty( + _entities[2].properties[2], + ); + + /// See [LocationStatus.zipReal]. + static final zipReal = obx.QueryStringProperty( + _entities[2].properties[3], + ); +} + +/// [LogEntry] entity fields to define ObjectBox queries. +class LogEntry_ { + /// See [LogEntry.id]. + static final id = obx.QueryIntegerProperty( + _entities[3].properties[0], + ); + + /// See [LogEntry.time]. + static final time = obx.QueryDateProperty( + _entities[3].properties[1], + ); + + /// See [LogEntry.severity]. + static final severity = obx.QueryIntegerProperty( + _entities[3].properties[2], + ); + + /// See [LogEntry.text]. + static final text = obx.QueryStringProperty( + _entities[3].properties[3], + ); +} + +/// [Picture] entity fields to define ObjectBox queries. +class Picture_ { + /// See [Picture.id]. + static final id = obx.QueryIntegerProperty( + _entities[4].properties[0], + ); + + /// See [Picture.tourId]. + static final tourId = obx.QueryIntegerProperty( + _entities[4].properties[1], + ); + + /// See [Picture.number]. + static final number = obx.QueryIntegerProperty( + _entities[4].properties[2], + ); + + /// See [Picture.data]. + static final data = obx.QueryStringProperty( + _entities[4].properties[3], + ); +} + +/// [Ranking] entity fields to define ObjectBox queries. +class Ranking_ { + /// See [Ranking.id]. + static final id = obx.QueryIntegerProperty( + _entities[5].properties[0], + ); + + /// See [Ranking.ranksJson]. + static final ranksJson = obx.QueryStringProperty( + _entities[5].properties[1], + ); +} + +/// [SessionStatus] entity fields to define ObjectBox queries. +class SessionStatus_ { + /// See [SessionStatus.id]. + static final id = obx.QueryIntegerProperty( + _entities[6].properties[0], + ); + + /// See [SessionStatus.custId]. + static final custId = obx.QueryIntegerProperty( + _entities[6].properties[1], + ); + + /// See [SessionStatus.hqId]. + static final hqId = obx.QueryIntegerProperty( + _entities[6].properties[2], + ); + + /// See [SessionStatus.usrId]. + static final usrId = obx.QueryIntegerProperty( + _entities[6].properties[3], + ); + + /// See [SessionStatus.crId]. + static final crId = obx.QueryIntegerProperty( + _entities[6].properties[4], + ); + + /// See [SessionStatus.sid]. + static final sid = obx.QueryStringProperty( + _entities[6].properties[5], + ); + + /// See [SessionStatus.vhtId]. + static final vhtId = obx.QueryIntegerProperty( + _entities[6].properties[6], + ); + + /// See [SessionStatus.locZip]. + static final locZip = obx.QueryStringProperty( + _entities[6].properties[7], + ); + + /// See [SessionStatus.serverVersion]. + static final serverVersion = obx.QueryStringProperty( + _entities[6].properties[8], + ); + + /// See [SessionStatus.serverInstance]. + static final serverInstance = obx.QueryStringProperty( + _entities[6].properties[9], + ); + + /// See [SessionStatus.bwvEnabled]. + static final bwvEnabled = obx.QueryBooleanProperty( + _entities[6].properties[10], + ); +} + +/// [Status] entity fields to define ObjectBox queries. +class Status_ { + /// See [Status.id]. + static final id = obx.QueryIntegerProperty( + _entities[7].properties[0], + ); + + /// See [Status.posZip]. + static final posZip = obx.QueryStringProperty( + _entities[7].properties[1], + ); + + /// See [Status.posArea]. + static final posArea = obx.QueryStringProperty( + _entities[7].properties[2], + ); + + /// See [Status.posZipReal]. + static final posZipReal = obx.QueryStringProperty( + _entities[7].properties[3], + ); +} + +/// [ChatMessage] entity fields to define ObjectBox queries. +class ChatMessage_ { + /// See [ChatMessage.id]. + static final id = obx.QueryIntegerProperty( + _entities[8].properties[0], + ); + + /// See [ChatMessage.time]. + static final time = obx.QueryIntegerProperty( + _entities[8].properties[1], + ); + + /// See [ChatMessage.from]. + static final from = obx.QueryStringProperty( + _entities[8].properties[2], + ); + + /// See [ChatMessage.subj]. + static final subj = obx.QueryStringProperty( + _entities[8].properties[3], + ); + + /// See [ChatMessage.text]. + static final text = obx.QueryStringProperty( + _entities[8].properties[4], + ); + + /// See [ChatMessage.read]. + static final read = obx.QueryBooleanProperty( + _entities[8].properties[5], + ); +} + +/// [TaskInfo] entity fields to define ObjectBox queries. +class TaskInfo_ { + /// See [TaskInfo.id]. + static final id = obx.QueryIntegerProperty( + _entities[9].properties[0], + ); + + /// See [TaskInfo.sId]. + static final sId = obx.QueryIntegerProperty( + _entities[9].properties[1], + ); + + /// See [TaskInfo.additionalText]. + static final additionalText = obx.QueryStringProperty( + _entities[9].properties[2], + ); + + /// See [TaskInfo.answer]. + static final answer = obx.QueryStringProperty( + _entities[9].properties[3], + ); + + /// See [TaskInfo.completed]. + static final completed = obx.QueryBooleanProperty( + _entities[9].properties[4], + ); +} diff --git a/lib/popups/accept_jobs_popup.dart b/lib/popups/accept_jobs_popup.dart index a82d568..fe33443 100644 --- a/lib/popups/accept_jobs_popup.dart +++ b/lib/popups/accept_jobs_popup.dart @@ -14,7 +14,6 @@ import 'package:stadtbote/tools/messages/job_received_message.dart'; import 'package:stadtbote/tools/messages/refresh_badges_message.dart'; import 'package:stadtbote/tools/messages/remove_job_message.dart'; import 'package:stadtbote/tools/util.dart'; -import 'package:expandable/expandable.dart'; import '../tools/messages/publish_payload_message.dart'; diff --git a/lib/popups/tasks_popups/arrived_popup.dart b/lib/popups/tasks_popups/arrived_popup.dart index e0cf909..784a369 100644 --- a/lib/popups/tasks_popups/arrived_popup.dart +++ b/lib/popups/tasks_popups/arrived_popup.dart @@ -39,9 +39,9 @@ showTaskArrivedPopup(BuildContext context, TaskInfo taskInfo, Function() onFinis padding: const EdgeInsets.all(35.0), child: Column( children: [ - Text(taskInfo.task.topic), + Text(taskInfo.task?.topic ?? ''), const SizedBox(height: 20), - getDefaultButton(taskInfo.task.topic, () => {Navigator.of(context).pop(), onFinished()}), + getDefaultButton(taskInfo.task?.topic ?? '', () => {Navigator.of(context).pop(), onFinished()}), ], ), ), diff --git a/lib/popups/tasks_popups/pickup_delivery_status_popup.dart b/lib/popups/tasks_popups/pickup_delivery_status_popup.dart index e127b60..e5ae1fe 100644 --- a/lib/popups/tasks_popups/pickup_delivery_status_popup.dart +++ b/lib/popups/tasks_popups/pickup_delivery_status_popup.dart @@ -5,7 +5,7 @@ import 'package:stadtbote/tools/util.dart'; showPickupDeliveryStatusPopup(BuildContext context, TaskInfo taskInfo, Function(TourEntry?, String? remark) onFinished) async { List> entries = []; - for (var entry in taskInfo.task.entries!) { + for (var entry in taskInfo.task?.entries ?? []) { var dropdownMenuEntry = DropdownMenuEntry(value: entry, label: entry.text); entries.add(dropdownMenuEntry); } @@ -51,7 +51,7 @@ showPickupDeliveryStatusPopup(BuildContext context, TaskInfo taskInfo, Function( padding: const EdgeInsets.all(8.0), child: Column( children: [ - Text(taskInfo.task.topic), + Text(taskInfo.task?.topic ?? ''), const SizedBox(height: 20), DropdownMenu( expandedInsets: const EdgeInsets.all(0), diff --git a/lib/popups/tasks_popups/receipt_giver_popup.dart b/lib/popups/tasks_popups/receipt_giver_popup.dart index 39f74e1..29c1e76 100644 --- a/lib/popups/tasks_popups/receipt_giver_popup.dart +++ b/lib/popups/tasks_popups/receipt_giver_popup.dart @@ -6,7 +6,7 @@ import 'package:stadtbote/tools/util.dart'; showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function(String, TourEntry) onFinished) async { List> entries = []; - for (var entry in taskInfo.task.entries!) { + for (var entry in taskInfo.task?.entries ?? []) { var dropdownMenuEntry = DropdownMenuEntry(value: entry, label: entry.text); entries.add(dropdownMenuEntry); } @@ -52,7 +52,7 @@ showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function(String, padding: const EdgeInsets.all(35.0), child: Column( children: [ - Text(taskInfo.task.topic), + Text(taskInfo.task?.topic ?? ''), const SizedBox(height: 20), DropdownMenu( expandedInsets: const EdgeInsets.all(0), @@ -66,7 +66,7 @@ showReceiptGiverPopup(BuildContext context, TaskInfo taskInfo, Function(String, dropdownMenuEntries: entries, ), const SizedBox(height: 30), - Util.getDefaultTextField(taskInfo.task.topic, + Util.getDefaultTextField(taskInfo.task?.topic ?? '', textInputType: TextInputType.text, formatter: [FilteringTextInputFormatter.singleLineFormatter], controller: textEditingController, diff --git a/lib/popups/tasks_popups/signature_popup.dart b/lib/popups/tasks_popups/signature_popup.dart index bf2df28..ff83d03 100644 --- a/lib/popups/tasks_popups/signature_popup.dart +++ b/lib/popups/tasks_popups/signature_popup.dart @@ -67,7 +67,7 @@ showSignaturePopup(BuildContext context, TaskInfo taskInfo, Function(String?) on padding: const EdgeInsets.all(20.0), child: Column( children: [ - Text(taskInfo.task.topic), + Text(taskInfo.task?.topic ?? ''), const SizedBox(height: 20), Expanded( child: Signature( diff --git a/lib/popups/tasks_popups/station_notice_popup.dart b/lib/popups/tasks_popups/station_notice_popup.dart index 05a7ba9..8a40e8a 100644 --- a/lib/popups/tasks_popups/station_notice_popup.dart +++ b/lib/popups/tasks_popups/station_notice_popup.dart @@ -42,11 +42,11 @@ showStationNoticePopup(BuildContext context, TaskInfo taskInfo, Function(String) padding: const EdgeInsets.all(35.0), child: Column( children: [ - Text(taskInfo.task.topic), + Text(taskInfo.task?.topic ?? ''), const SizedBox(height: 20), SizedBox( height: 100, - child: Util.getDefaultTextField(taskInfo.task.topic, + child: Util.getDefaultTextField(taskInfo.task?.topic ?? '', textInputType: TextInputType.text, maxLines: 10, formatter: [FilteringTextInputFormatter.singleLineFormatter], diff --git a/lib/popups/tasks_popups/take_photos_popup.dart b/lib/popups/tasks_popups/take_photos_popup.dart index 838c32d..ac2b848 100644 --- a/lib/popups/tasks_popups/take_photos_popup.dart +++ b/lib/popups/tasks_popups/take_photos_popup.dart @@ -128,17 +128,17 @@ Future showTakePhotosPopup(BuildContext context, TaskInfo taskInfo, Functi ), const SizedBox(height: 20), Visibility( - visible: imageDataList.length < taskInfo.task.max!, + visible: imageDataList.length < (taskInfo.task?.max ?? 999), child: getDefaultButton('Hinzufügen', buttonHeight: 50, () => {capturePhoto()})), const SizedBox(height: 12), getDefaultButton( 'Übernehmen', buttonHeight: 50, () => { - if (imageDataList.length >= taskInfo.task.min! && imageDataList.length <= taskInfo.task.max!) + if (imageDataList.length >= (taskInfo.task?.min ?? 0) && imageDataList.length <= (taskInfo.task?.max ?? 999)) {Navigator.of(context).pop(), onFinished(imageDataList)} else - {showAlertDialog('Fehler', 'Es müssen mindestens ${taskInfo.task.min} Foto(s) aufgenommen werden')} + {showAlertDialog('Fehler', 'Es müssen mindestens ${taskInfo.task?.min ?? 0} Foto(s) aufgenommen werden')} }) ], ), diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index 176c0bd..8f68457 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -7,7 +7,6 @@ import 'package:archive/archive.dart'; import 'package:dart_mq/dart_mq.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:http/http.dart' as http; -import 'package:isar/isar.dart'; import 'package:mqtt5_client/mqtt5_client.dart'; import 'package:mqtt5_client/mqtt5_server_client.dart'; import 'package:stadtbote/model/enqueued_message.dart'; @@ -17,6 +16,7 @@ import 'package:stadtbote/model/chat_message.dart'; import 'package:stadtbote/model/location_status.dart'; import 'package:stadtbote/model/rank.dart'; import 'package:stadtbote/model/status.dart'; +import 'package:stadtbote/objectbox.g.dart'; import 'package:stadtbote/network_messages/acknowledge_job.dart'; import 'package:stadtbote/network_messages/acknowledge_message.dart'; import 'package:stadtbote/network_messages/bootstrap_request.dart'; @@ -332,10 +332,9 @@ class MqttCore with ProducerMixin, ConsumerMixin { var sessionStatusMessage = SessionStatus.fromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.sessionStatus.clear(); - await MyApp.isarInstance.sessionStatus.put(sessionStatusMessage); - }); + final box = MyApp.objectBoxStore.box(); + box.removeAll(); + box.put(sessionStatusMessage); var bwvEnabled = sessionStatusMessage.bwvEnabled; Util.preferencesSaveBool(Constants.prefsBWVEnabled, bwvEnabled); @@ -355,10 +354,9 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _statusMessageReceived(payloadData) async { var statusMessage = Status.fromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.status.clear(); - await MyApp.isarInstance.status.put(statusMessage); - }); + final box = MyApp.objectBoxStore.box(); + box.removeAll(); + box.put(statusMessage); sendMessage( routingKey: Constants.messageTopicStatusInfoUpdated, @@ -369,10 +367,9 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _locationStatusMessageReceived(payloadData) async { var locationStatus = LocationStatus.fromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.locationStatus.clear(); - await MyApp.isarInstance.locationStatus.put(locationStatus); - }); + final box = MyApp.objectBoxStore.box(); + box.removeAll(); + box.put(locationStatus); sendMessage( routingKey: Constants.messageTopicLocationStatusUpdated, @@ -383,10 +380,9 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _rankingMessageReceived(payloadData) async { var ranking = Ranking.fromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.rankings.clear(); - await MyApp.isarInstance.rankings.put(ranking); - }); + final box = MyApp.objectBoxStore.box(); + box.removeAll(); + box.put(ranking); sendMessage( routingKey: Constants.messageTopicRankingUpdated, @@ -397,9 +393,8 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _jobMessageReceived(payloadData) async { Job newJob = Job.fromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.jobs.put(newJob); - }); + final box = MyApp.objectBoxStore.box(); + box.put(newJob); if (newJob.state == Constants.stateAssigned) { if (newJob.global) { @@ -420,13 +415,12 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _jobDeleteReceived(payloadData) async { var jobDelMessage = JobDelMessage.fromJson(payloadData); - var job = await MyApp.isarInstance.jobs.where().filter().idEqualTo(jobDelMessage.id).findFirst(); - - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.jobs.where().filter().idEqualTo(jobDelMessage.id).deleteAll(); - }); + final box = MyApp.objectBoxStore.box(); + var job = box.get(jobDelMessage.id); if (job != null) { + box.remove(jobDelMessage.id); + sendMessage( routingKey: Constants.messageTopicJobDeleted, payload: JobDeletedMessage(job: job), @@ -445,9 +439,8 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _messageMessageReceived(Map payloadData) async { var newMessage = await ChatMessage.mergeFromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.chatMessages.put(newMessage); - }); + final box = MyApp.objectBoxStore.box(); + box.put(newMessage); await Util.playMp3('asbeep.mp3'); @@ -460,11 +453,13 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _messageUploadDeviceLogReceived(payloadData) async { var deviceLogRequest = DeviceLogRequest.fromJson(payloadData); - var logEintries = await MyApp.isarInstance.logEntrys - .filter() - .timeGreaterThan(deviceLogRequest.startDateTime) - .timeLessThan(deviceLogRequest.endDateTime) - .findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query( + LogEntry_.time.greaterThan(deviceLogRequest.startDateTime.millisecondsSinceEpoch) + .and(LogEntry_.time.lessThan(deviceLogRequest.endDateTime.millisecondsSinceEpoch)) + ).build(); + var logEintries = query.find(); + query.close(); var deviceLog = DeviceLogResponse(); deviceLog.entries = logEintries; @@ -475,12 +470,12 @@ class MqttCore with ProducerMixin, ConsumerMixin { void _messageAcknowledgeReceived(payloadData) async { var acknowledgeMessage = AcknowledgeMessage.fromJson(payloadData); - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.enqueuedMessages - .filter() - .messageIdEqualTo(acknowledgeMessage.messageId) - .deleteAll(); - }); + final box = MyApp.objectBoxStore.box(); + final query = box.query(EnqueuedMessage_.messageId.equals(acknowledgeMessage.messageId)).build(); + final messages = query.find(); + query.close(); + + box.removeMany(messages.map((e) => e.id).toList()); } @@ -599,7 +594,10 @@ class MqttCore with ProducerMixin, ConsumerMixin { _sendSyncMessage() async { var currentPosition = await MyApp.getCurrentPosition(); - var jobs = await MyApp.isarInstance.jobs.filter().stateGreaterThan(-1).findAll(); + final box = MyApp.objectBoxStore.box(); + final query = box.query(Job_.state.greaterThan(-1)).build(); + var jobs = query.find(); + query.close(); var answer = SyncJobsMessage(); answer.utcUnixTime = Util.nowUnixSecondsUtc(); @@ -659,26 +657,26 @@ class MqttCore with ProducerMixin, ConsumerMixin { } void _enqueueMessage(String uuid, String receiver, String payload) async { - var enqueuedMessage = EnqueuedMessage(messageId: uuid); + var enqueuedMessage = EnqueuedMessage(); + enqueuedMessage.messageId = uuid; enqueuedMessage.topic = receiver; enqueuedMessage.payload = payload; - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.enqueuedMessages.put(enqueuedMessage); - }); + final box = MyApp.objectBoxStore.box(); + box.put(enqueuedMessage); } _sendEnqueuedMessages() async { - var enqueuedMessages = await MyApp.isarInstance.enqueuedMessages.where().findAll(); + final box = MyApp.objectBoxStore.box(); + var enqueuedMessages = box.getAll(); + if (enqueuedMessages.isNotEmpty) { for (var enqueuedMessage in enqueuedMessages) { try { var json = jsonDecode(enqueuedMessage.payload); if (_publishMessage(enqueuedMessage.topic, json, false, enqueueOnError: false)) { - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.enqueuedMessages.delete(enqueuedMessage.id); - }); + box.remove(enqueuedMessage.id); } } catch (ex) { Util.logInfo("resend enqueued message failed: $ex"); diff --git a/lib/tools/util.dart b/lib/tools/util.dart index 03787bf..39bb5ea 100644 --- a/lib/tools/util.dart +++ b/lib/tools/util.dart @@ -93,11 +93,10 @@ class Util { var logEntry = LogEntry(); logEntry.time = DateTime.now(); logEntry.text = text; - logEntry.severity = severity; + logEntry.severityEnum = severity; - await MyApp.isarInstance.writeTxn(() async { - await MyApp.isarInstance.logEntrys.put(logEntry); - }); + final box = MyApp.objectBoxStore.box(); + box.put(logEntry); } static logInfo(String message) { diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 1d6acba..6d690b8 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -8,7 +8,7 @@ #include #include -#include +#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -18,9 +18,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); - g_autoptr(FlPluginRegistrar) isar_flutter_libs_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "IsarFlutterLibsPlugin"); - isar_flutter_libs_plugin_register_with_registrar(isar_flutter_libs_registrar); + g_autoptr(FlPluginRegistrar) objectbox_flutter_libs_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "ObjectboxFlutterLibsPlugin"); + objectbox_flutter_libs_plugin_register_with_registrar(objectbox_flutter_libs_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index b067ca8..faf7f40 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -5,7 +5,7 @@ list(APPEND FLUTTER_PLUGIN_LIST audioplayers_linux file_selector_linux - isar_flutter_libs + objectbox_flutter_libs url_launcher_linux ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 7e04461..6fd943a 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,7 +9,7 @@ import audioplayers_darwin import device_info_plus import file_selector_macos import geolocator_apple -import isar_flutter_libs +import objectbox_flutter_libs import package_info_plus import path_provider_foundation import shared_preferences_foundation @@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) - IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin")) + ObjectboxFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "ObjectboxFlutterLibsPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/pubspec.lock b/pubspec.lock index cf308c7..4b29611 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "85.0.0" analyzer: - dependency: "direct dev" + dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "7.7.1" animated_toggle_switch: dependency: "direct main" description: @@ -125,10 +125,10 @@ packages: dependency: transitive description: name: build - sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + sha256: "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.5.4" build_config: dependency: transitive description: @@ -149,26 +149,26 @@ packages: dependency: transitive description: name: build_resolvers - sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + sha256: ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.4" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" + sha256: "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53" url: "https://pub.dev" source: hosted - version: "2.4.13" + version: "2.5.4" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 + sha256: "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792" url: "https://pub.dev" source: hosted - version: "7.3.2" + version: "9.1.2" built_collection: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: built_value - sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" + sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d url: "https://pub.dev" source: hosted - version: "8.9.3" + version: "8.12.0" carousel_slider: dependency: "direct main" description: @@ -309,18 +309,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb" url: "https://pub.dev" source: hosted - version: "2.3.2" - dartx: - dependency: transitive - description: - name: dartx - sha256: "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244" - url: "https://pub.dev" - source: hosted - version: "1.2.0" + version: "3.1.1" device_info_plus: dependency: "direct main" description: @@ -449,6 +441,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.1" + flat_buffers: + dependency: transitive + description: + name: flat_buffers + sha256: "380bdcba5664a718bfd4ea20a45d39e13684f5318fcd8883066a55e21f37f4c3" + url: "https://pub.dev" + source: hosted + version: "23.5.26" flutter: dependency: "direct main" description: flutter @@ -768,38 +768,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - isar: - dependency: "direct main" - description: - name: isar - sha256: e17a9555bc7f22ff26568b8c64d019b4ffa2dc6bd4cb1c8d9b269aefd32e53ad - url: "https://pub.isar-community.dev" - source: hosted - version: "3.1.8" - isar_flutter_libs: - dependency: "direct main" - description: - name: isar_flutter_libs - sha256: "78710781e658ce4bff59b3f38c5b2735e899e627f4e926e1221934e77b95231a" - url: "https://pub.isar-community.dev" - source: hosted - version: "3.1.8" - isar_generator: - dependency: "direct dev" - description: - name: isar_generator - sha256: "484e73d3b7e81dbd816852fe0b9497333118a9aeb646fd2d349a62cc8980ffe1" - url: "https://pub.isar-community.dev" - source: hosted - version: "3.1.8" js: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.2" json_annotation: dependency: "direct main" description: @@ -809,13 +785,13 @@ packages: source: hosted version: "4.9.0" json_serializable: - dependency: "direct main" + dependency: "direct dev" description: name: json_serializable - sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b + sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.9.5" latlong2: dependency: "direct main" description: @@ -936,6 +912,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.2" + objectbox: + dependency: "direct main" + description: + name: objectbox + sha256: "25c2e24b417d938decb5598682dc831bc6a21856eaae65affbc57cfad326808d" + url: "https://pub.dev" + source: hosted + version: "4.3.0" + objectbox_flutter_libs: + dependency: "direct main" + description: + name: objectbox_flutter_libs + sha256: "574b0233ba79a7159fca9049c67974f790a2180b6141d4951112b20bd146016a" + url: "https://pub.dev" + source: hosted + version: "4.3.0" + objectbox_generator: + dependency: "direct dev" + description: + name: objectbox_generator + sha256: "1b17e9168d03706b5bb895b5f36f4301aa7c973ac30ff761b205b1ca3e2e3865" + url: "https://pub.dev" + source: hosted + version: "4.3.0" package_config: dependency: transitive description: @@ -1104,6 +1104,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5" + url: "https://pub.dev" + source: hosted + version: "4.0.0" polylabel: dependency: transitive description: @@ -1262,21 +1270,21 @@ packages: source: sdk version: "0.0.0" source_gen: - dependency: "direct dev" + dependency: transitive description: name: source_gen - sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" + sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "2.0.0" source_helper: dependency: transitive description: name: source_helper - sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c" + sha256: a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca url: "https://pub.dev" source: hosted - version: "1.3.5" + version: "1.3.7" source_span: dependency: transitive description: @@ -1349,14 +1357,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.4" - time: - dependency: transitive - description: - name: time - sha256: "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461" - url: "https://pub.dev" - source: hosted - version: "2.1.5" timing: dependency: transitive description: @@ -1589,14 +1589,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.5.0" - xxh3: - dependency: transitive - description: - name: xxh3 - sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916" - url: "https://pub.dev" - source: hosted - version: "1.2.0" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index d3d8a1c..cb1cd76 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,7 +21,7 @@ version: 347.0.0+347 environment: sdk: '>=3.5.0 <4.0.0' -isar_version: &isar_version 3.1.8 # define the version to be used + # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -33,22 +33,18 @@ dependencies: flutter: sdk: flutter - isar: - version: *isar_version - hosted: https://pub.isar-community.dev/ - isar_flutter_libs: # contains Isar Core - version: *isar_version - hosted: https://pub.isar-community.dev/ + objectbox: ^4.0.3 + objectbox_flutter_libs: ^4.0.3 cupertino_icons: ^1.0.2 uuid: ^4.5.1 http: ^1.3.0 image_picker: ^1.1.2 mime: ^2.0.0 + json_annotation: ^4.9.0 path_provider: ^2.1.2 mqtt5_client: ^4.4.0 - json_serializable: ^6.6.2 - json_annotation: ^4.9.0 + shared_preferences: ^2.1.1 badges: ^3.1.1 flutter_osm_plugin: ^1.3.6 @@ -77,13 +73,9 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - source_gen: ^1.3.1 - build_runner: any - analyzer: ^5.12.0 - - isar_generator: - version: *isar_version - hosted: https://pub.isar-community.dev/ + build_runner: ^2.4.13 + objectbox_generator: ^4.0.3 + json_serializable: ^6.6.2 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 6beffde..896db6f 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include @@ -20,8 +20,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FileSelectorWindows")); GeolocatorWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("GeolocatorWindows")); - IsarFlutterLibsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("IsarFlutterLibsPlugin")); + ObjectboxFlutterLibsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ObjectboxFlutterLibsPlugin")); PermissionHandlerWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 860253a..4c58a62 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST audioplayers_windows file_selector_windows geolocator_windows - isar_flutter_libs + objectbox_flutter_libs permission_handler_windows url_launcher_windows )