Merge branch 'refs/heads/main' into prod/festapp

vkh-cr · Aug 26, 2024 · cd97b92 · cd97b92
2 parents fbe11a5 + a97a012
commit cd97b92
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 34 deletions.
diff --git a/lib/dataServices/DbEvents.dart b/lib/dataServices/DbEvents.dart
@@ -241,6 +241,7 @@ class DbEvents {
         .select(
         "${Tb.events.id},"
         "${Tb.events.updated_at}")
+        .eq(Tb.events.is_hidden, false)
         .eq(Tb.events.occasion, RightsService.currentOccasion!);
 
     return List<EventModel>.from(
@@ -574,7 +575,7 @@ class DbEvents {
     }
     else
     {
-      upsertObj.addAll({Tb.events.occasion: RightsService.currentOccasion});
+      upsertObj.addAll({Tb.events.occasion: RightsService.currentOccasion!});
       eventData = await _supabase.from(Tb.events.table).insert(upsertObj).select().single();
     }
     return EventModel.fromJson(eventData);
@@ -654,7 +655,7 @@ class DbEvents {
     }
     else
     {
-      upsertObj.addAll({Tb.exclusive_groups.occasion: RightsService.currentOccasion});
+      upsertObj.addAll({Tb.exclusive_groups.occasion: RightsService.currentOccasion!});
       eventData = await _supabase.from(Tb.exclusive_groups.table).insert(upsertObj).select().single();
     }
     var updated = ExclusiveGroupModel.fromJson(eventData);

diff --git a/lib/dataServices/DbInformation.dart b/lib/dataServices/DbInformation.dart
@@ -14,26 +14,17 @@ import 'package:supabase_flutter/supabase_flutter.dart';
 class DbInformation {
   static final _supabase = Supabase.instance.client;
 
-  static Future<List<InformationModel>> getAllInformation() async {
-    var data = await _supabase.from(Tb.information.table).select();
-    var infoList = List<InformationModel>.from(
-        data.map((x) => InformationModel.fromJson(x)));
-    infoList.sortBy((element) => element.title??"".toLowerCase());
-    infoList.sort((a,b) => (a.getOrder().compareTo(b.getOrder())));
-    return infoList;
-  }
-
   static Future<List<InformationModel>> getAllInformationForDataGrid() async {
     var data = await _supabase.from(Tb.information.table).select(
         "${Tb.information.id},"
-            "${Tb.information.occasion},"
-            "${Tb.information.created_at},"
-            "${Tb.information.updated_at},"
-            "${Tb.information.is_hidden},"
-            "${Tb.information.title},"
-            "${Tb.information.order},"
-            "${Tb.information.type}"
-    );
+        "${Tb.information.occasion},"
+        "${Tb.information.created_at},"
+        "${Tb.information.updated_at},"
+        "${Tb.information.is_hidden},"
+        "${Tb.information.title},"
+        "${Tb.information.order},"
+        "${Tb.information.type}")
+    .eq(Tb.information.occasion, RightsService.currentOccasion!);
     var infoList = List<InformationModel>.from(
         data.map((x) => InformationModel.fromJson(x)));
     infoList.sortBy((element) => element.title??"".toLowerCase());
@@ -52,7 +43,8 @@ class DbInformation {
             "${Tb.information.title},"
             "${Tb.information.id}"
     )
-        .eq(Tb.information.is_hidden, false);
+        .eq(Tb.information.is_hidden, false)
+        .eq(Tb.information.occasion, RightsService.currentOccasion!);
 
     var infoList = List<InformationModel>.from(
         data.map((x) => InformationModel.fromJson(x)));
@@ -74,9 +66,10 @@ class DbInformation {
     var data = await _supabase
         .from(Tb.information.table)
         .select(
-        "${Tb.information.id},"
-            "${Tb.information.updated_at}"
-    );
+          "${Tb.information.id},"
+          "${Tb.information.updated_at}")
+        .eq(Tb.information.is_hidden, false)
+        .eq(Tb.information.occasion, RightsService.currentOccasion!);
 
     return List<InformationModel>.from(
         data.map((x) => InformationModel.fromJson(x)));
@@ -98,6 +91,7 @@ class DbInformation {
     }
     else
     {
+      upsertObj.addAll({Tb.information.occasion: RightsService.currentOccasion!});
       await _supabase.from(Tb.information.table).insert(upsertObj);
     }
   }
@@ -138,5 +132,4 @@ class DbInformation {
       }
     }
   }
-
 }
diff --git a/lib/dataServices/DbNews.dart b/lib/dataServices/DbNews.dart
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:fstapp/dataModels/NewsModel.dart';
 import 'package:fstapp/dataModels/Tb.dart';
 import 'package:fstapp/dataServices/AuthService.dart';
+import 'package:fstapp/dataServices/RightsService.dart';
 import 'package:fstapp/services/ToastHelper.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:html/parser.dart';
