Changeset 7f1a891

Timestamp:

10/14/21 17:57:17 (3 years ago)

Author:

Стојков Марко <mst@…>

Branches:

dev

Children:

6d639c9, f9983f5

Parents:

7dd2ea2 (diff), b25b9ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged get question endpoint

Location:

src/FinkiChattery

Files:

• FinkiChattery.Api/ApplicationServices/Questioning/Mapper/QuestionMapper.cs (added)
• FinkiChattery.Api/Controllers/v1/QuestionsController.cs (modified) (2 diffs)
• FinkiChattery.Api/FinkiChattery.Api.csproj (modified) (1 diff)
• FinkiChattery.Api/Services/RegisterServices.cs (modified) (3 diffs)
• FinkiChattery.Common/Mediator/Contracs/IQuery.cs (added)
• FinkiChattery.Common/Mediator/Contracs/IQueryHandler.cs (added)
• FinkiChattery.Common/Mediator/Interfaces/IMediatorService.cs (modified) (1 diff)
• FinkiChattery.Common/Mediator/MediatorService.cs (modified) (1 diff)
• FinkiChattery.Contracts/Questioning/GetQuestionState/QuestionStateResponse.cs (added)
• FinkiChattery.Database/FinkiChattery.Database.refactorlog (added)
• FinkiChattery.Database/FinkiChattery.Database.sqlproj (modified) (4 diffs)
• FinkiChattery.Database/dbo/Scripts/PostDeploymentScripts/Debug.PostDeployment.sql (modified) (1 diff)
• FinkiChattery.Database/dbo/Scripts/PostDeploymentScripts/Production.PostDeployment.sql (modified) (1 diff)
• FinkiChattery.Database/dbo/Scripts/Script.PostDeployment.sql (modified) (2 diffs)
• FinkiChattery.Database/dbo/Scripts/Script.PreDeployment.sql (modified) (2 diffs)
• FinkiChattery.Database/dbo/Tables/Answer/Answer.Debug.Seed.sql (added)
• FinkiChattery.Database/dbo/Tables/Answer/Answer.sql (moved) (moved from src/FinkiChattery/FinkiChattery.Database/dbo/Tables/Answer.sql ) (1 diff)
• FinkiChattery.Database/dbo/Tables/AnswerResponse/AnswerResponse.Debug.Seed.sql (added)
• FinkiChattery.Database/dbo/Tables/AnswerResponse/AnswerResponse.sql (moved) (moved from src/FinkiChattery/FinkiChattery.Database/dbo/Tables/AnswerResponse.sql ) (1 diff)
• FinkiChattery.Database/dbo/Tables/Question/Question.Debug.Seed.sql (added)
• FinkiChattery.Database/dbo/Tables/Question/Question.sql (moved) (moved from src/FinkiChattery/FinkiChattery.Database/dbo/Tables/Question.sql )
• FinkiChattery.Database/dbo/Tables/QuestionCategory/QuestionCategory.Debug.Seed.sql (added)
• FinkiChattery.Database/dbo/Tables/QuestionCategory/QuestionCategory.sql (moved) (moved from src/FinkiChattery/FinkiChattery.Database/dbo/Tables/QuestionCategory.sql ) (1 diff)
• FinkiChattery.Persistence/Configurations/AnswerConfig.cs (modified) (1 diff)
• FinkiChattery.Persistence/Configurations/AnswerResponseConfig.cs (modified) (1 diff)
• FinkiChattery.Persistence/Configurations/QuestionCategoryConfig.cs (modified) (1 diff)
• FinkiChattery.Persistence/Models/Answer.cs (modified) (1 diff)
• FinkiChattery.Persistence/Repositories/Base/IRepository.cs (added)
• FinkiChattery.Persistence/Repositories/Base/Repository.cs (modified) (2 diffs)
• FinkiChattery.Persistence/Repositories/Contracts/IQuestionRepo.cs (modified) (1 diff)
• FinkiChattery.Persistence/Repositories/Contracts/Question/QuestionStateDto.cs (added)
• FinkiChattery.Persistence/Repositories/Implementations/QuestionRepo.cs (modified) (2 diffs)
• FinkiChattery.Queries/FinkiChattery.Queries.csproj (modified) (2 diffs)
• FinkiChattery.Queries/Questioning/GetQuestionState/GetQuestionStateQuery.cs (added)

src/FinkiChattery/FinkiChattery.Api/Controllers/v1/QuestionsController.cs

