fix: correct export to google frontend bug

YuriUfimtsev · YuriUfimtsev · commit 7dca217ee226 · 2023-08-17T15:14:23.000+05:00
diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/TableGenerators/ExcelGenerator.cs b/HwProj.APIGateway/HwProj.APIGateway.API/TableGenerators/ExcelGenerator.cs
@@ -214,7 +214,7 @@ private static void AddCourseMatesInfo(
                         var cnt = solutions.Count();
                         worksheet.Cells[position.Row, position.Column].Value = min;
                         worksheet.Cells[position.Row, position.Column + 2].Value = cnt;
-                        if (cnt != allSolutions.Count())
+                        if (cnt != allSolutions.Count)
                         {
                             worksheet.Cells[position.Row, position.Column + 2].Style.Fill.PatternType =
                                 ExcelFillStyle.Solid;
diff --git a/HwProj.APIGateway/HwProj.APIGateway.API/appsettings.json b/HwProj.APIGateway/HwProj.APIGateway.API/appsettings.json
diff --git a/hwproj.front/src/api/api.ts b/hwproj.front/src/api/api.ts
@@ -4786,47 +4786,6 @@ export const SolutionsApiFetchParamCreator = function (configuration?: Configura
                 options: localVarRequestOptions,
             };
         },
-        /**
-         *
-         * @param {number} taskId
-         * @param {SolutionViewModel} [model]
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSolutionsRateEmptySolutionByTaskIdPost(taskId: number, model?: SolutionViewModel, 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 apiSolutionsRateEmptySolutionByTaskIdPost.');
-            }
-            const localVarPath = `/api/Solutions/rateEmptySolution/{taskId}`
-                .replace(`{${"taskId"}}`, encodeURIComponent(String(taskId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-            if (configuration && configuration.apiKey) {
-                const localVarApiKeyValue = typeof configuration.apiKey === 'function'
-                    ? configuration.apiKey("Authorization")
-                    : configuration.apiKey;
-                localVarHeaderParameter["Authorization"] = localVarApiKeyValue;
-            }
-
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"SolutionViewModel" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(model || {}) : (model || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          *
          * @param {number} solutionId
@@ -5088,25 +5047,6 @@ export const SolutionsApiFp = function(configuration?: Configuration) {
                 });
             };
         },
-        /**
-         *
-         * @param {number} taskId
-         * @param {SolutionViewModel} [model]
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSolutionsRateEmptySolutionByTaskIdPost(taskId: number, model?: SolutionViewModel, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = SolutionsApiFetchParamCreator(configuration).apiSolutionsRateEmptySolutionByTaskIdPost(taskId, model, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
         /**
          *
          * @param {number} solutionId
@@ -5238,16 +5178,6 @@ export const SolutionsApiFactory = function (configuration?: Configuration, fetc
         apiSolutionsRateEmptySolutionByTaskIdPost(taskId: number, model?: SolutionViewModel, options?: any) {
             return SolutionsApiFp(configuration).apiSolutionsRateEmptySolutionByTaskIdPost(taskId, model, options)(fetch, basePath);
         },
-        /**
-         *
-         * @param {number} taskId
-         * @param {SolutionViewModel} [model]
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSolutionsRateEmptySolutionByTaskIdPost(taskId: number, model?: SolutionViewModel, options?: any) {
-            return SolutionsApiFp(configuration).apiSolutionsRateEmptySolutionByTaskIdPost(taskId, model, options)(fetch, basePath);
-        },
         /**
          *
          * @param {number} solutionId
@@ -5354,18 +5284,6 @@ export class SolutionsApi extends BaseAPI {
         return SolutionsApiFp(this.configuration).apiSolutionsRateEmptySolutionByTaskIdPost(taskId, model, options)(this.fetch, this.basePath);
     }
 
-    /**
-     *
-     * @param {number} taskId
-     * @param {SolutionViewModel} [model]
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SolutionsApi
-     */
-    public apiSolutionsRateEmptySolutionByTaskIdPost(taskId: number, model?: SolutionViewModel, options?: any) {
-        return SolutionsApiFp(this.configuration).apiSolutionsRateEmptySolutionByTaskIdPost(taskId, model, options)(this.fetch, this.basePath);
-    }
-
     /**
      *
      * @param {number} solutionId
@@ -5460,13 +5378,12 @@ export const StatisticsApiFetchParamCreator = function (configuration?: Configur
         /**
          *
          * @param {number} [courseId]
-         * @param {string} [userId]
          * @param {string} [sheetUrl]
          * @param {string} [sheetName]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiStatisticsExportToSheetGet(courseId?: number, userId?: string, sheetUrl?: string, sheetName?: string, options: any = {}): FetchArgs {
+        apiStatisticsExportToSheetGet(courseId?: number, sheetUrl?: string, sheetName?: string, options: any = {}): FetchArgs {
             const localVarPath = `/api/Statistics/exportToSheet`;
             const localVarUrlObj = url.parse(localVarPath, true);
             const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
@@ -5485,10 +5402,6 @@ export const StatisticsApiFetchParamCreator = function (configuration?: Configur
                 localVarQueryParameter['courseId'] = courseId;
             }
 
-            if (userId !== undefined) {
-                localVarQueryParameter['userId'] = userId;
-            }
-
             if (sheetUrl !== undefined) {
                 localVarQueryParameter['sheetUrl'] = sheetUrl;
             }
@@ -5510,12 +5423,11 @@ export const StatisticsApiFetchParamCreator = function (configuration?: Configur
         /**
          *
          * @param {number} [courseId]
-         * @param {string} [userId]
          * @param {string} [sheetName]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiStatisticsGetFileGet(courseId?: number, userId?: string, sheetName?: string, options: any = {}): FetchArgs {
+        apiStatisticsGetFileGet(courseId?: number, sheetName?: string, options: any = {}): FetchArgs {
             const localVarPath = `/api/Statistics/getFile`;
             const localVarUrlObj = url.parse(localVarPath, true);
             const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
@@ -5534,10 +5446,6 @@ export const StatisticsApiFetchParamCreator = function (configuration?: Configur
                 localVarQueryParameter['courseId'] = courseId;
             }
 
-            if (userId !== undefined) {
-                localVarQueryParameter['userId'] = userId;
-            }
-
             if (sheetName !== undefined) {
                 localVarQueryParameter['sheetName'] = sheetName;
             }
@@ -5652,14 +5560,13 @@ export const StatisticsApiFp = function(configuration?: Configuration) {
         /**
          *
          * @param {number} [courseId]
-         * @param {string} [userId]
          * @param {string} [sheetUrl]
          * @param {string} [sheetName]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiStatisticsExportToSheetGet(courseId?: number, userId?: string, sheetUrl?: string, sheetName?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Result> {
-            const localVarFetchArgs = StatisticsApiFetchParamCreator(configuration).apiStatisticsExportToSheetGet(courseId, userId, sheetUrl, sheetName, options);
+        apiStatisticsExportToSheetGet(courseId?: number, sheetUrl?: string, sheetName?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Result> {
+            const localVarFetchArgs = StatisticsApiFetchParamCreator(configuration).apiStatisticsExportToSheetGet(courseId, sheetUrl, sheetName, options);
             return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
                 return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
                     if (response.status >= 200 && response.status < 300) {
@@ -5673,13 +5580,12 @@ export const StatisticsApiFp = function(configuration?: Configuration) {
         /**
          *
          * @param {number} [courseId]
-         * @param {string} [userId]
          * @param {string} [sheetName]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiStatisticsGetFileGet(courseId?: number, userId?: string, sheetName?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = StatisticsApiFetchParamCreator(configuration).apiStatisticsGetFileGet(courseId, userId, sheetName, options);
+        apiStatisticsGetFileGet(courseId?: number, sheetName?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
+            const localVarFetchArgs = StatisticsApiFetchParamCreator(configuration).apiStatisticsGetFileGet(courseId, sheetName, options);
             return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
                 return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
                     if (response.status >= 200 && response.status < 300) {
@@ -5747,25 +5653,23 @@ export const StatisticsApiFactory = function (configuration?: Configuration, fet
         /**
          *
          * @param {number} [courseId]
-         * @param {string} [userId]
          * @param {string} [sheetUrl]
          * @param {string} [sheetName]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiStatisticsExportToSheetGet(courseId?: number, userId?: string, sheetUrl?: string, sheetName?: string, options?: any) {
-            return StatisticsApiFp(configuration).apiStatisticsExportToSheetGet(courseId, userId, sheetUrl, sheetName, options)(fetch, basePath);
+        apiStatisticsExportToSheetGet(courseId?: number, sheetUrl?: string, sheetName?: string, options?: any) {
+            return StatisticsApiFp(configuration).apiStatisticsExportToSheetGet(courseId, sheetUrl, sheetName, options)(fetch, basePath);
         },
         /**
          *
          * @param {number} [courseId]
-         * @param {string} [userId]
          * @param {string} [sheetName]
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiStatisticsGetFileGet(courseId?: number, userId?: string, sheetName?: string, options?: any) {
-            return StatisticsApiFp(configuration).apiStatisticsGetFileGet(courseId, userId, sheetName, options)(fetch, basePath);
+        apiStatisticsGetFileGet(courseId?: number, sheetName?: string, options?: any) {
+            return StatisticsApiFp(configuration).apiStatisticsGetFileGet(courseId, sheetName, options)(fetch, basePath);
         },
         /**
          *
@@ -5809,28 +5713,26 @@ export class StatisticsApi extends BaseAPI {
     /**
      *
      * @param {number} [courseId]
-     * @param {string} [userId]
      * @param {string} [sheetUrl]
      * @param {string} [sheetName]
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof StatisticsApi
      */
-    public apiStatisticsExportToSheetGet(courseId?: number, userId?: string, sheetUrl?: string, sheetName?: string, options?: any) {
-        return StatisticsApiFp(this.configuration).apiStatisticsExportToSheetGet(courseId, userId, sheetUrl, sheetName, options)(this.fetch, this.basePath);
+    public apiStatisticsExportToSheetGet(courseId?: number, sheetUrl?: string, sheetName?: string, options?: any) {
+        return StatisticsApiFp(this.configuration).apiStatisticsExportToSheetGet(courseId, sheetUrl, sheetName, options)(this.fetch, this.basePath);
     }
 
     /**
      *
      * @param {number} [courseId]
-     * @param {string} [userId]
      * @param {string} [sheetName]
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof StatisticsApi
      */
-    public apiStatisticsGetFileGet(courseId?: number, userId?: string, sheetName?: string, options?: any) {
-        return StatisticsApiFp(this.configuration).apiStatisticsGetFileGet(courseId, userId, sheetName, options)(this.fetch, this.basePath);
+    public apiStatisticsGetFileGet(courseId?: number, sheetName?: string, options?: any) {
+        return StatisticsApiFp(this.configuration).apiStatisticsGetFileGet(courseId, sheetName, options)(this.fetch, this.basePath);
     }
 
     /**
diff --git a/hwproj.front/src/components/Solutions/ExportToGoogle.tsx b/hwproj.front/src/components/Solutions/ExportToGoogle.tsx
@@ -101,7 +101,6 @@ const ExportToGoogle: FC<ExportToGoogleProps> = (props: ExportToGoogleProps) =>
                                 setState((prevState) => ({...prevState, loadingStatus: LoadingStatus.Loading}))
                                 const result = await apiSingleton.statisticsApi.apiStatisticsExportToSheetGet(
                                     props.courseId,
-                                    props.userId,
                                     url,
                                     getGoogleSheetName())
                                 setState((prevState) =>

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private static void AddCourseMatesInfo(`
`214`	`214`	`var cnt = solutions.Count();`
`215`	`215`	`worksheet.Cells[position.Row, position.Column].Value = min;`
`216`	`216`	`worksheet.Cells[position.Row, position.Column + 2].Value = cnt;`
`217`		`- if (cnt != allSolutions.Count())`
	`217`	`+ if (cnt != allSolutions.Count)`
`218`	`218`	`{`
`219`	`219`	`worksheet.Cells[position.Row, position.Column + 2].Style.Fill.PatternType =`
`220`	`220`	`ExcelFillStyle.Solid;`