@@ -16,6 +17,7 @@ class DbNews {
 // from some reason lower than is behaving like lower and equal than on web platform
 // therefore additional check
         .neq(Tb.news.id, message.id)
+        .eq(Tb.news.occasion, RightsService.currentOccasion!)
         .order(Tb.news.created_at)
         .limit(1)
         .maybeSingle();
@@ -66,6 +68,7 @@ class DbNews {
       var messageForNews = heading != null ? "<strong>$heading</strong><br>$message" : message;
       await _supabase.from(Tb.news.table).insert(
           {
+            Tb.news.occasion: RightsService.currentOccasion!,
             Tb.news.message: messageForNews,
             Tb.news.created_by: AuthService.currentUserId()
           }
@@ -86,6 +89,7 @@ class DbNews {
       await _supabase.from(Tb.log_notifications.table)
           .insert(
           {
+            Tb.log_notifications.occasion: RightsService.currentOccasion!,
             Tb.log_notifications.to: to,
             Tb.log_notifications.content: basicMessage,
             Tb.log_notifications.heading: heading ?? headingDefault
@@ -107,6 +111,7 @@ class DbNews {
     var result = await _supabase
         .from(Tb.news.table)
         .select()
+        .eq(Tb.news.occasion, RightsService.currentOccasion!)
         .gt(Tb.news.id, lastMessageId)
         .count();
     return result.count;
@@ -117,8 +122,11 @@ class DbNews {
     int lastMessageId = 0;
     var lastMessage = await _supabase
         .from(Tb.user_news.table)
-        .select(Tb.user_news.news_id)
+        .select(
+        "${Tb.user_news.news_id},"
+        "${Tb.news.table}!inner(id)")
         .eq(Tb.user_news.user, AuthService.currentUserId())
+        .eq("${Tb.news.table}.${Tb.news.occasion}", RightsService.currentOccasion!)
         .maybeSingle();
     if (lastMessage != null) {
       lastMessageId = lastMessage[Tb.user_news.news_id];
@@ -130,7 +138,15 @@ class DbNews {
     AuthService.ensureUserIsLoggedIn();
     await _supabase
         .from(Tb.user_news.table)
-        .upsert({Tb.user_news.user: AuthService.currentUserId(), Tb.user_news.news_id: newsId}).select();
+        .delete()
+        .eq(Tb.user_news.user, AuthService.currentUserId())
+        .eq("${Tb.news.table}.${Tb.news.occasion}", RightsService.currentOccasion!);
+
+    await _supabase
+        .from(Tb.user_news.table)
+        .insert(
+        {Tb.user_news.user: AuthService.currentUserId(), Tb.user_news.news_id: newsId}
+    ).select();
   }
 
   static Future<List<NewsModel>> getAllNewsMessages() async {
@@ -141,11 +157,12 @@ class DbNews {
     var data = await _supabase
         .from(Tb.news.table)
         .select(
-        "${Tb.news.id},"
+            "${Tb.news.id},"
             "${Tb.news.created_at},"
             "${Tb.news.message},"
             "${Tb.user_info_public.table}(${Tb.user_info_public.name},${Tb.user_info_public.surname}),"
             "${Tb.user_news_views.table}(count)")
+        .eq(Tb.news.occasion, RightsService.currentOccasion!)
         .order(Tb.news.created_at);
 
     List<NewsModel> loadedMessages = List<NewsModel>.from(data.map((x) => NewsModel.fromJson(x)));

diff --git a/lib/dataServices/DbPlaces.dart b/lib/dataServices/DbPlaces.dart
@@ -11,14 +11,21 @@ import 'package:supabase_flutter/supabase_flutter.dart';
 class DbPlaces {
   static final _supabase = Supabase.instance.client;
   static Future<List<PlaceModel>> getMapPlaces() async {
-    var data = await _supabase.from(Tb.places.table).select().eq(Tb.places.is_hidden, false);
+    var data = await _supabase
+        .from(Tb.places.table)
+        .select()
+        .eq(Tb.places.is_hidden, false)
+        .eq(Tb.places.occasion, RightsService.currentOccasion!);
     var toReturn = List<PlaceModel>.from(data.map((x) => PlaceModel.fromJson(x)));
     toReturn.sortPlaces(false);
     return toReturn;
   }
 
   static Future<List<PlaceModel>> getAllPlaces() async {
-    var data = await _supabase.from(Tb.places.table).select();
+    var data = await _supabase
+        .from(Tb.places.table)
+        .select()
+        .eq(Tb.places.occasion, RightsService.currentOccasion!);
     var toReturn = List<PlaceModel>.from(data.map((x) => PlaceModel.fromJson(x)));
     toReturn.sortPlaces();
     return toReturn;
@@ -40,7 +47,11 @@ class DbPlaces {
   }
 
   static Future<PlaceModel> getPlace(int id) async {
-    var data = await _supabase.from(Tb.places.table).select().eq(Tb.places.id, id).single();
+    var data = await _supabase
+        .from(Tb.places.table)
+        .select()
+        .eq(Tb.places.id, id)
+        .single();
     return PlaceModel.fromJson(data);
   }
 
@@ -50,15 +61,16 @@ class DbPlaces {
 
   static Future<PlaceModel> updatePlace(PlaceModel placeModel) async
   {
-    var json = placeModel.toJson();
+    var upsertObj = placeModel.toJson();
     Map<String, dynamic> data;
     if(placeModel.id!=null) {
-      data = await _supabase.from(Tb.places.table).update(json).eq(Tb.places.id, placeModel.id!).select().single();
+      data = await _supabase.from(Tb.places.table).update(upsertObj).eq(Tb.places.id, placeModel.id!).select().single();
     }
     else
     {
-      json.remove(Tb.places.id);
-      data = await _supabase.from(Tb.places.table).insert(json).select().single();
+      upsertObj.remove(Tb.places.id);
+      upsertObj.addAll({Tb.places.occasion: RightsService.currentOccasion!});
+      data = await _supabase.from(Tb.places.table).insert(upsertObj).select().single();
     }
     return PlaceModel.fromJson(data);
   }