@@ -1 +1 @@
 using FinkiChattery.Api.ApplicationServices.Authentication;
+using FinkiChattery.Api.ApplicationServices.Questioning;
 using FinkiChattery.Commands.Questioning;
 using FinkiChattery.Common.Mediator.Interfaces;
 using FinkiChattery.Contracts.Questioning;
+using FinkiChattery.Queries.Questioning;
 using IdentityServer4.AccessTokenValidation;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Threading.Tasks;
 
@@ -29 +32 @@
             return Ok();
         }
+
+        [HttpGet("{questionUid:Guid}")]
+        [Authorize]
+        public async Task<IActionResult> GetQuestionState([FromRoute]Guid questionUid)
+        {
+            var questionDto = await MediatorService.SendQueryAsync(new GetQuestionStateQuery(questionUid));
+            return Ok(questionDto.ToQuestionStateResponse());
+        }
     }
 }

src/FinkiChattery/FinkiChattery.Api/FinkiChattery.Api.csproj

@@ -26 +26 @@
     <ProjectReference Include="..\FinkiChattery.Contracts\FinkiChattery.Contracts.csproj" />
     <ProjectReference Include="..\FinkiChattery.Persistence\FinkiChattery.Persistence.csproj" />
+    <ProjectReference Include="..\FinkiChattery.Queries\FinkiChattery.Queries.csproj" />
   </ItemGroup>
 

src/FinkiChattery/FinkiChattery.Api/Services/RegisterServices.cs

@@ -9 +9 @@
 using FinkiChattery.Persistence.Models;
 using FinkiChattery.Persistence.Repositories;
+using FinkiChattery.Queries.Questioning;
 using Hangfire;
 using Hangfire.SqlServer;
@@ -29 +30 @@
             services.AddScoped<IEventService, EventService>();
             services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
-            services.AddMediatR(typeof(AskQuestionCommand));
+            services.AddMediatR(typeof(AskQuestionCommand), typeof(GetQuestionStateQuery));
         }
 
@@ -143 +144 @@
                         services.AddScoped<IStorageService, AwsStorageService>();*/
         }
-
-        // TODO: ADD HANGFIRE AND SCAFOLD DB IN HANGFIREDB
     }
 

src/FinkiChattery/FinkiChattery.Common/Mediator/Interfaces/IMediatorService.cs

@@ -11 +11 @@
         Task<TResponse> SendAsync<TResponse>(ICommand<TResponse> request);
 
+        Task<TResponse> SendQueryAsync<TResponse>(IQuery<TResponse> request, CancellationToken cancellationToken);
+
+        Task<TResponse> SendQueryAsync<TResponse>(IQuery<TResponse> request);
+
         Task PublishAsync<TNotification>(TNotification notification) where TNotification : IEvent;
 

src/FinkiChattery/FinkiChattery.Common/Mediator/MediatorService.cs

@@ -37 +37 @@
             await mediator.Publish(notification, default);
         }
+
+        public async Task<TResponse> SendQueryAsync<TResponse>(IQuery<TResponse> request, CancellationToken cancellationToken)
+        {
+            return await mediator.Send(request, cancellationToken);
+        }
+
+        public async Task<TResponse> SendQueryAsync<TResponse>(IQuery<TResponse> request)
+        {
+            return await mediator.Send(request);
+        }
     }
 }

src/FinkiChattery/FinkiChattery.Database/FinkiChattery.Database.sqlproj

@@ -70 +70 @@
     <Folder Include="dbo\Tables\Student" />
     <Folder Include="FullTextSearch" />
+    <Folder Include="dbo\Tables\Answer" />
+    <Folder Include="dbo\Tables\AnswerResponse" />
+    <Folder Include="dbo\Tables\Question" />
+    <Folder Include="dbo\Tables\QuestionCategory" />
+    <Folder Include="Snapshots" />
   </ItemGroup>
   <ItemGroup>
     <Build Include="dbo\Tables\Moderator.sql" />
     <Build Include="dbo\Tables\Teacher.sql" />
-    <Build Include="dbo\Tables\Question.sql" />
     <Build Include="dbo\Tables\StudentTeam.sql" />
     <Build Include="dbo\Tables\TeacherTeam.sql" />
-    <Build Include="dbo\Tables\Answer.sql" />
-    <Build Include="dbo\Tables\QuestionCategory.sql" />
-    <Build Include="dbo\Tables\AnswerResponse.sql" />
     <Build Include="dbo\Tables\Upvote.sql" />
     <Build Include="dbo\Tables\User\AspNetRoleClaims.sql" />
