Feat/ApiControllerTest

hotel-booking-app-tests/HotelBookingAppTests.csproj

@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />

hotel-booking-app/Configs/ServiceCollectionExtensions.cs

@@ -12,6 +12,7 @@
 using Microsoft.OpenApi.Models;
 using Newtonsoft.Json.Serialization;
 using System;
+using System.IO;
 using System.Reflection;
 using System.Text;
 
@@ -106,7 +107,12 @@ public static IServiceCollection AddSwaggerDoc(this IServiceCollection services)
             {
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = "API Endpoints", Version = "v1" });
                 c.EnableAnnotations();
-                c.IncludeXmlComments(string.Format(@"{0}\HotelBookingApp.xml", AppDomain.CurrentDomain.BaseDirectory));
+
+                var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
+                var commentsFileName = Assembly.GetExecutingAssembly().GetName().Name + ".XML";
+                var commentsFile = Path.Combine(baseDirectory, commentsFileName);
+
+                c.IncludeXmlComments(commentsFile);
             });
             return services;
         }

hotel-booking-app/Controllers/ApiController.cs

@@ -11,8 +11,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
@@ -111,32 +109,30 @@ public async Task<IActionResult> Register([FromBody] SignupRequest request)
         }
 
         /// <summary>
-        /// Get a list of hotels, but max. 10 at once.
+        /// Get a list of hotels, but max. 10 at once. Although it is customizeable with QueryParams properties
         /// Current page can be changed with "currentPage" parameter.
         /// Hotels can be filtered with given "city" parameter.
         /// </summary>
         /// <remarks>
         /// Sample request:
         ///
         ///     GET /api/hotels
+        ///     {
+        ///     }
         ///     
         /// </remarks>
-        /// <param name="city"></param>
-        /// <param name="currentPage"></param>
+        /// <param name="queryParams"></param>
         /// <returns>Returns a paginated list of hotels with required page. Max. 10 hotels/page.</returns>
         /// <response code="200">Returns a paginated list of hotels.</response>
         /// <response code="400">Returns a string with error message.</response>
         [ProducesResponseType(typeof(PaginatedList<Hotel>), 200)]
         [ProducesResponseType(typeof(string), 400)]
         [AllowAnonymous]
         [HttpGet("hotels")]
-        public async Task<IActionResult> Hotels(string city, int currentPage = 1)
+        public async Task<IActionResult> Hotels(QueryParams queryParams)
         {
-            var paginatedHotels = await hotelService.FindWithQuery(new QueryParams
-            {
-                CurrentPage = currentPage,
-                Search = city
-            });
+            var paginatedHotels = await hotelService.FindWithQuery(queryParams);
+
             if (paginatedHotels.TotalPages < paginatedHotels.CurrentPage)
             {
                 return BadRequest(string.Format("Error: the current page is greater than the number of pages. Max. page: {0}", paginatedHotels.TotalPages));
@@ -165,7 +161,7 @@ public async Task<IActionResult> FindHotel(int hotelId)
         {
             try
             {
-                var hotel = await hotelService.FindByIdAsync(hotelId, new QueryParams());
+                var hotel = await hotelService.FindByIdAsync(hotelId);
                 return Ok(hotel);
             }
             catch (ItemNotFoundException e)

hotel-booking-app/HotelBookingApp.csproj

@@ -5,6 +5,7 @@
     <UserSecretsId>f7f05164-0f39-4cd5-be22-b007008ea157</UserSecretsId>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

hotel-booking-app/Resources/Views/Settings/Settings.hu.resx

@@ -117,9 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="API endpoints for mobile app development:" xml:space="preserve">
+    <value>API endpoint-ok mobilapplikáció fejlesztéshez:</value>
+  </data>
   <data name="Change password" xml:space="preserve">
     <value>Jelszó módosítás</value>
   </data>
+  <data name="Developer" xml:space="preserve">
+    <value>Fejlesztő</value>
+  </data>
   <data name="Language" xml:space="preserve">
     <value>Nyelv</value>
   </data>

hotel-booking-app/Services/AccountService.cs

@@ -46,8 +46,10 @@ public async Task<List<string>> SignInAsync(LoginRequest request)
         public async Task<LoginResponseDTO> SignInApiAsync(LoginRequest request)
         {
             var errors = await SignInAsync(request);
-            var response = new LoginResponseDTO();
-            response.errors = errors;
+            var response = new LoginResponseDTO
+            {
+                errors = errors
+            };
 
             if (errors.Count == 0)
             {

hotel-booking-app/Views/Settings/Settings.cshtml

@@ -36,5 +36,5 @@
 
 <a class="btn btn-danger" asp-controller="Settings" asp-action="Password" role="button">@Localizer["Change password"]</a>
 <hr />
-<h4>@Localizer["Developer Settings"]</h4>
-API endpoints for mobile app development: <a class="btn btn-primary" href="~/swagger/ui/index.html" role="button">API</a>
+<h4>@Localizer["Developer"]</h4>
+@Localizer["API endpoints for mobile app development:"] <a class="btn btn-primary" href="~/swagger/index.html" role="button">API</a>