Start on FoodEntries

ComputerElite · ComputerElite · commit 9413364782f1 · 2025-04-20T10:09:08.000+02:00
diff --git a/EatSomewhere/Data/Assembly.cs b/EatSomewhere/Data/Assembly.cs
@@ -16,5 +16,7 @@ public class Assembly
     public string Description { get; set; }
     public List<User> Admins { get; set; }= new();
     [JsonIgnore] public List<Food> Foods { get; set; } = new();
+    [JsonIgnore] public List<FoodEntry> FoodEntries { get; set; }
+
     [JsonIgnore] public List<Ingredient> Ingredients = new();
 }
diff --git a/EatSomewhere/Data/FoodEntry.cs b/EatSomewhere/Data/FoodEntry.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
 using EatSomewhere.Users;
 
 namespace EatSomewhere.Data;
@@ -18,4 +19,8 @@ public class FoodEntry
     public int PersonCount => Participants.Sum(x => x.AdditionalPersons + 1);
     public List<FoodParticipant> Participants { get; set; }
     public User PayedBy { get; set; }
+    [JsonIgnore]
+    public Assembly Assembly { get; set; }
+
+    public User CreatedBy { get; set; }
 }
diff --git a/EatSomewhere/Data/FoodParticipant.cs b/EatSomewhere/Data/FoodParticipant.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
 using EatSomewhere.Users;
 
 namespace EatSomewhere.Data;
@@ -8,7 +9,9 @@ public class FoodParticipant
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public string Id;
     public User User;
+    public int AdditionalPersons;
+    [JsonIgnore]
     public Food Food;
+    [JsonIgnore]
     public Assembly Assembly;
-    public int AdditionalPersons;
 }
diff --git a/EatSomewhere/Database/AppDbContext.cs b/EatSomewhere/Database/AppDbContext.cs
@@ -50,6 +50,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<FoodEntry>().Navigation(x => x.Participants).AutoInclude();
         modelBuilder.Entity<FoodEntry>().HasMany(x => x.Participants).WithMany();
         modelBuilder.Entity<FoodEntry>().Navigation(x => x.PayedBy).AutoInclude();
+        modelBuilder.Entity<FoodEntry>().Navigation(x => x.CreatedBy).AutoInclude();
+        modelBuilder.Entity<FoodEntry>().HasOne(x => x.Assembly).WithMany(x => x.FoodEntries);
         
         modelBuilder.Entity<FoodParticipant>().HasKey(x => x.Id);
         
diff --git a/EatSomewhere/Manager/FoodManager.cs b/EatSomewhere/Manager/FoodManager.cs
@@ -9,6 +9,30 @@ namespace EatSomewhere.Manager;
 
 public class FoodManager
 {
+    public static List<FoodEntry> GetFoodEntries(User user, string assemblyId, int skip, int count)
+    {
+        using var d = new AppDbContext();
+        d.Attach(user);
+        Assembly? assembly = d.Assemblies.Where(x => x.Id == assemblyId)
+            .Include(x => x.Users)
+            .Include(x => x.FoodEntries)
+            .ThenInclude(x => x.Participants)
+            .ThenInclude(x => x.User)
+            .FirstOrDefault();
+        if (assembly == null)
+        {
+            return new List<FoodEntry>();
+        }
+        if (!assembly.Users.Contains(user))
+        {
+            return new List<FoodEntry>();
+        }
+        return assembly.FoodEntries
+            .OrderByDescending(x => x.Date)
+            .Skip(skip)
+            .Take(count)
+            .ToList();
+    }
     public static List<Ingredient> GetIngredients(User user)
     {
         using var d = new AppDbContext();
@@ -121,6 +145,94 @@ public static ApiResponse<Food> CreateFood(User user, Food food)
             Data = food
         };
     }
