Fehler Merge behoben

lib/model/job.dart

@@ -6,23 +6,12 @@ import 'package:stadtbote/model/tour_task.dart';
 
 part 'job.g.dart';
 
-@JsonSerializable()
-class JobsPayload {
-  List<Job>? jobs;
-
-  JobsPayload({this.jobs});
-
-  factory JobsPayload.fromJson(Map<String, dynamic> json) => _$JobsPayloadFromJson(json);
-
-  Map<String, dynamic> toJson() => _$JobsPayloadToJson(this);
-}
-
 @collection
 @JsonSerializable()
 class Job {
   late Id id;
   @JsonKey(name: 'ver')
-  late int ver;
+  late String ver;
   @JsonKey(name: 'state')
   late int state;
   @JsonKey(name: 'cr_filter')

lib/model/job.g.dart

@@ -56,7 +56,7 @@ const JobSchema = CollectionSchema(
     r'ver': PropertySchema(
       id: 7,
       name: r'ver',
-      type: IsarType.long,
+      type: IsarType.string,
     ),
     r'vhtId': PropertySchema(
       id: 8,
@@ -105,6 +105,7 @@ int _jobEstimateSize(
       bytesCount += JobTourSchema.estimateSize(value, offsets, allOffsets);
     }
   }
+  bytesCount += 3 + object.ver.length * 3;
   return bytesCount;
 }
 
@@ -126,7 +127,7 @@ void _jobSerialize(
     JobTourSchema.serialize,
     object.tours,
   );
-  writer.writeLong(offsets[7], object.ver);
+  writer.writeString(offsets[7], object.ver);
   writer.writeLong(offsets[8], object.vhtId);
 }
 
@@ -151,7 +152,7 @@ Job _jobDeserialize(
         JobTour(),
       ) ??
       [];
-  object.ver = reader.readLong(offsets[7]);
+  object.ver = reader.readString(offsets[7]);
   object.vhtId = reader.readLong(offsets[8]);
   return object;
 }
@@ -184,7 +185,7 @@ P _jobDeserializeProp<P>(
           ) ??
           []) as P;
     case 7:
-      return (reader.readLong(offset)) as P;
+      return (reader.readString(offset)) as P;
     case 8:
       return (reader.readLong(offset)) as P;
     default:
@@ -928,46 +929,55 @@ extension JobQueryFilter on QueryBuilder<Job, Job, QFilterCondition> {
     });
   }
 
-  QueryBuilder<Job, Job, QAfterFilterCondition> verEqualTo(int value) {
+  QueryBuilder<Job, Job, QAfterFilterCondition> verEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'ver',
         value: value,
+        caseSensitive: caseSensitive,
       ));
     });
   }
 
   QueryBuilder<Job, Job, QAfterFilterCondition> verGreaterThan(
-    int value, {
+    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<Job, Job, QAfterFilterCondition> verLessThan(
-    int value, {
+    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<Job, Job, QAfterFilterCondition> verBetween(
-    int lower,
-    int upper, {
+    String lower,
+    String upper, {
     bool includeLower = true,
     bool includeUpper = true,
+    bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
@@ -976,6 +986,73 @@ extension JobQueryFilter on QueryBuilder<Job, Job, QFilterCondition> {
         includeLower: includeLower,
         upper: upper,
         includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> verStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'ver',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> verEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'ver',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> verContains(String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'ver',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> verMatches(String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'ver',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> verIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'ver',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> verIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'ver',
+        value: '',
       ));
     });
   }
@@ -1291,9 +1368,9 @@ extension JobQueryWhereDistinct on QueryBuilder<Job, Job, QDistinct> {
     });
   }
 
-  QueryBuilder<Job, Job, QDistinct> distinctByVer() {
+  QueryBuilder<Job, Job, QDistinct> distinctByVer({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'ver');
+      return query.addDistinctBy(r'ver', caseSensitive: caseSensitive);
     });
   }
 
@@ -1353,7 +1430,7 @@ extension JobQueryProperty on QueryBuilder<Job, Job, QQueryProperty> {
     });
   }
 
-  QueryBuilder<Job, int, QQueryOperations> verProperty() {
+  QueryBuilder<Job, String, QQueryOperations> verProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'ver');
     });
@@ -1370,20 +1447,9 @@ extension JobQueryProperty on QueryBuilder<Job, Job, QQueryProperty> {
 // JsonSerializableGenerator
 // **************************************************************************
 
-JobsPayload _$JobsPayloadFromJson(Map<String, dynamic> json) => JobsPayload(
-      jobs: (json['jobs'] as List<dynamic>?)
-          ?.map((e) => Job.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$JobsPayloadToJson(JobsPayload instance) =>
-    <String, dynamic>{
-      'jobs': instance.jobs,
-    };
-
 Job _$JobFromJson(Map<String, dynamic> json) => Job()
   ..id = json['id'] as int
-  ..ver = json['ver'] as int
+  ..ver = json['ver'] as String
   ..state = json['state'] as int
   ..crFilter = json['cr_filter'] as String?
   ..ordertime = json['ordertime'] as String