@@ -91 +92 @@
     <Build Include="FullTextSearch\FullTextIndexQuestion.sql" />
     <Build Include="FullTextSearch\QuestionFullTextCatalog.sql" />
+    <Build Include="dbo\Tables\Question\Question.sql" />
+    <None Include="dbo\Tables\Question\Question.Debug.Seed.sql" />
+    <Build Include="dbo\Tables\Answer\Answer.sql" />
+    <None Include="dbo\Tables\Answer\Answer.Debug.Seed.sql" />
+    <Build Include="dbo\Tables\AnswerResponse\AnswerResponse.sql" />
+    <None Include="dbo\Tables\AnswerResponse\AnswerResponse.Debug.Seed.sql" />
+    <Build Include="dbo\Tables\QuestionCategory\QuestionCategory.sql" />
+    <None Include="dbo\Tables\QuestionCategory\QuestionCategory.Debug.Seed.sql" />
   </ItemGroup>
   <ItemGroup>
@@ -97 +106 @@
     <PreDeploy Include="dbo\Scripts\Script.PreDeployment.sql" />
     <None Include="FinkiChattery.Database.publish.xml" />
+    <None Include="Snapshots\FinkiChattery.Database_20210922_17-47-58.dacpac" />
   </ItemGroup>
   <ItemGroup>
@@ -120 +130 @@
     </SqlCmdVariable>
   </ItemGroup>
+  <ItemGroup>
+    <RefactorLog Include="FinkiChattery.Database.refactorlog" />
+  </ItemGroup>
 </Project>

src/FinkiChattery/FinkiChattery.Database/dbo/Scripts/PostDeploymentScripts/Debug.PostDeployment.sql

@@ -1 @@
-:r .\..\..\Tables\User\Seed\Users.Debug.Seed.sql
-:r .\..\..\Tables\Category\Category.Seed.sql
-:r .\..\..\Tables\Student\Student.Debug.Seed.sql
+:r ./../../Tables/User/Seed/Users.Debug.Seed.sql
+:r ./../../Tables/Category/Category.Seed.sql
+:r ./../../Tables/Student/Student.Debug.Seed.sql
+:r ./../../Tables/Question/Question.Debug.Seed.sql
+:r ./../../Tables/Answer/Answer.Debug.Seed.sql
+:r ./../../Tables/AnswerResponse/AnswerResponse.Debug.Seed.sql
+:r ./../../Tables/QuestionCategory/QuestionCategory.Debug.Seed.sql

src/FinkiChattery/FinkiChattery.Database/dbo/Scripts/PostDeploymentScripts/Production.PostDeployment.sql

@@ -1 @@
-:r .\..\..\Tables\Category\Category.Seed.sql
+:r ./../../Tables/Category/Category.Seed.sql

src/FinkiChattery/FinkiChattery.Database/dbo/Scripts/Script.PostDeployment.sql

@@ -4 +4 @@
                 PRINT 'Deploying DEBUG scripts';
         END
-        :r .\PostDeploymentScripts\Debug.PostDeployment.sql
+        :r ./PostDeploymentScripts/Debug.PostDeployment.sql
         BEGIN --Run scripts 
                 PRINT 'End deploying DEBUG scripts';
@@ -15 +15 @@
                 PRINT 'Deploying PRODUCTION scripts' 
         END
-                :r .\PostDeploymentScripts\Production.PostDeployment.sql
+                :r ./PostDeploymentScripts/Production.PostDeployment.sql
                 BEGIN --Run scripts 
                 PRINT 'End deploying PRODUCTION scripts' 

src/FinkiChattery/FinkiChattery.Database/dbo/Scripts/Script.PreDeployment.sql

@@ -4 +4 @@
                 PRINT 'Deploying DEBUG pre deployment scripts';
         END
-        :r .\PreDeploymentScripts\Debug.PreDeployment.sql
+        :r ./PreDeploymentScripts/Debug.PreDeployment.sql
         BEGIN --Run scripts 
                 PRINT 'End deploying DEBUG pre deployment scripts';
@@ -15 +15 @@
                 PRINT 'Deploying PRODUCTION pre deployment scripts' 
         END
-        :r .\PreDeploymentScripts\Production.PreDeployment.sql
+        :r ./PreDeploymentScripts/Production.PreDeployment.sql
         BEGIN --Run scripts 
                 PRINT 'End deploying PRODUCTION pre deployment scripts' 