+    
+    public static ApiResponse<FoodEntry> CreateFoodEntry(User user, FoodEntry food)
+    {
+        using var d = new AppDbContext();
+        d.Attach(user);
+        Assembly? a = d.Assemblies.FirstOrDefault(x => x.Id == food.Assembly.Id);
+        if (a == null)
+        {
+            return new ApiResponse<FoodEntry>
+            {
+                Success = false,
+                Error = "Assembly not found"
+            };
+        }
+
+        foreach (FoodParticipant p in food.Participants)
+        {
+            User? foundUser = a.Users.FirstOrDefault(x => x.Id == p.User.Id);
+            if (foundUser == null)
+            {
+                return new ApiResponse<FoodEntry>
+                {
+                    Success = false,
+                    Error = "Participant user not found"
+                };
+            }
+            p.User = foundUser;
+        }
+
+        Food? foundFood = d.Foods.FirstOrDefault(x => x.Id == food.Food.Id);
+        if (foundFood == null)
+        {
+            return new ApiResponse<FoodEntry>
+            {
+                Success = false,
+                Error = "Food not found"
+            };
+        }
+        food.Food = foundFood;
+        User? foundPayedBy = a.Users.FirstOrDefault(x => x.Id == food.PayedBy.Id);
+        if (foundPayedBy == null)
+        {
+            return new ApiResponse<FoodEntry>
+            {
+                Success = false,
+                Error = "PayedBy user not found"
+            };
+        }
+        food.PayedBy = foundPayedBy;
+        food.CreatedBy = user;
+        food.Assembly = a;
+        
+        // Check if food already exists and if yes, update it instead of creating it
+        FoodEntry? existingEntry = d.FoodEntries.FirstOrDefault(x => x.Id == food.Id);
+        if (existingEntry != null)
+        {
+            if (existingEntry.CreatedBy.Id != user.Id && !CanAdministrateAssembly(user, a))
+            {
+                return new ApiResponse<FoodEntry>
+                {
+                    Success = false,
+                    Error = "You are not allowed to edit this food"
+                };
+            }
+            // Replace existing database entry with new one
+            existingEntry.Date = food.Date;
+            existingEntry.Comment = food.Comment;
+            existingEntry.Food = food.Food;
+            existingEntry.Cost = food.Cost;
+            existingEntry.Participants = food.Participants;
+            existingEntry.PayedBy = food.PayedBy;
+            existingEntry.Assembly = food.Assembly;
+            existingEntry.CreatedBy = food.CreatedBy;
+        }
+        else
+        {
+            d.FoodEntries.Add(food);
+        }
+
+        d.SaveChanges();
+
+        return new ApiResponse<FoodEntry>
+        {
+            CreatedId = food.Id,
+            Success = true,
+            Data = food
+        };
+    }
 
     public static ApiResponse<Ingredient> CreateIngredient(User user, Ingredient ingredient)
     {
@@ -217,7 +329,7 @@ static bool CanAdministrateAssembly(User user, Assembly assembly)
     public static ApiResponse DeleteIngredient(User user, string id)
     {
         using var d = new AppDbContext();
-        var ingredient = d.Ingredients.FirstOrDefault(a => a.Id == id);
+        var ingredient = d.Ingredients.Where(a => a.Id == id).Include(x => x.Assembly).FirstOrDefault();
         if (ingredient == null)
         {
             return new ApiResponse
@@ -244,6 +356,38 @@ public static ApiResponse DeleteIngredient(User user, string id)
             Success = true
         };
     }
+    
+    public static ApiResponse DeleteFoodEntry(User user, string id)
+    {
+        using var d = new AppDbContext();
+        var foodEntry = d.FoodEntries.Where(a => a.Id == id).Include(x => x.Assembly).FirstOrDefault();
+        if (foodEntry == null)
+        {
+            return new ApiResponse
+            {
+                Success = false,
+                Error = "FoodEntry not found"
+            };
+        }
+        
+        if (!CanAdministrateAssembly(user, foodEntry.Assembly))
+        {
+            return new ApiResponse
+            {
+                Success = false,
+                Error = "User is not an admin of this assembly"
+            };
+        }
+
+        d.Remove(foodEntry);
+        
+        d.SaveChanges();
+        
+        return new ApiResponse
+        {
+            Success = true
+        };
+    }
 
     public static ApiResponse<String> RequestJoinAssembly(User user, string name)
     {
@@ -392,11 +536,19 @@ public static ApiResponse<String> RemoveUserFromAssembly(User user, string assem
         using var d = new AppDbContext();
         return d.Foods.FirstOrDefault(a => a.Id == id && a.Assembly.Users.Contains(user));
     }
+    public static FoodEntry? GetFoodEntry(User user, string id)
+    {
+        using var d = new AppDbContext();
+        return d.FoodEntries.Where(a => a.Id == id && a.Assembly.Users.Contains(user))
+            .Include(x => x.Participants)
+            .ThenInclude(x => x.User)
+            .FirstOrDefault();
+    }
 
     public static ApiResponse DeleteFood(User user, string id)
     {
         using var d = new AppDbContext();
-        var food = d.Foods.FirstOrDefault(a => a.Id == id);
+        var food = d.Foods.Where(a => a.Id == id).Include(x => x.Assembly).FirstOrDefault();
         if (food == null)
         {
             return new ApiResponse
@@ -429,7 +581,10 @@ public static ApiResponse<String> PromoteUserToAdmin(User user, string assemblyI
     {
         using var d = new AppDbContext();
         d.Attach(user);
-        Assembly? assembly = GetAssembly(user, assemblyId);
+        Assembly? assembly = d.Assemblies.Where(x => x.Id == assemblyId)
+            .Include(x => x.Users)
+            .Include(x => x.Admins)
+            .FirstOrDefault();
         if (assembly == null)
         {
             return new ApiResponse<String>
@@ -439,14 +594,12 @@ public static ApiResponse<String> PromoteUserToAdmin(User user, string assemblyI
             };
         }
 
-        d.Attach(assembly);
-        if (assembly.Admins.Contains(user))
+        if (!CanAdministrateAssembly(user, assembly))
         {
             return new ApiResponse<String>
             {
-                Success = true,
-                Error = "User is already an admin of this assembly",
-                Data = "User is already an admin of this assembly"
+                Success = false,
+                Error = "You cannot administrate this assembly!"
             };
         }
         User? foundUser = assembly.Users.FirstOrDefault(x => x.Id == userId);
@@ -458,6 +611,14 @@ public static ApiResponse<String> PromoteUserToAdmin(User user, string assemblyI
                 Error = "User not found in assembly"
             };
         }
+        if (assembly.Admins.Contains(foundUser))
+        {
+            return new ApiResponse<String>
+            {
+                Success = true,
+                Data = "User is already an admin of this assembly"
+            };
+        }
         assembly.Admins.Add(foundUser);
         d.SaveChanges();
         return new ApiResponse<String>
diff --git a/EatSomewhere/Server/FoodWebserver.cs b/EatSomewhere/Server/FoodWebserver.cs
@@ -65,7 +65,11 @@ public static void RegisterRESTForType<T>(string path, HttpServer server, Func<U
     }
     public static void AddFoodRoutes(HttpServer server)
     {
-        
+        ////// Food Entries //////
+        /// DELETE archives food entries
+        //api/v1/foodentries/<assemblyId>?skip=<int>&count=<int>
+        RegisterPagedListForType("/api/v1/foodentries/", server, FoodManager.GetFoodEntries);
+        RegisterRESTForType("/api/v1/foodentry/", server, FoodManager.GetFoodEntry, FoodManager.CreateFoodEntry, FoodManager.DeleteFoodEntry);
         
         ////// Food //////
         /// DELETE archives food
@@ -185,6 +189,46 @@ private static void SendResponse(ServerRequest request, ApiResponse response)
     {
         request.SendString(JsonSerializer.Serialize(response), "application/json", response.Success ? 200 : 400);
     }
+    
+    private static void RegisterPagedListForType<T>(string apiPath, HttpServer server, Func<User, string, int, int, List<T>> listMethod)
+    {        
+        server.AddRoute("GET", apiPath, request =>
+        {
+            request.allowAllOrigins = true;
+            User? user = UserManagementServer.GetUserBySession(request);
+            if (user == null)
+            {
+                ApiError.SendUnauthorized(request);
+                return true;
+            }
+            int skip = 0;
+            int count = 0;
+            if(request.queryString.Get("skip") != null)
+            {
+                try
+                {
+                    skip = int.Parse(request.queryString.Get("skip") ?? string.Empty);
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+            if(request.queryString.Get("count") != null)
+            {
+                try
+                {
+                    count = int.Parse(request.queryString.Get("count") ?? string.Empty);
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+            request.SendString(JsonSerializer.Serialize(listMethod(user, request.pathDiff, skip, count)), "application/json");
+            return true;
+        });
+    }
 
     private static void RegisterListForType<T>(string apiPath, HttpServer server, Func<User, List<T>> listMethod)
     {        
diff --git a/app/lib/data/foodentry.dart b/app/lib/data/foodentry.dart
diff --git a/app/lib/screens/food_entry_screen.dart b/app/lib/screens/food_entry_screen.dart
diff --git a/app/lib/screens/screen_selector.dart b/app/lib/screens/screen_selector.dart

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,7 @@ public class Assembly`
`16`	`16`	`public string Description { get; set; }`
`17`	`17`	`public List<User> Admins { get; set; }= new();`
`18`	`18`	`[JsonIgnore] public List<Food> Foods { get; set; } = new();`
	`19`	`+ [JsonIgnore] public List<FoodEntry> FoodEntries { get; set; }`
	`20`	`+`
`19`	`21`	`[JsonIgnore] public List<Ingredient> Ingredients = new();`
`20`	`22`	`}`