Merge pull request #676 from hpi-studyu/fix/invite-code

fix: Make invite codes unique
hpi-studyu · Aug 9, 2024 · 7558c7b · 7558c7b
2 parents f35888c + 6c3adff
commit 7558c7b
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 3 deletions.
diff --git a/database/migration/20240801_invite_code_unique.sql b/database/migration/20240801_invite_code_unique.sql
@@ -0,0 +1,4 @@
+ALTER TABLE
+    public.study_invite
+ADD
+    CONSTRAINT study_invite_code_unique UNIQUE (code);
diff --git a/database/studyu-schema.sql b/database/studyu-schema.sql
@@ -1065,4 +1065,10 @@ ALTER TABLE public."user" ENABLE ROW LEVEL SECURITY;
 
 ALTER VIEW public.study_progress_export SET (security_invoker = on);
 
+--
+-- Name: study_invite; Type: TABLE; Schema: public; Owner: postgres
+--
+
+ALTER TABLE public.study_invite ADD CONSTRAINT study_invite_code_unique UNIQUE (code);
+
 COMMIT;
diff --git a/designer_v2/lib/main.dart b/designer_v2/lib/main.dart
@@ -29,7 +29,7 @@ Future<void> main() async {
     );
   }, (error, stackTrace) {
     // TODO: top-level error handling
-    print("Exception: $error");
+    print("Error: $error");
     print("Stack: $stackTrace");
   });
 }
diff --git a/designer_v2/lib/repositories/api_client.dart b/designer_v2/lib/repositories/api_client.dart
@@ -15,6 +15,7 @@ abstract class StudyUApi {
   Future<void> deleteStudy(Study study);
   Future<StudyInvite> saveStudyInvite(StudyInvite invite);
   Future<StudyInvite> fetchStudyInvite(String code);
+  Future<Study> fetchStudyFromInvite(String code);
   Future<void> deleteStudyInvite(StudyInvite invite);
   Future<List<StudySubject>> deleteParticipants(
     Study study,
@@ -206,6 +207,20 @@ class StudyUApiClient extends SupabaseClientDependant
     );
   }
 
+  @override
+  Future<Study> fetchStudyFromInvite(String code) async {
+    await _testDelay();
+    try {
+      final request = await executeRpc(
+        'get_study_record_from_invite',
+        params: {'invite_code': code},
+      );
+      return deserializeObject<Study>(request);
+    } catch (e) {
+      throw StudyInviteNotFoundException();
+    }
+  }
+
   @override
   Future<StudyInvite> saveStudyInvite(StudyInvite invite) async {
     await _testDelay();
@@ -262,7 +277,9 @@ class StudyUApiClient extends SupabaseClientDependant
       final result = await future;
       return result;
     } on SupabaseQueryError catch (e) {
-      if (onError == null || e.statusCode == null) {
+      if (onError == null ||
+          onError[e.statusCode] == null ||
+          e.statusCode == null) {
         throw _apiException(error: e);
       }
       final errorHandler = onError[e.statusCode]!;

diff --git a/designer_v2/lib/repositories/invite_code_repository.dart b/designer_v2/lib/repositories/invite_code_repository.dart
@@ -54,9 +54,11 @@ class InviteCodeRepository extends ModelRepository<StudyInvite>
   @override
   Future<bool> isCodeAlreadyUsed(String code) async {
     try {
-      await apiClient.fetchStudyInvite(code);
+      await apiClient.fetchStudyFromInvite(code);
     } on StudyInviteNotFoundException {
       return false;
+    } catch (e) {
+      rethrow;
     }
     return true;
   }

diff --git a/designer_v2/lib/repositories/supabase_client.dart b/designer_v2/lib/repositories/supabase_client.dart
@@ -104,6 +104,21 @@ mixin SupabaseQueryMixin on SupabaseClientDependant {
     }
   }
 
+  Future executeRpc(
+    String functionName, {
+    Map<String, dynamic>? params,
+  }) async {
+    try {
+      return await this.supabaseClient.rpc(functionName, params: params);
+    } on PostgrestException catch (error) {
+      throw SupabaseQueryError(
+        statusCode: error.code,
+        message: error.message,
+        details: error.details,
+      );
+    }
+  }
+
   // - Deserialization
 
   List<T> deserializeList<T extends SupabaseObject>(dynamic data) {