+signup +login

frontend/pshared/lib/api/requests/signup.dart

@@ -1,82 +1,39 @@
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:pshared/api/requests/login_data.dart';
+import 'package:pshared/data/dto/describable.dart';
+import 'package:pshared/data/mapper/describable.dart';
+import 'package:pshared/models/describable.dart';
+
 part 'signup.g.dart';
 
 
 @JsonSerializable(explicitToJson: true)
 class SignupRequest {
-  final SignupAccount account;
-  final DescribableRequest organization;
+  final AccountData account;
+  final DescribableDTO organization;
   final String organizationTimeZone;
-  final DescribableRequest anonymousUser;
-  final DescribableRequest ownerRole;
-  final DescribableRequest anonymousRole;
+  final DescribableDTO ownerRole;
 
   const SignupRequest({
     required this.account,
     required this.organization,
     required this.organizationTimeZone,
-    required this.anonymousUser,
     required this.ownerRole,
-    required this.anonymousRole,
   });
 
   factory SignupRequest.build({
-    required String name,
-    required String login,
-    required String password,
-    required String locale,
-    required String organizationName,
+    required AccountData account,
+    required Describable organization,
     required String organizationTimeZone,
-  }) =>
-      SignupRequest(
-        account: SignupAccount(
-          name: name,
-          login: login,
-          password: password,
-          locale: locale,
-        ),
-        organization: DescribableRequest(name: organizationName),
-        organizationTimeZone: organizationTimeZone,
-        anonymousUser: const DescribableRequest(name: 'Anonymous'),
-        ownerRole: const DescribableRequest(name: 'Owner'),
-        anonymousRole: const DescribableRequest(name: 'Anonymous'),
-      );
+    required Describable ownerRole,
+  }) => SignupRequest(
+    account: account, 
+    organization: organization.toDTO(), 
+    organizationTimeZone: organizationTimeZone, 
+    ownerRole: ownerRole.toDTO(),
+  );
 
-  factory SignupRequest.fromJson(Map<String, dynamic> json) =>
-      _$SignupRequestFromJson(json);
+  factory SignupRequest.fromJson(Map<String, dynamic> json) => _$SignupRequestFromJson(json);
   Map<String, dynamic> toJson() => _$SignupRequestToJson(this);
 }
-
-@JsonSerializable()
-class SignupAccount {
-  final String name;
-  final String login;
-  final String password;
-  final String locale;
-  final String? description;
-
-  const SignupAccount({
-    required this.name,
-    required this.login,
-    required this.password,
-    required this.locale,
-    this.description,
-  });
-
-  factory SignupAccount.fromJson(Map<String, dynamic> json) =>
-      _$SignupAccountFromJson(json);
-  Map<String, dynamic> toJson() => _$SignupAccountToJson(this);
-}
-
-@JsonSerializable()
-class DescribableRequest {
-  final String name;
-  final String? description;
-
-  const DescribableRequest({required this.name, this.description});
-
-  factory DescribableRequest.fromJson(Map<String, dynamic> json) =>
-      _$DescribableRequestFromJson(json);
-  Map<String, dynamic> toJson() => _$DescribableRequestToJson(this);
-}