From 120487682aaad2bc0cb962f5e013b6b58651a3cb Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 3 Nov 2025 17:29:26 +0100 Subject: [PATCH] Remove json serializable code for exercise models --- lib/models/exercises/alias.dart | 15 - lib/models/exercises/alias.g.dart | 22 - lib/models/exercises/category.dart | 11 - lib/models/exercises/category.g.dart | 20 - lib/models/exercises/comment.dart | 15 - lib/models/exercises/comment.g.dart | 22 - lib/models/exercises/equipment.dart | 11 - lib/models/exercises/equipment.g.dart | 20 - lib/models/exercises/exercise.dart | 90 -- lib/models/exercises/exercise.g.dart | 66 - lib/models/exercises/exercise_api.dart | 91 -- .../exercises/exercise_api.freezed.dart | 1210 ----------------- lib/models/exercises/exercise_api.g.dart | 103 -- lib/models/exercises/image.dart | 19 - lib/models/exercises/image.g.dart | 26 - lib/models/exercises/muscle.dart | 16 - lib/models/exercises/muscle.g.dart | 24 - lib/models/exercises/translation.dart | 27 - lib/models/exercises/translation.g.dart | 47 - lib/models/exercises/variation.dart | 11 - lib/models/exercises/variation.g.dart | 16 - lib/models/exercises/video.dart | 33 - lib/models/exercises/video.g.dart | 56 - lib/providers/exercise_state_notifier.dart | 4 - lib/providers/exercise_state_notifier.g.dart | 2 +- 25 files changed, 1 insertion(+), 1976 deletions(-) delete mode 100644 lib/models/exercises/alias.g.dart delete mode 100644 lib/models/exercises/category.g.dart delete mode 100644 lib/models/exercises/comment.g.dart delete mode 100644 lib/models/exercises/equipment.g.dart delete mode 100644 lib/models/exercises/exercise.g.dart delete mode 100644 lib/models/exercises/exercise_api.dart delete mode 100644 lib/models/exercises/exercise_api.freezed.dart delete mode 100644 lib/models/exercises/exercise_api.g.dart delete mode 100644 lib/models/exercises/image.g.dart delete mode 100644 lib/models/exercises/muscle.g.dart delete mode 100644 lib/models/exercises/translation.g.dart delete mode 100644 lib/models/exercises/variation.g.dart delete mode 100644 lib/models/exercises/video.g.dart diff --git a/lib/models/exercises/alias.dart b/lib/models/exercises/alias.dart index a5ca1fc4..df917a12 100644 --- a/lib/models/exercises/alias.dart +++ b/lib/models/exercises/alias.dart @@ -16,25 +16,10 @@ * along with this program. If not, see . */ -import 'package:json_annotation/json_annotation.dart'; - -part 'alias.g.dart'; - -@JsonSerializable() class Alias { - @JsonKey(required: true) final int? id; - - @JsonKey(name: 'translation') final int? translationId; - - @JsonKey(required: true) final String alias; const Alias({this.id, required this.translationId, required this.alias}); - - // Boilerplate - factory Alias.fromJson(Map json) => _$AliasFromJson(json); - - Map toJson() => _$AliasToJson(this); } diff --git a/lib/models/exercises/alias.g.dart b/lib/models/exercises/alias.g.dart deleted file mode 100644 index e631ec6e..00000000 --- a/lib/models/exercises/alias.g.dart +++ /dev/null @@ -1,22 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'alias.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Alias _$AliasFromJson(Map json) { - $checkKeys(json, requiredKeys: const ['id', 'alias']); - return Alias( - id: (json['id'] as num?)?.toInt(), - translationId: (json['translation'] as num?)?.toInt(), - alias: json['alias'] as String, - ); -} - -Map _$AliasToJson(Alias instance) => { - 'id': instance.id, - 'translation': instance.translationId, - 'alias': instance.alias, -}; diff --git a/lib/models/exercises/category.dart b/lib/models/exercises/category.dart index 90add14e..e6c4eddd 100644 --- a/lib/models/exercises/category.dart +++ b/lib/models/exercises/category.dart @@ -17,16 +17,9 @@ */ import 'package:equatable/equatable.dart'; -import 'package:json_annotation/json_annotation.dart'; -part 'category.g.dart'; - -@JsonSerializable() class ExerciseCategory extends Equatable { - @JsonKey(required: true) final int id; - - @JsonKey(required: true) final String name; const ExerciseCategory({required this.id, required this.name}); @@ -36,10 +29,6 @@ class ExerciseCategory extends Equatable { return 'Category $id: $name'; } - // Boilerplate - factory ExerciseCategory.fromJson(Map json) => _$ExerciseCategoryFromJson(json); - Map toJson() => _$ExerciseCategoryToJson(this); - @override List get props => [id, name]; } diff --git a/lib/models/exercises/category.g.dart b/lib/models/exercises/category.g.dart deleted file mode 100644 index 681e7dbe..00000000 --- a/lib/models/exercises/category.g.dart +++ /dev/null @@ -1,20 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'category.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -ExerciseCategory _$ExerciseCategoryFromJson(Map json) { - $checkKeys(json, requiredKeys: const ['id', 'name']); - return ExerciseCategory( - id: (json['id'] as num).toInt(), - name: json['name'] as String, - ); -} - -Map _$ExerciseCategoryToJson(ExerciseCategory instance) => { - 'id': instance.id, - 'name': instance.name, -}; diff --git a/lib/models/exercises/comment.dart b/lib/models/exercises/comment.dart index 5ebd542c..2d97899f 100644 --- a/lib/models/exercises/comment.dart +++ b/lib/models/exercises/comment.dart @@ -16,19 +16,9 @@ * along with this program. If not, see . */ -import 'package:json_annotation/json_annotation.dart'; - -part 'comment.g.dart'; - -@JsonSerializable() class Comment { - @JsonKey(required: true) final int id; - - @JsonKey(name: 'translation') final int translationId; - - @JsonKey(required: true) final String comment; const Comment({ @@ -36,9 +26,4 @@ class Comment { required this.translationId, required this.comment, }); - - // Boilerplate - factory Comment.fromJson(Map json) => _$CommentFromJson(json); - - Map toJson() => _$CommentToJson(this); } diff --git a/lib/models/exercises/comment.g.dart b/lib/models/exercises/comment.g.dart deleted file mode 100644 index 7cf62d92..00000000 --- a/lib/models/exercises/comment.g.dart +++ /dev/null @@ -1,22 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'comment.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Comment _$CommentFromJson(Map json) { - $checkKeys(json, requiredKeys: const ['id', 'comment']); - return Comment( - id: (json['id'] as num).toInt(), - translationId: (json['translation'] as num).toInt(), - comment: json['comment'] as String, - ); -} - -Map _$CommentToJson(Comment instance) => { - 'id': instance.id, - 'translation': instance.translationId, - 'comment': instance.comment, -}; diff --git a/lib/models/exercises/equipment.dart b/lib/models/exercises/equipment.dart index 6f565457..1af3e177 100644 --- a/lib/models/exercises/equipment.dart +++ b/lib/models/exercises/equipment.dart @@ -17,24 +17,13 @@ */ import 'package:equatable/equatable.dart'; -import 'package:json_annotation/json_annotation.dart'; -part 'equipment.g.dart'; - -@JsonSerializable() class Equipment extends Equatable { - @JsonKey(required: true) final int id; - - @JsonKey(required: true) final String name; const Equipment({required this.id, required this.name}); - // Boilerplate - factory Equipment.fromJson(Map json) => _$EquipmentFromJson(json); - Map toJson() => _$EquipmentToJson(this); - @override List get props => [id, name]; diff --git a/lib/models/exercises/equipment.g.dart b/lib/models/exercises/equipment.g.dart deleted file mode 100644 index b452d40a..00000000 --- a/lib/models/exercises/equipment.g.dart +++ /dev/null @@ -1,20 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'equipment.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Equipment _$EquipmentFromJson(Map json) { - $checkKeys(json, requiredKeys: const ['id', 'name']); - return Equipment( - id: (json['id'] as num).toInt(), - name: json['name'] as String, - ); -} - -Map _$EquipmentToJson(Equipment instance) => { - 'id': instance.id, - 'name': instance.name, -}; diff --git a/lib/models/exercises/exercise.dart b/lib/models/exercises/exercise.dart index 4a7e3a52..3366f3a5 100644 --- a/lib/models/exercises/exercise.dart +++ b/lib/models/exercises/exercise.dart @@ -15,83 +15,39 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import 'dart:developer'; - import 'package:collection/collection.dart'; import 'package:equatable/equatable.dart'; -import 'package:json_annotation/json_annotation.dart'; import 'package:logging/logging.dart'; import 'package:wger/helpers/consts.dart'; import 'package:wger/models/exercises/category.dart'; import 'package:wger/models/exercises/equipment.dart'; -import 'package:wger/models/exercises/exercise_api.dart'; import 'package:wger/models/exercises/image.dart'; -import 'package:wger/models/exercises/language.dart'; import 'package:wger/models/exercises/muscle.dart'; import 'package:wger/models/exercises/translation.dart'; import 'package:wger/models/exercises/video.dart'; -part 'exercise.g.dart'; - -@JsonSerializable(explicitToJson: true) class Exercise extends Equatable { final _logger = Logger('ExerciseModel'); - @JsonKey(required: true) late final int id; - - @JsonKey(required: true) late final String uuid; - - @JsonKey(required: true, name: 'variations') late final int? variationId; - - @JsonKey(required: true, name: 'created') late final DateTime? created; - - @JsonKey(required: true, name: 'last_update') late final DateTime? lastUpdate; - - @JsonKey(required: true, name: 'last_update_global') late final DateTime? lastUpdateGlobal; - - @JsonKey(required: true, name: 'category') late int categoryId; - @JsonKey(includeFromJson: true, includeToJson: true, name: 'categories') ExerciseCategory? category; - - @JsonKey(required: true, name: 'muscles') List musclesIds = []; - - @JsonKey(includeFromJson: false, includeToJson: false) List muscles = []; - - @JsonKey(required: true, name: 'muscles_secondary') List musclesSecondaryIds = []; - - @JsonKey(includeFromJson: false, includeToJson: true) List musclesSecondary = []; - - @JsonKey(required: true, name: 'equipment') List equipmentIds = []; - - @JsonKey(includeFromJson: false, includeToJson: false) List equipment = []; - - @JsonKey(includeFromJson: false, includeToJson: false) List images = []; - - @JsonKey(includeFromJson: true, includeToJson: false) List translations = []; - - @JsonKey(includeFromJson: false, includeToJson: false) List