system/default prompt to front

sdcb · Dec 5, 2024 · e4c1190 · e4c1190
1 parent 4b1a522
commit e4c1190
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/BE/Controllers/Chats/Prompts/PromptsController.cs b/src/BE/Controllers/Chats/Prompts/PromptsController.cs
@@ -16,7 +16,9 @@ public async Task<ActionResult<PromptDto[]>> GetPrompts(CancellationToken cancel
     {
         PromptDto[] prompts = await db.Prompts
             .Where(x => x.CreateUserId == currentUser.Id || currentUser.IsAdmin && x.IsSystem)
-            .OrderBy(x => x.UpdatedAt)
+            .OrderBy(x => x.IsSystem)
+            .ThenBy(x => x.IsDefault)
+            .ThenBy(x => x.UpdatedAt)
             .Select(x => new PromptDto()
             {
                 Content = x.Content,
@@ -36,7 +38,9 @@ public async Task<ActionResult<BriefPromptDto[]>> GetBriefPrompts(CancellationTo
     {
         BriefPromptDto[] prompts = await db.Prompts
             .Where(x => x.CreateUserId == currentUser.Id || currentUser.IsAdmin && x.IsSystem)
-            .OrderBy(x => x.UpdatedAt)
+            .OrderBy(x => x.IsSystem)
+            .ThenBy(x => x.IsDefault)
+            .ThenBy(x => x.UpdatedAt)
             .Select(x => new BriefPromptDto()
             {
                 Id = x.Id,
@@ -78,7 +82,7 @@ public async Task<ActionResult<PromptDto>> GetDefaultPrompt(CancellationToken ca
                 .FirstOrDefaultAsync(cancellationToken);
         Prompt? systemDefault = await db.Prompts
                 .OrderByDescending(x => x.UpdatedAt)
-                .Where(x => x.IsDefault && x.IsSystem)
+                .Where(x => x.IsSystem)
                 .FirstOrDefaultAsync(cancellationToken);
         Prompt? consolidated = userDefault ?? systemDefault;
 

diff --git a/src/scripts/20241129-file.sql b/src/scripts/20241129-file.sql
@@ -1350,4 +1350,11 @@ FROM [dbo].[MessageContent]
 WHERE ContentTypeId = 2;
 
 ALTER TABLE [dbo].[MessageContent]
-DROP COLUMN [Content];
+DROP COLUMN [Content];
+
+
+-- 20241205
+EXECUTE sp_rename N'dbo.MessageContentUTF16', N'MessageContentText', 'OBJECT';
+INSERT INTO MessageContentText(Id, Content)
+SELECT Id, Content FROM MessageContentUTF8;
+DROP TABLE MessageContentUTF8;