src/FinkiChattery/FinkiChattery.Database/dbo/Tables/Answer/Answer.sql

@@ -7 +7 @@
     [CorrectAnswer] BIT              NOT NULL,
     [CreatedOn]     SMALLDATETIME    NOT NULL,
+    [UpvotesCount] BIGINT NOT NULL DEFAULT 0, 
     CONSTRAINT [PK_Answer] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_Answer_Question_QuestionFk] FOREIGN KEY ([QuestionFk]) REFERENCES [dbo].[Question] ([Id]),

src/FinkiChattery/FinkiChattery.Database/dbo/Tables/AnswerResponse/AnswerResponse.sql

@@ -8 +8 @@
     CONSTRAINT [PK_AnswerResponse] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_AnswerResponse_Answer_AnswerFk] FOREIGN KEY ([AnswerFk]) REFERENCES [dbo].[Answer] ([Id]),
-    CONSTRAINT [FK_AnswerResponse_Student_AnswerFk] FOREIGN KEY ([AnswerFk]) REFERENCES [dbo].[Student] ([Id])
+    CONSTRAINT [FK_AnswerResponse_Student_AnswerFk] FOREIGN KEY ([StudentFk]) REFERENCES [dbo].[Student] ([Id])
 );
 

src/FinkiChattery/FinkiChattery.Database/dbo/Tables/QuestionCategory/QuestionCategory.sql

@@ -5 +5 @@
     [CategoryFk] BIGINT           NOT NULL,
     CONSTRAINT [PK_QuestionCategory] PRIMARY KEY CLUSTERED ([Id] ASC),
-    CONSTRAINT [FK_QuestionCategory_Category_QuestionFk] FOREIGN KEY ([QuestionFk]) REFERENCES [dbo].[Category] ([Id]),
+    CONSTRAINT [FK_QuestionCategory_Category_CategoryFk] FOREIGN KEY ([CategoryFk]) REFERENCES [dbo].[Category] ([Id]),
     CONSTRAINT [FK_QuestionCategory_Question_QuestionFk] FOREIGN KEY ([QuestionFk]) REFERENCES [dbo].[Question] ([Id])
 );

src/FinkiChattery/FinkiChattery.Persistence/Configurations/AnswerConfig.cs

@@ -22 +22 @@
             builder.Property(x => x.CorrectAnswer).HasColumnName(@"CorrectAnswer").HasColumnType("bit").IsRequired();
             builder.Property(x => x.CreatedOn).HasColumnName(@"CreatedOn").HasColumnType("smalldatetime").IsRequired();
+            builder.Property(x => x.UpvotesCount).HasColumnName(@"UpvotesCount").HasColumnType("bigint").IsRequired().HasDefaultValue(0);
 
             builder.HasOne(x => x.Question).WithMany(x => x.Answers).HasForeignKey(x => x.QuestionFk).OnDelete(DeleteBehavior.Restrict);

src/FinkiChattery/FinkiChattery.Persistence/Configurations/AnswerResponseConfig.cs

@@ -28 +28 @@
 
             builder.HasOne(x => x.Answer).WithMany(x => x.AnswerResponses).HasForeignKey(x => x.AnswerFk).OnDelete(DeleteBehavior.Restrict);
-            builder.HasOne(x => x.Student).WithMany().HasForeignKey(x => x.AnswerFk).OnDelete(DeleteBehavior.Restrict);
+            builder.HasOne(x => x.Student).WithMany().HasForeignKey(x => x.StudentFk).OnDelete(DeleteBehavior.Restrict);
         }
     }

src/FinkiChattery/FinkiChattery.Persistence/Configurations/QuestionCategoryConfig.cs

@@ -26 +26 @@
 
             builder.HasOne(x => x.Question).WithMany(x => x.QuestionCategories).HasForeignKey(x => x.QuestionFk).OnDelete(DeleteBehavior.Restrict);
-            builder.HasOne(x => x.Category).WithMany().HasForeignKey(x => x.QuestionFk).OnDelete(DeleteBehavior.Restrict);
+            builder.HasOne(x => x.Category).WithMany().HasForeignKey(x => x.CategoryFk).OnDelete(DeleteBehavior.Restrict);
         }
     }

src/FinkiChattery/FinkiChattery.Persistence/Models/Answer.cs

@@ -20 +20 @@
         public DateTime CreatedOn { get; set; }
 
+        public long UpvotesCount { get; set; }
+
         public virtual ICollection<Upvote> Upvotes { get; set; }
 

