Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using Api.Domain.DatabaseService.Models;
using System.Threading.Tasks;

namespace Api.Domain.DatabaseService
{
public interface IDatabaseService
{
string GetFullUrl(long id);
int GetLinksCount();
void WriteLinkInformation(ShortLink link);
Task WriteLinkInformationAsync(ShortLink link);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ createdDate DATETIME

public static string InsertLink =
@"INSERT INTO Links (ID, Url, ShortUrl, CreatedDate)
(@Id, @Url, @ShortUrl, date('now'));";
VALUES (@Id, @Url, @ShortUrl, date('now'));";

public static string RecordsCount = "SELECT COUNT(*) FROM Links;";

public static string GetFullLink =
@"SELECT Url FROM Links WHERE Id = @Id;";
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.IO;
using System.Threading.Tasks;
using Api.Domain.DatabaseService.Models;
using Dapper;
using Microsoft.Data.Sqlite;
Expand All @@ -13,23 +14,23 @@ public class SqLiteService : IDatabaseService
public SqLiteService(IConfiguration configuration)
{
_configuration = configuration;

var connectionString = _configuration.GetConnectionString("DefaultConnection");
_connection = new SqliteConnection(connectionString);

var database = _configuration.GetSection("AppSettings")["DatabaseName"];
if (!File.Exists(database))
{
CreateDatabase();
}
}
public void WriteLinkInformation(ShortLink link)

public async Task WriteLinkInformationAsync(ShortLink link)
{
using (_connection)
{
_connection.ExecuteAsync(Queries.InsertLink, link);
await _connection.ExecuteAsync(Queries.InsertLink, link);

}
}

Expand All @@ -42,6 +43,15 @@ public int GetLinksCount()
}
}

public string GetFullUrl(long id)
{
using (_connection)
{
return _connection.ExecuteScalar<string>(Queries.GetFullLink, new { Id = id });

}
}

private void CreateDatabase()
{
using (_connection)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
namespace Api.Domain.LinkShortener
using System.Threading.Tasks;

namespace Api.Domain.LinkShortener
{
public interface ILinkShortener
{
string ShortenLink(string url);
string GetFullUrl(string shortUrl);
Task<string> ShortenLink(string url);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Api.Domain.DatabaseService.Models;
using Api.Domain.UrlHasher;
using System;
using System.Threading.Tasks;

namespace Api.Domain.LinkShortener
{
Expand All @@ -15,7 +16,7 @@ public LinkShortenerService(IDatabaseService database, IUrlBaseEncoder encoder)
_encoder = encoder;
}

public string ShortenLink(string url)
public async Task<string> ShortenLink(string url)
{
var linksCount = _database.GetLinksCount();
var id = linksCount + 1;
Expand All @@ -28,9 +29,18 @@ public string ShortenLink(string url)
CreatedDate = DateTime.UtcNow
};

_database.WriteLinkInformation(shorUrl);
await _database.WriteLinkInformationAsync(shorUrl);

return encodedCount;
}

public string GetFullUrl(string shortUrl)
{
var decodedId = _encoder.DecodeUrl(shortUrl);

var fullUrl = _database.GetFullUrl(decodedId);

return fullUrl;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,20 @@ public UrlShortenerController(ILinkShortener linkShortener)
}
// POST api/urlShortener
[HttpPost]
public string ShortenUrl([FromBody] UrlData url)
public async Task<string> ShortenUrl([FromBody] UrlData url)
{
var shortUrl = _linkShortener.ShortenLink(url.Url);
var shortUrl = await _linkShortener.ShortenLink(url.Url);
return shortUrl;
}

[HttpGet]
[Route("{shortUrl}")]
public string GetFullUrl(string shortUrl)
{
var fullUrl = _linkShortener.GetFullUrl(shortUrl);
return fullUrl;
}

public class UrlData
{
public string Url { get; set; }
Expand Down
Binary file not shown.