fix: implement support of native file upload, change httpRequests types

Author: YuriUfimtsev

HwProj.APIGateway/HwProj.APIGateway.API/Controllers/StatisticsController.cs

@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Google.Apis.Sheets.v4;
-using Google.Apis.Sheets.v4.Data;
 using HwProj.APIGateway.API.ExportServices;
 using HwProj.APIGateway.API.Models;
 using HwProj.APIGateway.API.TableGenerators;
@@ -15,9 +9,6 @@
 using HwProj.Models.Result;
 using HwProj.SolutionsService.Client;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Newtonsoft.Json;
-using OfficeOpenXml;
 
 namespace HwProj.APIGateway.API.Controllers
 {
@@ -83,7 +74,7 @@ var result
         /// <param name="sheetName">Name of the sheet on which the report will be generated.</param>
         /// <returns>File download process.</returns>
         [HttpGet("getFile")]
-        public async Task<IActionResult> GetFile(long courseId, string userId, [FromBody] string sheetName)
+        public async Task<IActionResult> GetFile(long courseId, string userId, string sheetName)
         {
             var course = await _coursesClient.GetCourseById(courseId, userId);
             var statistics = await GetStatistics(courseId);
@@ -94,35 +85,35 @@ public async Task<IActionResult> GetFile(long courseId, string userId, [FromBody
             return new FileContentResult(statisticStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         }
 
-        [HttpPost("getSheetTitles")]
-        public async Task<Result<string[]>> GetSheetTitles([FromBody] GetSheetTitlesModel getSheetTitlesModel)
-        {
-            var sheetUrl = getSheetTitlesModel.SheetUrl;
-            return await _googleService.GetSheetTitles(sheetUrl);
-        }
+        [HttpGet("getSheetTitles")]
+        public async Task<Result<string[]>> GetSheetTitles(string sheetUrl)
+            => await _googleService.GetSheetTitles(sheetUrl);
 
-        private Result<string> ProcessTheLink([FromBody] string sheetUrl)
+        [HttpPost("processLink")]
+        public Result<ExternalService> ProcessLink(string? sheetUrl)
         {
-            if (sheetUrl.Contains("https://docs.google.com")) return GoogleService.ParseLink(sheetUrl);
-            if (sheetUrl.Contains("https://disk.yandex.ru")) return YandexService.ParseLink(sheetUrl);
-            return Result<string>.Failed("Некорректная ссылка");
+            if (sheetUrl == null) return Result<ExternalService>.Failed("Некорректная ссылка");
+            if (GoogleService.ParseLink(sheetUrl).Succeeded) return Result<ExternalService>.Success(ExternalService.Google);
+            if (YandexService.ParseLink(sheetUrl).Succeeded) return Result<ExternalService>.Success(ExternalService.Yandex);
+            return Result<ExternalService>.Failed("Некорректная ссылка");
         }
 
         /// <summary>
         /// Implements sending a report to the Google Sheets.
         /// </summary>
         /// <param name="courseId">The course Id the report is based on.</param>
         /// <param name="userId">Id of the user requesting the report.</param>
-        /// <param name="requestModelParameters">Parameters required to make requests to the Google Sheets.</param>
+        /// <param name="sheetUrl">Sheet Url parameter, required to make requests to the Google Sheets.</param>
+        /// <param name="sheetName">Sheet Name parameter, required to make requests to the Google Sheets.</param>
         /// <returns>Operation status.</returns>
-        [HttpPost("exportToSheet")]
+        [HttpGet("exportToSheet")]
         public async Task<Result> ExportToGoogleSheets(
-            long courseId, string userId, [FromBody] GoogleSheetsRequestModel requestModelParameters)
+            long courseId, string userId, string sheetUrl, string sheetName)
         {
             var course = await _coursesClient.GetCourseById(courseId, userId);
             var statistics = await GetStatistics(courseId);
             if (course == null || statistics == null) return Result.Failed("Ошибка при получении статистики");
-            var result = await _googleService.Export(course, statistics, requestModelParameters);
+            var result = await _googleService.Export(course, statistics, sheetUrl, sheetName);
             return result;
         }
     }

HwProj.APIGateway/HwProj.APIGateway.API/ExportServices/GoogleService.cs

@@ -29,22 +29,23 @@ public GoogleService(SheetsService sheetsService)
         public async Task<Result> Export(
             CourseDTO course,
             IOrderedEnumerable<StatisticsCourseMatesModel> statistics,
-            [FromBody] GoogleSheetsRequestModel requestModelParameters)
+            string sheetUrl,
+            string sheetName)
         {
-            if (requestModelParameters.SheetName == null || requestModelParameters.SheetUrl == null)
+            if (sheetName == string.Empty || sheetUrl == string.Empty)
                 return Result.Failed("Ошибка при получении данных о гугл-документе");
 
-            var gettingSpreadsheetIdResult = ParseLink(requestModelParameters.SheetUrl);
+            var gettingSpreadsheetIdResult = ParseLink(sheetUrl);
             if (!gettingSpreadsheetIdResult.Succeeded) return Result.Failed(gettingSpreadsheetIdResult.Errors);
             var spreadsheetId = gettingSpreadsheetIdResult.Value;
             Result result;
             try
             {
-                var sheetId = await GetSheetId(spreadsheetId, requestModelParameters.SheetName);
+                var sheetId = await GetSheetId(spreadsheetId, sheetName);
                 if (sheetId == null) return Result.Failed("Лист с таким названием не найден");
 
                 var (valueRange, range, updateStyleRequestBody) = Generate(
-                    statistics.ToList(), course, requestModelParameters.SheetName, (int)sheetId);
+                    statistics.ToList(), course, sheetName, (int)sheetId);
 
                 var clearRequest = _sheetsService.Spreadsheets.Values.Clear(new ClearValuesRequest(), spreadsheetId, range);
                 await clearRequest.ExecuteAsync();

HwProj.APIGateway/HwProj.APIGateway.API/Models/ExternalService.cs

@@ -0,0 +1,8 @@
+namespace HwProj.APIGateway.API.Models
+{
+    public enum ExternalService
+    {
+        Google,
+        Yandex
+    }
+}