API Gateway/Solutions: исправлена модель для отправки решения

Author: DedSec256

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/SolutionsController.cs

@@ -16,6 +16,7 @@
 using HwProj.SolutionsService.Client;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using PostSolutionModel = HwProj.APIGateway.API.Models.Solutions.PostSolutionModel;
 
 namespace HwProj.APIGateway.API.Controllers;
 
@@ -279,10 +280,12 @@ public async Task<IActionResult> GetTaskSolutionsPageData(long taskId, string? s
     [HttpPost("{taskId}")]
     [Authorize(Roles = Roles.StudentRole)]
     [ProducesResponseType(typeof(long), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> PostSolution(SolutionViewModel model, long taskId)
+    public async Task<IActionResult> PostSolution(PostSolutionModel model, long taskId)
     {
-        var solutionModel = new PostSolutionModel(model)
+        var solutionModel = new HwProj.Models.SolutionsService.PostSolutionModel
         {
+            GithubUrl = model.GithubUrl,
+            Comment = model.Comment,
             StudentId = UserId
         };
 

HwProj.APIGateway/HwProj.APIGateway.API/Models/Solutions/PostSolutionModel.cs

@@ -0,0 +1,8 @@
+namespace HwProj.APIGateway.API.Models.Solutions;
+
+public class PostSolutionModel
+{
+    public string? GithubUrl { get; set; }
+    public string? Comment { get; set; }
+    public string[]? GroupMateIds { get; set; }
+}

HwProj.Common/HwProj.Models/SolutionsService/PostSolutionModel.cs

@@ -4,20 +4,6 @@ namespace HwProj.Models.SolutionsService
 {
     public class PostSolutionModel
     {
-        public PostSolutionModel(SolutionViewModel model)
-        {
-            GithubUrl = model.GithubUrl;
-            Comment = model.Comment;
-            StudentId = model.StudentId;
-            PublicationDate = model.PublicationDate;
-            LecturerComment = model.LecturerComment;
-            Rating = model.Rating;
-        }
-
-        public PostSolutionModel()
-        {
-        }
-
         public string GithubUrl { get; set; }
 
         public string Comment { get; set; }

hwproj.front/src/api/api.ts

@@ -1576,6 +1576,31 @@ export interface NotificationsSettingDto {
      */
     isEnabled?: boolean;
 }
+/**
+ *
+ * @export
+ * @interface PostSolutionModel
+ */
+export interface PostSolutionModel {
+    /**
+     *
+     * @type {string}
+     * @memberof PostSolutionModel
+     */
+    githubUrl?: string;
+    /**
+     *
+     * @type {string}
+     * @memberof PostSolutionModel
+     */
+    comment?: string;
+    /**
+     *
+     * @type {Array<string>}
+     * @memberof PostSolutionModel
+     */
+    groupMateIds?: Array<string>;
+}
 /**
  *
  * @export
@@ -8054,11 +8079,11 @@ export const SolutionsApiFetchParamCreator = function (configuration?: Configura
         /**
          *
          * @param {number} taskId
-         * @param {SolutionViewModel} [body]
+         * @param {PostSolutionModel} [body]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        solutionsPostSolution(taskId: number, body?: SolutionViewModel, options: any = {}): FetchArgs {
+        solutionsPostSolution(taskId: number, body?: PostSolutionModel, options: any = {}): FetchArgs {
             // verify required parameter 'taskId' is not null or undefined
             if (taskId === null || taskId === undefined) {
                 throw new RequiredError('taskId','Required parameter taskId was null or undefined when calling solutionsPostSolution.');
@@ -8084,7 +8109,7 @@ export const SolutionsApiFetchParamCreator = function (configuration?: Configura
             // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
             localVarUrlObj.search = null;
             localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"SolutionViewModel" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            const needsSerialization = (<any>"PostSolutionModel" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
             localVarRequestOptions.body =  needsSerialization ? JSON.stringify(body || {}) : (body || "");
 
             return {
@@ -8329,11 +8354,11 @@ export const SolutionsApiFp = function(configuration?: Configuration) {
         /**
          *
          * @param {number} taskId
-         * @param {SolutionViewModel} [body]
+         * @param {PostSolutionModel} [body]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        solutionsPostSolution(taskId: number, body?: SolutionViewModel, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<number> {
+        solutionsPostSolution(taskId: number, body?: PostSolutionModel, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<number> {
             const localVarFetchArgs = SolutionsApiFetchParamCreator(configuration).solutionsPostSolution(taskId, body, options);
             return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => {
                 return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
@@ -8470,11 +8495,11 @@ export const SolutionsApiFactory = function (configuration?: Configuration, fetc
         /**
          *
          * @param {number} taskId
-         * @param {SolutionViewModel} [body]
+         * @param {PostSolutionModel} [body]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        solutionsPostSolution(taskId: number, body?: SolutionViewModel, options?: any) {
+        solutionsPostSolution(taskId: number, body?: PostSolutionModel, options?: any) {
             return SolutionsApiFp(configuration).solutionsPostSolution(taskId, body, options)(fetch, basePath);
         },
         /**
@@ -8614,12 +8639,12 @@ export class SolutionsApi extends BaseAPI {
     /**
      *
      * @param {number} taskId
-     * @param {SolutionViewModel} [body]
+     * @param {PostSolutionModel} [body]
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SolutionsApi
      */
-    public solutionsPostSolution(taskId: number, body?: SolutionViewModel, options?: any) {
+    public solutionsPostSolution(taskId: number, body?: PostSolutionModel, options?: any) {
         return SolutionsApiFp(this.configuration).solutionsPostSolution(taskId, body, options)(this.fetch, this.basePath);
     }
 

hwproj.front/src/components/Solutions/AddOrEditSolution.tsx

@@ -1,6 +1,12 @@
 import * as React from 'react';
 import ApiSingleton from "../../api/ApiSingleton";
-import {AccountDataDto, GetSolutionModel, HomeworkTaskViewModel, SolutionState, SolutionViewModel} from "@/api";
+import {
+    AccountDataDto,
+    GetSolutionModel,
+    HomeworkTaskViewModel,
+    PostSolutionModel,
+    SolutionState
+} from "@/api";
 import {FC, useState} from "react";
 import {Alert, Autocomplete, Grid, DialogContent, Dialog, DialogTitle, DialogActions, Button} from "@mui/material";
 import {MarkdownEditor} from "../Common/MarkdownEditor";
@@ -23,7 +29,7 @@ const AddOrEditSolution: FC<IAddSolutionProps> = (props) => {
     const isEdit = lastSolution?.state === SolutionState.NUMBER_0
     const lastGroup = lastSolution?.groupMates?.map(x => x.userId!) || []
 
-    const [solution, setSolution] = useState<SolutionViewModel>({
+    const [solution, setSolution] = useState<PostSolutionModel>({
         githubUrl: lastSolution?.githubUrl || "",
         comment: isEdit ? lastSolution!.comment : "",
         groupMateIds: lastGroup