functions/api/lib/api_endpoint/user.dart

@@ -42,6 +42,6 @@ class UserApiEndpoint extends ApiEndpoint {
   }
 
   String userIdFromContext(final context) {
-    return ApiHelper.fieldFromRequestBody(context, "userId");
+    return ApiHelper.fieldFromRequestBody(context, "id");
   }
 }

functions/api/lib/converter/db_converter/calendar_event.dart

@@ -23,11 +23,11 @@ class CalendarEventDbConverter {
 
   static CalendarEventResponse fromDbData(Map<String, dynamic> map) {
     return CalendarEventResponse(
-      id: getRequiredMapItem(RequestResponseVariables.idFieldName, map),
+      id: getRequiredMapItem(DatabaseVariables.idColumnName, map),
       userId: getRequiredMapItem(userIdDbFieldName, map),
       teamId: getRequiredMapItem(teamIdDbFieldName, map),
       title: getRequiredMapItem(titleDbFieldName, map),
-      description: getOptionalMapItem(descriptionDbFieldName, map),
+      description: getRequiredMapItem(descriptionDbFieldName, map),
       start: DateTime.parse(getRequiredMapItem(startDbFieldName, map)),
       end: DateTime.parse(getRequiredMapItem(endDbFieldName, map)),
     );

functions/api/lib/converter/db_converter/route.dart

+import 'package:api/converter/db_converter/point.dart';
 import 'package:api/model/request/route.dart';
 import 'package:api/model/response/route.dart';
 import 'package:lib/lib.dart';
@@ -22,7 +23,7 @@ class RouteDbConverter {
   static RouteResponse fromDbData(Map<String, dynamic> map) {
     return RouteResponse(
       id: getOptionalMapItem(DatabaseVariables.idColumnName, map),
-      pointIds: getRequiredMapItem<Iterable>(pointsDbFieldName, map).map((e) => e as String),
+      pointIds: getRequiredMapItem<Iterable>(pointsDbFieldName, map).map((e) => PointDbConverter.fromDbData(e)).map((e) => e.id).toList(),
       userId: getRequiredMapItem(userIdDbFieldName, map),
       teamId: getOptionalMapItem(teamIdDbFieldName, map),
       startTime: DateTime.parse(getRequiredMapItem(startTimeDbFieldName, map)),

functions/api/lib/converter/request_response/calendar_event.dart

@@ -28,7 +28,7 @@ class CalendarEventRequestResponseConverter {
       userId: getRequiredMapItem(userIdRequestResponseFieldName, map),
       teamId: getRequiredMapItem(teamIdRequestResponseFieldName, map),
       title: getRequiredMapItem(titleRequestResponseFieldName, map),
-      description: getOptionalMapItem(descriptionRequestResponseFieldName, map),
+      description: getRequiredMapItem(descriptionRequestResponseFieldName, map),
       start: DateTime.parse(getRequiredMapItem(startRequestResponseFieldName, map)),
       end: DateTime.parse(getRequiredMapItem(endRequestResponseFieldName, map)),
     );

functions/api/lib/model/interface/calendar_event.dart

@@ -2,7 +2,7 @@ abstract class CalendarEvent {
   String? get id;
   String get teamId;
   String get title;
-  String? get description;
+  String get description;
   DateTime get start;
   DateTime get end;
   String get userId;

functions/api/lib/model/request/calendar_event.dart

@@ -9,7 +9,7 @@ class CalendarEventRequest extends DbModel implements CalendarEvent {
   final String title;
   
   @override
-  final String? description;
+  final String description;
   
   @override
   final DateTime start;
@@ -31,7 +31,7 @@ class CalendarEventRequest extends DbModel implements CalendarEvent {
     required this.userId,
     required this.teamId,
     required this.title,
-    this.description,
+    required this.description,
     required this.start,
     required this.end
   });

functions/api/lib/model/response/calendar_event.dart

@@ -8,7 +8,7 @@ class CalendarEventResponse implements CalendarEvent {
   final String title;
 
   @override
-  final String? description;
+  final String description;
 
   @override
   final DateTime start;
@@ -27,7 +27,7 @@ class CalendarEventResponse implements CalendarEvent {
     required this.userId,
     required this.teamId,
     required this.title,
-    this.description,
+    required this.description,
     required this.start,
     required this.end
   });

lib/lib/src/utils/api_helper.dart

@@ -14,6 +14,8 @@ abstract class ApiHelper  {
       return map.containsKey(key);
     } on FormatException catch(_) {
       return false;
+    } on TypeError catch (_) {
+      return false;
     }
   }
 }

lib/lib/src/utils/variables.dart

@@ -11,12 +11,12 @@ class AppwriteVariables {
 }
 
 class DatabaseVariables {
-  static String get idColumnName => "\$id";
-  static String get permissionsColumnName => "\$permissions";
-  static String get createdAtColumnName => "\$createdAt";
+  static const String idColumnName = "\$id";
+  static const String permissionsColumnName = "\$permissions";
+  static const String createdAtColumnName = "\$createdAt";
 }
 
 class RequestResponseVariables {
-  static String get idFieldName => "id";
-  static String get queriesFieldName => "queries";
+  static const String idFieldName = "id";
+  static const String queriesFieldName = "queries";
 }