daily

internal-services.yml

@@ -34,8 +34,6 @@ services:
 
   apigateway:
     image: ${DOCKER_REGISTRY-}apigateway
-    ports:
-      - 8083:80
     build:
       context: .
       dockerfile: src/Gateway/Gateway.WebAPI/Dockerfile
@@ -48,3 +46,15 @@ services:
     networks:
       - backend
       - fronted
+
+  webui:
+    image: ${DOCKER_REGISTRY-}webui
+    ports:
+      - 8080:8080
+    build:
+      context: .
+      dockerfile: src/Fronted/webui/Dockerfile
+    depends_on:
+      - apigateway
+    networks:
+      - fronted

src/Fronted/webui/.env

@@ -1,2 +1,2 @@
 VUE_APP_TITLE=Url Shortener App
-VUE_APP_API_GATEWAY_URL=http://localhost:8083
+VUE_APP_API_GATEWAY_URL=http://localhost:5043

src/Fronted/webui/.env.Production

@@ -0,0 +1,2 @@
+VUE_APP_TITLE=Url Shortener App
+VUE_APP_API_GATEWAY_URL=http://apigateway:80

src/Fronted/webui/Dockerfile

@@ -0,0 +1,12 @@
+FROM node:lts-alpine    
+WORKDIR /app
+# install vite globally
+RUN npm install -g @vue/cli
+# copy all filtes
+COPY . .    
+# install all deps
+RUN yarn install
+
+# vite default port
+EXPOSE 8080    
+CMD ["vue", "serve"]

src/Fronted/webui/package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "@types/axios": "^0.14.0",
     "axios": "^1.5.0",
+    "bootstrap": "^5.3.1",
     "core-js": "^3.8.3",
     "querystring-es3": "^0.2.1",
     "vue": "^3.2.13",

src/Gateway/Gateway.Infrastructure/Extensions/InfrastructureLayerExtensions.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Ocelot.DependencyInjection;
-using Ocelot.Values;
 
 namespace Gateway.Infrastructure.Extensions
 {
@@ -20,7 +19,6 @@ public static IServiceCollection LoadInfrastructreLayer(this IServiceCollection
                 });
             });
 
-
             var tempConfiguration = new ConfigurationBuilder()
                 .AddConfiguration(configuration)
                 .SetBasePath(Directory.GetCurrentDirectory())

src/Gateway/Gateway.WebAPI/ocelot.Development.json

@@ -13,6 +13,19 @@
       "UpstreamHttpMethod": [ "GET" ],
       "Key": "GetUrl"
     },
+    {
+      "DownstreamPathTemplate": "/api/buffer/get_all_urls",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "localhost",
+          "Port": 5137
+        }
+      ],
+      "UpstreamPathTemplate": "/get_all_urls",
+      "UpstreamHttpMethod": [ "GET" ],
+      "Key": "GetAllUrls"
+    },
     {
       "DownstreamPathTemplate": "/api/shortener/publish_url",
       "DownstreamScheme": "http",
@@ -27,17 +40,17 @@
       "Key": "PublishUrl"
     },
     {
-      "DownstreamPathTemplate": "/api/buffer/get_all_urls",
+      "DownstreamPathTemplate": "/api/shortener/redirect/{shortPath}",
       "DownstreamScheme": "http",
       "DownstreamHostAndPorts": [
         {
           "Host": "localhost",
-          "Port": 5137
+          "Port": 5202
         }
       ],
-      "UpstreamPathTemplate": "/get_all_urls",
+      "UpstreamPathTemplate": "/redirect/{shortPath}",
       "UpstreamHttpMethod": [ "GET" ],
-      "Key": "GetAllUrls"
+      "Key": "ReachUrl"
     }
   ]
 }

src/Gateway/Gateway.WebAPI/ocelot.Production.json

@@ -13,7 +13,19 @@
       "UpstreamHttpMethod": [ "GET" ],
       "Key": "GetUrl"
     },
-
+    {
+      "DownstreamPathTemplate": "/api/buffer/get_all_urls",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "buffer_api",
+          "Port": 80
+        }
+      ],
+      "UpstreamPathTemplate": "/get_all_urls",
+      "UpstreamHttpMethod": [ "GET" ],
+      "Key": "GetAllUrls"
+    },
     {
       "DownstreamPathTemplate": "/api/shortener/publish_url",
       "DownstreamScheme": "http",
@@ -27,19 +39,18 @@
       "UpstreamHttpMethod": [ "POST" ],
       "Key": "PublishUrl"
     },