src/FinkiChattery/FinkiChattery.Persistence/Repositories/Base/Repository.cs

@@ -8 +8 @@
 namespace FinkiChattery.Persistence.Repositories
 {
-    public abstract class Repository<T> where T : BaseEntity
+    public abstract class Repository<T> : IRepository<T> where T : BaseEntity
     {
         public Repository(ApplicationDbContext dbContext)
@@ -29 +29 @@
         }
 
-        public void Add(T entity)
+        public async Task Add(T entity)
         {
             DbSet.Add(entity);
+            await DbContext.SaveChangesAsync();
         }
 

src/FinkiChattery/FinkiChattery.Persistence/Repositories/Contracts/IQuestionRepo.cs

@@ -1 @@
-namespace FinkiChattery.Persistence.Repositories
+using FinkiChattery.Persistence.Repositories.Contracts;
+using System;
+using System.Threading.Tasks;
+
+namespace FinkiChattery.Persistence.Repositories
 {
     public interface IQuestionRepo
     {
+        Task<QuestionStateDto> GetQuestionState(Guid questionUid);
     }
 }

src/FinkiChattery/FinkiChattery.Persistence/Repositories/Implementations/QuestionRepo.cs

@@ -1 +1 @@
 using FinkiChattery.Persistence.Context;
 using FinkiChattery.Persistence.Models;
+using FinkiChattery.Persistence.Repositories.Contracts;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace FinkiChattery.Persistence.Repositories
@@ -9 +14 @@
         {
         }
+
+        public async Task<QuestionStateDto> GetQuestionState(Guid questionUid)
+        {
+            // TODO: MAYBE WRITE THIS QUERY AS SP ??
+            var questionDto = await DbSet
+              .AsNoTracking()
+              .Include(x => x.Student)
+              .Include(x => x.Team)
+              .Include(x => x.Answers).ThenInclude(y => y.Student)
+              .Include(x => x.Answers).ThenInclude(y => y.AnswerResponses).ThenInclude(y => y.Student)
+              .Include(x => x.QuestionCategories).ThenInclude(y => y.Category)
+              .Where(x => x.Uid == questionUid)
+              .Select(x => new QuestionStateDto(
+                                                x.Id,
+                                                x.Uid,
+                                                x.Title,
+                                                x.Text,
+                                                x.CreatedOn,
+                                                x.Views,
+                                                x.LastActiveOn,
+                                                new StudentQuestionStateDto(
+                                                  x.Student.Id,
+                                                  x.Student.Uid,
+                                                  x.Student.IndexNumber,
+                                                  x.Student.ImageUrl),
+                                                x.Answers.Select(y =>
+                                                new AnswerQuestionStateDto(
+                                                    y.Id,
+                                                    y.Uid,
+                                                    y.Text,
+                                                    y.CorrectAnswer,
+                                                    y.CreatedOn,
+                                                    y.UpvotesCount,
+                                                    new AnswerStudentQuestionStateDto(
+                                                        y.Student.Id,
+                                                        y.Student.Uid,
+                                                        y.Student.IndexNumber,
+                                                        y.Student.ImageUrl),
+                                                    y.AnswerResponses.Select(z =>
+                                                    new AnswerResponseQuestionStateDto(
+                                                        z.Id,
+                                                        z.Uid,
+                                                        z.Text,
+                                                        z.CreatedOn,
+                                                        new AnswerResponseStudentQuestionStateDto(
+                                                            z.Student.Id,
+                                                            z.Student.Uid,
+                                                            z.Student.IndexNumber,
+                                                            z.Student.ImageUrl))))),
+                                                x.QuestionCategories.Select(y =>
+                                                new QuestionCategoryQuestionStateDto(
+                                                    y.Id,
+                                                    y.Uid,
+                                                    y.Category.Name)),
+                                                x.Team == null ? null : new TeamQuestionStateDto(
+                                                    x.Team.Id,
+                                                    x.Team.Uid,
+                                                    x.Team.Name)))
+              .FirstOrDefaultAsync();
+
+            return questionDto;
+        }
     }
 }

src/FinkiChattery/FinkiChattery.Queries/FinkiChattery.Queries.csproj

@@ -1 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -5 +5 @@
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\FinkiChattery.Common\FinkiChattery.Common.csproj" />
+    <ProjectReference Include="..\FinkiChattery.Persistence\FinkiChattery.Persistence.csproj" />
+  </ItemGroup>
+
 </Project>