list cmd now 5 per page and proper page counting + orderby name

xiaoxiao921 · Jun 18, 2020 · 3bde2dd · 3bde2dd
1 parent 45a5169
commit 3bde2dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/CHEF/Components/Commands/Cooking/CookModule.cs b/CHEF/Components/Commands/Cooking/CookModule.cs
@@ -39,16 +39,19 @@ public async Task GetRecipe(
             ("Prints a list of all availables cooking recipes.")]
         [Alias("l", "ls")]
         public async Task ListRecipes(
-            [Summary("Optional word to filter the search.")]
-            string cmdName = null,
             [Summary("Optional page if multiple pages are returned.")]
-            int page = 1)
+            int page = 1,
+            [Summary("Optional word to filter the search.")]
+            string cmdName = null
+            )
         {
             if (page < 1)
                 page = 1;
 
             List<Recipe> recipes;
             int totalRecipeCount;
+            const int descMaxLength = 10;
+
             using (var context = new RecipeContext())
             {
                 recipes = await context.GetRecipes(cmdName, page - 1);
@@ -58,13 +61,14 @@ public async Task ListRecipes(
             foreach (var recipe in recipes)
             {
                 var recipeText = recipe.Text;
-                var recipeTextLength = recipeText.Length > 20 ? 20 : recipeText.Length;
+                var recipeTextLength = recipeText.Length > descMaxLength ? descMaxLength : recipeText.Length;
                 embedBuilder.AddField($"{recipe.Name}", $"{recipeText.Substring(0, recipeTextLength)}");
             }
 
             if (recipes.Count > 0)
             {
-                var totalPage = totalRecipeCount / RecipeContext.NumberPerPage;
+                var totalPage = totalRecipeCount / RecipeContext.NumberPerPage +
+                                (totalRecipeCount % RecipeContext.NumberPerPage == 0 ? 0 : 1);
                 if (totalPage == 0)
                     totalPage += 1;
 

diff --git a/CHEF/Components/Commands/Cooking/Recipe.cs b/CHEF/Components/Commands/Cooking/Recipe.cs
@@ -10,7 +10,7 @@ namespace CHEF.Components.Commands.Cooking
     public class RecipeContext : DbContext
     {
         public DbSet<Recipe> Recipes { get; set; }
-        public const int NumberPerPage = 25;
+        public const int NumberPerPage = 5;
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
@@ -20,8 +20,10 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             optionsBuilder.UseNpgsql(global::CHEF.Database.Connection, builder =>
             {
+#if RELEASE
                 // callback for validating the server certificate against a CA certificate file.
                 builder.RemoteCertificateValidationCallback(global::CHEF.Database.RemoteCertificateValidationCallback);
+#endif
             });
             optionsBuilder.UseSnakeCaseNamingConvention();
         }
@@ -35,12 +37,20 @@ public async Task<List<Recipe>> GetRecipes(string nameFilter = null, int page =
             List<Recipe> recipes;
             if (nameFilter != null)
             {
-                recipes = await Recipes.AsQueryable().Where(r => r.Name.ToLower().Contains(nameFilter.ToLower()))
-                    .Skip(NumberPerPage * page).Take(NumberPerPage).ToListAsync();
+                recipes = await Recipes.AsQueryable().
+                    Where(r => r.Name.ToLower().Contains(nameFilter.ToLower())).
+                    Skip(NumberPerPage * page).
+                    Take(NumberPerPage).
+                    OrderBy(r => r.Name).
+                    ToListAsync();
             }
             else
             {
-                recipes = await Recipes.AsQueryable().Skip(NumberPerPage * page).Take(NumberPerPage).ToListAsync();
+                recipes = await Recipes.AsQueryable().
+                    Skip(NumberPerPage * page).
+                    Take(NumberPerPage).
+                    OrderBy(r => r.Name).
+                    ToListAsync();
             }
 
             return recipes;