-
     {
-      "DownstreamPathTemplate": "/api/buffer/get_all_urls",
+      "DownstreamPathTemplate": "/api/shortener/redirect/{shortPath}",
       "DownstreamScheme": "http",
       "DownstreamHostAndPorts": [
         {
-          "Host": "buffer_api",
+          "Host": "shortener_api",
           "Port": 80
         }
       ],
-      "UpstreamPathTemplate": "/get_all_urls",
-      "UpstreamHttpMethod": [ "GET" ]
+      "UpstreamPathTemplate": "/redirect/{shortPath}",
+      "UpstreamHttpMethod": [ "GET" ],
+      "Key": "ReachUrl"
     }
-
   ]
 }

src/Shortener/Infrastructure/Commands/ReachUrlCommandHandler.cs

@@ -0,0 +1,41 @@
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Shortener.Infrastructure.Context;
+
+namespace Shortener.Infrastructure.Commands
+{
+    public class ReachUrlDto
+    {
+        public string Message { get; set; } = string.Empty;
+    }
+
+    public class ReachUrlCommand : IRequest<ReachUrlDto>
+    {
+        public string ShortPath { get; set; }
+        public ReachUrlCommand(string shortPath)
+        {
+            ShortPath = shortPath;
+        }
+    }
+
+    public class ReachUrlCommandHandler : IRequestHandler<ReachUrlCommand, ReachUrlDto>
+    {
+        private readonly AppDbContext dbContext;
+        public ReachUrlCommandHandler(AppDbContext _dbContext)
+        {
+            dbContext = _dbContext;
+        }
+        public async Task<ReachUrlDto> Handle(ReachUrlCommand request, CancellationToken cancellationToken)
+        {
+            var url = await dbContext.Urls.FirstOrDefaultAsync(p => p.ShortPath == request.ShortPath);
+            if (url == null)
+            {
+                return new() { Message = "an error occurred" };
+            }
+            url.RequestCounter++;
+            url.LastRequestedDate = DateTime.UtcNow;
+            await dbContext.SaveChangesAsync();
+            return new() { Message = "it is okay" };
+        }
+    }
+}

src/Shortener/WebAPI/Controllers/ShortenerController.cs

@@ -1,11 +1,14 @@
 using MassTransit;
+using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Shared.DTOs;
 using Shared.Extensions;
+using Shortener.Infrastructure.Commands;
 using Shortener.Infrastructure.Context;
 using Shortener.Infrastructure.Models;
 using System.Text.Json;
 
+
 namespace WebAPI.Controllers
 {
     [Route("api/[controller]")]
@@ -14,11 +17,13 @@ public class ShortenerController : ControllerBase
     {
         private readonly ILogger logger;
         private readonly AppDbContext appDbContext;
+        private readonly IMediator mediator;
 
-        public ShortenerController(ILogger<ShortenerController> _logger, AppDbContext _appDbContext)
+        public ShortenerController(ILogger<ShortenerController> _logger, AppDbContext _appDbContext, IMediator _mediator)
         {
             logger = _logger;
             appDbContext = _appDbContext;
+            mediator = _mediator;
         }
 
         [HttpPost]
@@ -48,6 +53,17 @@ public async Task<IActionResult> PublishUrlToCreateShortPath([FromBody] ShortUrl
                 logger.LogWarning(ex.ToJsonString());
                 return BadRequest();
             }
+
         }
+
+
+        [HttpGet]
+        [Route("redirect/{shortPath}")]
+        public async Task<IActionResult> ReachUrl(string shortPath)
+        {
+            logger.LogInformation($"{shortPath} was send to command");
+            return Ok(await mediator.Send(new ReachUrlCommand(shortPath)));
+        }
+
     }
 }

tests/Buffer/UnitTests/GlobalUsings.cs

@@ -1,3 +1,3 @@
-global using Xunit;
 global using Microsoft.Extensions.Logging;
-global using Moq;
+global using Moq;
+global using Xunit;

tests/Shortener/Shortener.UnitTests/CommandTests.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Moq;
-using Shared.ConfigModels;
 using Shortener.Infrastructure.Commands;
 using Shortener.Infrastructure.Context;