From c681906f8608c89ea1c620858eb89ba52e511669 Mon Sep 17 00:00:00 2001 From: MpinaneRabbit Date: Tue, 22 Jan 2019 14:27:48 +0200 Subject: [PATCH 1/3] Database get and post working --- .../Controllers/TimesheetController.cs | 1 + .../20190122084301_InitialCreate.Designer.cs | 57 +++++++++++++++++++ .../20190122084301_InitialCreate.cs | 40 +++++++++++++ .../TimesheetContextModelSnapshot.cs | 55 ++++++++++++++++++ .../MyTimesheet/MyTimesheet.csproj | 4 ++ src/MyTimesheet/MyTimesheet/Startup.cs | 2 +- 6 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs create mode 100644 src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs create mode 100644 src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs diff --git a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs index b2f5a7c..a862e8f 100644 --- a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs +++ b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs @@ -20,6 +20,7 @@ public TimesheetController(TimesheetContext context) // GET api/values [HttpGet] + public async Task>> Get() { return await _db.Entries.ToListAsync(); diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs new file mode 100644 index 0000000..c0a8083 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs @@ -0,0 +1,57 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using MyTimesheet.Models; + +namespace MyTimesheet.Migrations +{ + [DbContext(typeof(TimesheetContext))] + [Migration("20190122084301_InitialCreate")] + partial class InitialCreate + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.1-servicing-10028") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Billable"); + + b.Property("Client"); + + b.Property("Date"); + + b.Property("Description"); + + b.Property("Duration"); + + b.Property("Name"); + + b.Property("Project"); + + b.Property("Surname"); + + b.Property("TimeEnd"); + + b.Property("TimeStart"); + + b.HasKey("Id"); + + b.ToTable("Entries"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs new file mode 100644 index 0000000..f49fcb6 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs @@ -0,0 +1,40 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace MyTimesheet.Migrations +{ + public partial class InitialCreate : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Entries", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + Name = table.Column(nullable: true), + Surname = table.Column(nullable: true), + Client = table.Column(nullable: true), + Project = table.Column(nullable: true), + Date = table.Column(nullable: false), + TimeStart = table.Column(nullable: false), + TimeEnd = table.Column(nullable: false), + Duration = table.Column(nullable: false), + Description = table.Column(nullable: true), + Billable = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Entries", x => x.Id); + }); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Entries"); + } + } +} diff --git a/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs new file mode 100644 index 0000000..6404921 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs @@ -0,0 +1,55 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using MyTimesheet.Models; + +namespace MyTimesheet.Migrations +{ + [DbContext(typeof(TimesheetContext))] + partial class TimesheetContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.1-servicing-10028") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Billable"); + + b.Property("Client"); + + b.Property("Date"); + + b.Property("Description"); + + b.Property("Duration"); + + b.Property("Name"); + + b.Property("Project"); + + b.Property("Surname"); + + b.Property("TimeEnd"); + + b.Property("TimeStart"); + + b.HasKey("Id"); + + b.ToTable("Entries"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj index 54dfccf..9828ed3 100644 --- a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj +++ b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj @@ -9,6 +9,10 @@ + + all + runtime; build; native; contentfiles; analyzers + diff --git a/src/MyTimesheet/MyTimesheet/Startup.cs b/src/MyTimesheet/MyTimesheet/Startup.cs index e81072d..f329549 100644 --- a/src/MyTimesheet/MyTimesheet/Startup.cs +++ b/src/MyTimesheet/MyTimesheet/Startup.cs @@ -35,7 +35,7 @@ public void ConfigureServices(IServiceCollection services) c.SwaggerDoc("v1", new Info { Title = "My Timesheet API", Version = "v1" }); }); - var connection = @"Server=sql101labs1793591179000.westeurope.cloudapp.azure.com;Database=sql101.#NAME.SURNAME;User Id=myUsername;Password=myPassword;"; + var connection = @"Server=sql101labs1793591179000.westeurope.cloudapp.azure.com;Database=sql101.mpinane.mohale;User Id=mpinanemohale;Password=rabbit123!@#"; services.AddDbContext (options => options.UseSqlServer(connection)); } From ce9f0bd1ab4a424ece03b0f636379376741a6453 Mon Sep 17 00:00:00 2001 From: MpinaneRabbit Date: Sat, 26 Jan 2019 20:53:34 +0200 Subject: [PATCH 2/3] Can add and read recently added value to redis cache --- data/createdatabase.sql | 76 +++++------ data/createuser.sql | 12 +- .../MyTimesheet/CacheSecrets.config | 4 + .../Controllers/TimesheetController.cs | 74 ++++++++--- .../20190122084301_InitialCreate.Designer.cs | 57 --------- .../20190122084301_InitialCreate.cs | 40 ------ .../20190126142316_TimeSheet.Designer.cs | 118 +++++++++++++++++ .../Migrations/20190126142316_TimeSheet.cs | 120 ++++++++++++++++++ .../TimesheetContextModelSnapshot.cs | 77 +++++++++-- src/MyTimesheet/MyTimesheet/Models/Client.cs | 15 +++ .../MyTimesheet/Models/Employee.cs | 18 +++ src/MyTimesheet/MyTimesheet/Models/Project.cs | 18 +++ .../MyTimesheet/Models/TimesheetContext.cs | 3 + .../MyTimesheet/Models/TimesheetEntry.cs | 18 +-- .../MyTimesheet/MyTimesheet.csproj | 4 + src/MyTimesheet/MyTimesheet/Startup.cs | 3 + src/MyTimesheet/MyTimesheet/appsettings.json | 13 +- 17 files changed, 484 insertions(+), 186 deletions(-) create mode 100644 src/MyTimesheet/MyTimesheet/CacheSecrets.config delete mode 100644 src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs delete mode 100644 src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs create mode 100644 src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs create mode 100644 src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs create mode 100644 src/MyTimesheet/MyTimesheet/Models/Client.cs create mode 100644 src/MyTimesheet/MyTimesheet/Models/Employee.cs create mode 100644 src/MyTimesheet/MyTimesheet/Models/Project.cs diff --git a/data/createdatabase.sql b/data/createdatabase.sql index 41b5a17..348c774 100644 --- a/data/createdatabase.sql +++ b/data/createdatabase.sql @@ -1,115 +1,115 @@ USE [master] GO -/****** Object: Database [sql101.firstname.lastname] Script Date: 1/21/2019 9:11:50 PM ******/ -CREATE DATABASE [sql101.firstname.lastname] +/****** Object: Database [sql101.mpinane.mohale] Script Date: 1/21/2019 9:11:50 PM ******/ +CREATE DATABASE [sql101.mpinane.mohale] CONTAINMENT = NONE ON PRIMARY -( NAME = N'sql101.firstname.lastname', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.firstname.lastname.mdf' , SIZE = 8192KB , MAXSIZE = UNLIMITED, FILEGROWTH = 65536KB ) +( NAME = N'sql101.mpinane.mohale', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.mpinane.mohale.mdf' , SIZE = 8192KB , MAXSIZE = UNLIMITED, FILEGROWTH = 65536KB ) LOG ON -( NAME = N'sql101.firstname.lastname_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.firstname.lastname_log.ldf' , SIZE = 8192KB , MAXSIZE = 2048GB , FILEGROWTH = 65536KB ) +( NAME = N'sql101.mpinane.mohale_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\sql101.mpinane.mohale_log.ldf' , SIZE = 8192KB , MAXSIZE = 2048GB , FILEGROWTH = 65536KB ) GO -ALTER DATABASE [sql101.firstname.lastname] SET COMPATIBILITY_LEVEL = 130 +ALTER DATABASE [sql101.mpinane.mohale] SET COMPATIBILITY_LEVEL = 130 GO IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled')) begin -EXEC [sql101.firstname.lastname].[dbo].[sp_fulltext_database] @action = 'enable' +EXEC [sql101.mpinane.mohale].[dbo].[sp_fulltext_database] @action = 'enable' end GO -ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULL_DEFAULT OFF +ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_NULL_DEFAULT OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET ANSI_NULLS OFF +ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_NULLS OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET ANSI_PADDING OFF +ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_PADDING OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET ANSI_WARNINGS OFF +ALTER DATABASE [sql101.mpinane.mohale] SET ANSI_WARNINGS OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET ARITHABORT OFF +ALTER DATABASE [sql101.mpinane.mohale] SET ARITHABORT OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET AUTO_CLOSE OFF +ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_CLOSE OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET AUTO_SHRINK OFF +ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_SHRINK OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS ON +ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_UPDATE_STATISTICS ON GO -ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_CLOSE_ON_COMMIT OFF +ALTER DATABASE [sql101.mpinane.mohale] SET CURSOR_CLOSE_ON_COMMIT OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET CURSOR_DEFAULT GLOBAL +ALTER DATABASE [sql101.mpinane.mohale] SET CURSOR_DEFAULT GLOBAL GO -ALTER DATABASE [sql101.firstname.lastname] SET CONCAT_NULL_YIELDS_NULL OFF +ALTER DATABASE [sql101.mpinane.mohale] SET CONCAT_NULL_YIELDS_NULL OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET NUMERIC_ROUNDABORT OFF +ALTER DATABASE [sql101.mpinane.mohale] SET NUMERIC_ROUNDABORT OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET QUOTED_IDENTIFIER OFF +ALTER DATABASE [sql101.mpinane.mohale] SET QUOTED_IDENTIFIER OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET RECURSIVE_TRIGGERS OFF +ALTER DATABASE [sql101.mpinane.mohale] SET RECURSIVE_TRIGGERS OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET DISABLE_BROKER +ALTER DATABASE [sql101.mpinane.mohale] SET DISABLE_BROKER GO -ALTER DATABASE [sql101.firstname.lastname] SET AUTO_UPDATE_STATISTICS_ASYNC OFF +ALTER DATABASE [sql101.mpinane.mohale] SET AUTO_UPDATE_STATISTICS_ASYNC OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET DATE_CORRELATION_OPTIMIZATION OFF +ALTER DATABASE [sql101.mpinane.mohale] SET DATE_CORRELATION_OPTIMIZATION OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET TRUSTWORTHY OFF +ALTER DATABASE [sql101.mpinane.mohale] SET TRUSTWORTHY OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET ALLOW_SNAPSHOT_ISOLATION OFF +ALTER DATABASE [sql101.mpinane.mohale] SET ALLOW_SNAPSHOT_ISOLATION OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET PARAMETERIZATION SIMPLE +ALTER DATABASE [sql101.mpinane.mohale] SET PARAMETERIZATION SIMPLE GO -ALTER DATABASE [sql101.firstname.lastname] SET READ_COMMITTED_SNAPSHOT OFF +ALTER DATABASE [sql101.mpinane.mohale] SET READ_COMMITTED_SNAPSHOT OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET HONOR_BROKER_PRIORITY OFF +ALTER DATABASE [sql101.mpinane.mohale] SET HONOR_BROKER_PRIORITY OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET RECOVERY FULL +ALTER DATABASE [sql101.mpinane.mohale] SET RECOVERY FULL GO -ALTER DATABASE [sql101.firstname.lastname] SET MULTI_USER +ALTER DATABASE [sql101.mpinane.mohale] SET MULTI_USER GO -ALTER DATABASE [sql101.firstname.lastname] SET PAGE_VERIFY CHECKSUM +ALTER DATABASE [sql101.mpinane.mohale] SET PAGE_VERIFY CHECKSUM GO -ALTER DATABASE [sql101.firstname.lastname] SET DB_CHAINING OFF +ALTER DATABASE [sql101.mpinane.mohale] SET DB_CHAINING OFF GO -ALTER DATABASE [sql101.firstname.lastname] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) +ALTER DATABASE [sql101.mpinane.mohale] SET FILESTREAM( NON_TRANSACTED_ACCESS = OFF ) GO -ALTER DATABASE [sql101.firstname.lastname] SET TARGET_RECOVERY_TIME = 60 SECONDS +ALTER DATABASE [sql101.mpinane.mohale] SET TARGET_RECOVERY_TIME = 60 SECONDS GO -ALTER DATABASE [sql101.firstname.lastname] SET DELAYED_DURABILITY = DISABLED +ALTER DATABASE [sql101.mpinane.mohale] SET DELAYED_DURABILITY = DISABLED GO -ALTER DATABASE [sql101.firstname.lastname] SET QUERY_STORE = OFF +ALTER DATABASE [sql101.mpinane.mohale] SET QUERY_STORE = OFF GO -USE [sql101.firstname.lastname] +USE [sql101.mpinane.mohale] GO ALTER DATABASE SCOPED CONFIGURATION SET LEGACY_CARDINALITY_ESTIMATION = OFF; @@ -124,7 +124,7 @@ GO ALTER DATABASE SCOPED CONFIGURATION SET QUERY_OPTIMIZER_HOTFIXES = OFF; GO -ALTER DATABASE [sql101.firstname.lastname] SET READ_WRITE +ALTER DATABASE [sql101.mpinane.mohale] SET READ_WRITE GO diff --git a/data/createuser.sql b/data/createuser.sql index bcf3038..05d5f56 100644 --- a/data/createuser.sql +++ b/data/createuser.sql @@ -1,18 +1,18 @@ USE [master] GO -CREATE LOGIN [firstnamelastname] WITH PASSWORD=N'rabbit123!@#' MUST_CHANGE, DEFAULT_DATABASE=[sql101.firstname.lastname], CHECK_EXPIRATION=ON, CHECK_POLICY=ON +CREATE LOGIN [mpinanemohale] WITH PASSWORD=N'rabbit123!@#' MUST_CHANGE, DEFAULT_DATABASE=[sql101.mpinane.mohale], CHECK_EXPIRATION=ON, CHECK_POLICY=ON GO -use [sql101.firstname.lastname] +use [sql101.mpinane.mohale] GO use [master] GO -USE [sql101.firstname.lastname] +USE [sql101.mpinane.mohale] GO -CREATE USER [firstnamelastname] FOR LOGIN [firstnamelastname] +CREATE USER [mpinanemohale] FOR LOGIN [mpinanemohale] GO -USE [sql101.firstname.lastname] +USE [sql101.mpinane.mohale] GO -ALTER ROLE [db_owner] ADD MEMBER [firstnamelastname] +ALTER ROLE [db_owner] ADD MEMBER [mpinanemohale] GO diff --git a/src/MyTimesheet/MyTimesheet/CacheSecrets.config b/src/MyTimesheet/MyTimesheet/CacheSecrets.config new file mode 100644 index 0000000..fbacd61 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/CacheSecrets.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs index a862e8f..ef4da0e 100644 --- a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs +++ b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs @@ -1,6 +1,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.IdentityModel.Protocols; using MyTimesheet.Models; +using Newtonsoft.Json; +using StackExchange.Redis; using System; using System.Collections.Generic; using System.Linq; @@ -13,9 +17,11 @@ namespace MyTimesheet.Controllers public class TimesheetController : ControllerBase { private readonly TimesheetContext _db; - public TimesheetController(TimesheetContext context) + readonly IConfiguration _config; + public TimesheetController(TimesheetContext context, IConfiguration config) { _db = context; + _config = config; } // GET api/values @@ -35,28 +41,58 @@ public async Task> Get(int id) // POST api/values [HttpPost] - public async Task Post([FromBody] TimesheetEntry value) + public async Task Post([FromBody] TimesheetEntry value) { + await _db.Entries.AddAsync(value); await _db.SaveChangesAsync(); - } - // PUT api/values/5 - [HttpPut("{id}")] - public async Task Put(int id, [FromBody] TimesheetEntry value) - { - var entry = await _db.Entries.FindAsync(id); - entry = value; - await _db.SaveChangesAsync(); - } + var lazyConnection = new Lazy(() => + { + string cacheConnection = _config.GetValue("CacheConnection").ToString(); + return ConnectionMultiplexer.Connect(cacheConnection); + }); + + + IDatabase cache = lazyConnection.Value.GetDatabase() ; + + + + + + TimesheetEntry results = _db.Entries.Include(v => v.Employee).Include(c => c.Project).Include(v => v.Project.Client).FirstOrDefault(x => x.Id == value.Id); + + + await cache.StringSetAsync(results.Id.ToString(), JsonConvert.SerializeObject(results)); + // await cache.StringSetAsync($"{value.Employee.Name}-{value.Employee.Surname}", $"{{value.Employee.Name}-{value.Employee.Surname}"); + + var cacheItem = await cache.StringGetAsync(results.Id.ToString()); + + // var cacheItem = cache.ExecuteAsync("KEYS *").ToString(); + + //var cacheItem = ya; + // lazyConnection.Value.Dispose(); + + return cacheItem.ToString(); - // DELETE api/values/5 - [HttpDelete("{id}")] - public async Task Delete(int id) - { - var entry = await _db.Entries.FindAsync(id); - _db.Entries.Remove(entry); - await _db.SaveChangesAsync(); - } } + + // PUT api/values/5 + [HttpPut("{id}")] + public async Task Put(int id, [FromBody] TimesheetEntry value) + { + var entry = await _db.Entries.FindAsync(id); + entry = value; + await _db.SaveChangesAsync(); + } + + // DELETE api/values/5 + [HttpDelete("{id}")] + public async Task Delete(int id) + { + var entry = await _db.Entries.FindAsync(id); + _db.Entries.Remove(entry); + await _db.SaveChangesAsync(); + } +} } diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs deleted file mode 100644 index c0a8083..0000000 --- a/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.Designer.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using MyTimesheet.Models; - -namespace MyTimesheet.Migrations -{ - [DbContext(typeof(TimesheetContext))] - [Migration("20190122084301_InitialCreate")] - partial class InitialCreate - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.1-servicing-10028") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - b.Property("Billable"); - - b.Property("Client"); - - b.Property("Date"); - - b.Property("Description"); - - b.Property("Duration"); - - b.Property("Name"); - - b.Property("Project"); - - b.Property("Surname"); - - b.Property("TimeEnd"); - - b.Property("TimeStart"); - - b.HasKey("Id"); - - b.ToTable("Entries"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs deleted file mode 100644 index f49fcb6..0000000 --- a/src/MyTimesheet/MyTimesheet/Migrations/20190122084301_InitialCreate.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; - -namespace MyTimesheet.Migrations -{ - public partial class InitialCreate : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Entries", - columns: table => new - { - Id = table.Column(nullable: false) - .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), - Name = table.Column(nullable: true), - Surname = table.Column(nullable: true), - Client = table.Column(nullable: true), - Project = table.Column(nullable: true), - Date = table.Column(nullable: false), - TimeStart = table.Column(nullable: false), - TimeEnd = table.Column(nullable: false), - Duration = table.Column(nullable: false), - Description = table.Column(nullable: true), - Billable = table.Column(nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Entries", x => x.Id); - }); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Entries"); - } - } -} diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs new file mode 100644 index 0000000..0d5a997 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.Designer.cs @@ -0,0 +1,118 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using MyTimesheet.Models; + +namespace MyTimesheet.Migrations +{ + [DbContext(typeof(TimesheetContext))] + [Migration("20190126142316_TimeSheet")] + partial class TimeSheet + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "2.2.1-servicing-10028") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("MyTimesheet.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("MyTimesheet.Models.Employee", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Name"); + + b.Property("Surname"); + + b.HasKey("Id"); + + b.ToTable("Employees"); + }); + + modelBuilder.Entity("MyTimesheet.Models.Project", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClientId"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("Projects"); + }); + + modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Billable"); + + b.Property("Date"); + + b.Property("Description"); + + b.Property("EmployeeId"); + + b.Property("ProjectId"); + + b.Property("TimeEnd"); + + b.Property("TimeStart"); + + b.HasKey("Id"); + + b.HasIndex("EmployeeId"); + + b.HasIndex("ProjectId"); + + b.ToTable("Entries"); + }); + + modelBuilder.Entity("MyTimesheet.Models.Project", b => + { + b.HasOne("MyTimesheet.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + }); + + modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => + { + b.HasOne("MyTimesheet.Models.Employee", "Employee") + .WithMany() + .HasForeignKey("EmployeeId"); + + b.HasOne("MyTimesheet.Models.Project", "Project") + .WithMany() + .HasForeignKey("ProjectId"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs new file mode 100644 index 0000000..cb44280 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Migrations/20190126142316_TimeSheet.cs @@ -0,0 +1,120 @@ +using System; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace MyTimesheet.Migrations +{ + public partial class TimeSheet : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Clients", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + Name = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Clients", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Employees", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + Name = table.Column(nullable: true), + Surname = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Employees", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Projects", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + Name = table.Column(nullable: false), + ClientId = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Projects", x => x.Id); + table.ForeignKey( + name: "FK_Projects_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateTable( + name: "Entries", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn), + EmployeeId = table.Column(nullable: true), + ProjectId = table.Column(nullable: true), + Date = table.Column(nullable: false), + TimeStart = table.Column(nullable: false), + TimeEnd = table.Column(nullable: false), + Description = table.Column(nullable: true), + Billable = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Entries", x => x.Id); + table.ForeignKey( + name: "FK_Entries_Employees_EmployeeId", + column: x => x.EmployeeId, + principalTable: "Employees", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + table.ForeignKey( + name: "FK_Entries_Projects_ProjectId", + column: x => x.ProjectId, + principalTable: "Projects", + principalColumn: "Id", + onDelete: ReferentialAction.Restrict); + }); + + migrationBuilder.CreateIndex( + name: "IX_Entries_EmployeeId", + table: "Entries", + column: "EmployeeId"); + + migrationBuilder.CreateIndex( + name: "IX_Entries_ProjectId", + table: "Entries", + column: "ProjectId"); + + migrationBuilder.CreateIndex( + name: "IX_Projects_ClientId", + table: "Projects", + column: "ClientId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Entries"); + + migrationBuilder.DropTable( + name: "Employees"); + + migrationBuilder.DropTable( + name: "Projects"); + + migrationBuilder.DropTable( + name: "Clients"); + } + } +} diff --git a/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs index 6404921..9a28f89 100644 --- a/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs +++ b/src/MyTimesheet/MyTimesheet/Migrations/TimesheetContextModelSnapshot.cs @@ -19,6 +19,51 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + modelBuilder.Entity("MyTimesheet.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Name"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("MyTimesheet.Models.Employee", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("Name"); + + b.Property("Surname"); + + b.HasKey("Id"); + + b.ToTable("Employees"); + }); + + modelBuilder.Entity("MyTimesheet.Models.Project", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + b.Property("ClientId"); + + b.Property("Name"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("Projects"); + }); + modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => { b.Property("Id") @@ -27,19 +72,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("Billable"); - b.Property("Client"); - b.Property("Date"); b.Property("Description"); - b.Property("Duration"); - - b.Property("Name"); + b.Property("EmployeeId"); - b.Property("Project"); - - b.Property("Surname"); + b.Property("ProjectId"); b.Property("TimeEnd"); @@ -47,8 +86,30 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.HasKey("Id"); + b.HasIndex("EmployeeId"); + + b.HasIndex("ProjectId"); + b.ToTable("Entries"); }); + + modelBuilder.Entity("MyTimesheet.Models.Project", b => + { + b.HasOne("MyTimesheet.Models.Client", "Client") + .WithMany() + .HasForeignKey("ClientId"); + }); + + modelBuilder.Entity("MyTimesheet.Models.TimesheetEntry", b => + { + b.HasOne("MyTimesheet.Models.Employee", "Employee") + .WithMany() + .HasForeignKey("EmployeeId"); + + b.HasOne("MyTimesheet.Models.Project", "Project") + .WithMany() + .HasForeignKey("ProjectId"); + }); #pragma warning restore 612, 618 } } diff --git a/src/MyTimesheet/MyTimesheet/Models/Client.cs b/src/MyTimesheet/MyTimesheet/Models/Client.cs new file mode 100644 index 0000000..a229007 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Models/Client.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MyTimesheet.Models +{ + public class Client + { + public int Id { get; set; } + public string Name { get; set; } + } + + +} diff --git a/src/MyTimesheet/MyTimesheet/Models/Employee.cs b/src/MyTimesheet/MyTimesheet/Models/Employee.cs new file mode 100644 index 0000000..e61e5fe --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Models/Employee.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace MyTimesheet.Models +{ + public class Employee + { + [Key] + public int Id { get; set; } + public string Name { get; set; } + public string Surname { get; set; } + } + + +} diff --git a/src/MyTimesheet/MyTimesheet/Models/Project.cs b/src/MyTimesheet/MyTimesheet/Models/Project.cs new file mode 100644 index 0000000..b1386b4 --- /dev/null +++ b/src/MyTimesheet/MyTimesheet/Models/Project.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace MyTimesheet.Models +{ + public class Project + { + [Key] + public int Id { get; set; } + public int Name { get; set; } + public Client Client { get; set; } + } + + +} diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs index 5bf7e22..37df804 100644 --- a/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs +++ b/src/MyTimesheet/MyTimesheet/Models/TimesheetContext.cs @@ -13,6 +13,9 @@ public TimesheetContext(DbContextOptions options) { } public DbSet Entries { get; set; } + public DbSet Projects { get; set; } + public DbSet Employees { get; set; } + public DbSet Clients { get; set; } } } diff --git a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs index 8c65667..39d8d2f 100644 --- a/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs +++ b/src/MyTimesheet/MyTimesheet/Models/TimesheetEntry.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; @@ -7,23 +8,16 @@ namespace MyTimesheet.Models { public class TimesheetEntry { - /* - Name | Surname | Client | Project | Date | Time Started | Time ended | Duration | Description | Billable - --- | --- | --- | --- | --- | --- | --- | --- | --- | --- - John | Doe | Client X | Website | 2019-01-22 | 09:00 | 11:00 | 120 | I was rocking HTML5 | YES - John | Doe | Client X | API | 2019-01-22 | 13:00 | 17:00 | 240 | Grafting on golang api | YES - */ - + [Key] public int Id { get; set; } - public string Name { get; set; } - public string Surname { get; set; } - public string Client { get; set; } - public string Project { get; set; } + public Employee Employee{ get; set; } + public Project Project { get; set; } public DateTime Date { get; set; } public DateTime TimeStart { get; set; } public DateTime TimeEnd { get; set; } - public int Duration { get; set; } public string Description { get; set; } public bool Billable { get; set; } } + + } diff --git a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj index 9828ed3..4764672 100644 --- a/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj +++ b/src/MyTimesheet/MyTimesheet/MyTimesheet.csproj @@ -17,4 +17,8 @@ + + + + diff --git a/src/MyTimesheet/MyTimesheet/Startup.cs b/src/MyTimesheet/MyTimesheet/Startup.cs index f329549..7f89293 100644 --- a/src/MyTimesheet/MyTimesheet/Startup.cs +++ b/src/MyTimesheet/MyTimesheet/Startup.cs @@ -36,6 +36,9 @@ public void ConfigureServices(IServiceCollection services) }); var connection = @"Server=sql101labs1793591179000.westeurope.cloudapp.azure.com;Database=sql101.mpinane.mohale;User Id=mpinanemohale;Password=rabbit123!@#"; + //Injecting a service + services.AddSingleton(Configuration); + //done services.AddDbContext (options => options.UseSqlServer(connection)); } diff --git a/src/MyTimesheet/MyTimesheet/appsettings.json b/src/MyTimesheet/MyTimesheet/appsettings.json index def9159..c011a48 100644 --- a/src/MyTimesheet/MyTimesheet/appsettings.json +++ b/src/MyTimesheet/MyTimesheet/appsettings.json @@ -1,8 +1,9 @@ { - "Logging": { - "LogLevel": { - "Default": "Warning" - } - }, - "AllowedHosts": "*" + "Logging": { + "LogLevel": { + "Default": "Warning" + } + }, + "AllowedHosts": "*", + "CacheConnection": "101.redis.cache.windows.net,abortConnect=false,ssl=true,password=85BYRVqUHV6aW7Jz8zIIxRnaYMgbBd2kwo4bpDiz4vw=" } From 9cf629c2b70fb1961ca7e6e30bd2cbdec9701851 Mon Sep 17 00:00:00 2001 From: MpinaneRabbit Date: Sat, 26 Jan 2019 23:40:14 +0200 Subject: [PATCH 3/3] Redis for GET,POST,PUT --- .../Controllers/TimesheetController.cs | 72 ++++++++++++++----- 1 file changed, 54 insertions(+), 18 deletions(-) diff --git a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs index ef4da0e..9a1277d 100644 --- a/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs +++ b/src/MyTimesheet/MyTimesheet/Controllers/TimesheetController.cs @@ -27,16 +27,48 @@ public TimesheetController(TimesheetContext context, IConfiguration config) // GET api/values [HttpGet] - public async Task>> Get() + public async Task> Get() { - return await _db.Entries.ToListAsync(); + var lazyConnection = new Lazy(() => + { + string cacheConnection = _config.GetValue("CacheConnection").ToString(); + return ConnectionMultiplexer.Connect(cacheConnection); + }); + + IDatabase cache = lazyConnection.Value.GetDatabase(); + + var cacheItem = cache.Execute("KEYS", "*"); + + if (cacheItem == null) + { + return (await _db.Entries.ToListAsync()).ToString(); + } + + return cacheItem.ToString(); + } // GET api/values/5 [HttpGet("{id}")] - public async Task> Get(int id) + public async Task> Get(int id) { - return await _db.Entries.FindAsync(id); + + var lazyConnection = new Lazy(() => + { + string cacheConnection = _config.GetValue("CacheConnection").ToString(); + return ConnectionMultiplexer.Connect(cacheConnection); + }); + + IDatabase cache = lazyConnection.Value.GetDatabase(); + + var cacheItem = await cache.StringGetAsync(id.ToString()); + + if(cacheItem.IsNull) + { + return JsonConvert.SerializeObject(await _db.Entries.FindAsync(id)).ToString(); + } + + return cacheItem.ToString(); } // POST api/values @@ -56,24 +88,18 @@ public async Task Post([FromBody] TimesheetEntry value) IDatabase cache = lazyConnection.Value.GetDatabase() ; - - - - TimesheetEntry results = _db.Entries.Include(v => v.Employee).Include(c => c.Project).Include(v => v.Project.Client).FirstOrDefault(x => x.Id == value.Id); + await cache.StringSetAsync($"{value.Employee.Name}-{value.Employee.Surname}", JsonConvert.SerializeObject(results)); - await cache.StringSetAsync(results.Id.ToString(), JsonConvert.SerializeObject(results)); - // await cache.StringSetAsync($"{value.Employee.Name}-{value.Employee.Surname}", $"{{value.Employee.Name}-{value.Employee.Surname}"); - - var cacheItem = await cache.StringGetAsync(results.Id.ToString()); + var cacheItem = await cache.StringGetAsync($"{value.Employee.Name}-{value.Employee.Surname}"); - // var cacheItem = cache.ExecuteAsync("KEYS *").ToString(); + + + lazyConnection.Value.Dispose(); + - //var cacheItem = ya; - // lazyConnection.Value.Dispose(); - - return cacheItem.ToString(); + return cacheItem.ToString(); } @@ -82,8 +108,18 @@ public async Task Post([FromBody] TimesheetEntry value) public async Task Put(int id, [FromBody] TimesheetEntry value) { var entry = await _db.Entries.FindAsync(id); - entry = value; + entry = value; await _db.SaveChangesAsync(); + + var lazyConnection = new Lazy(() => + { + string cacheConnection = _config.GetValue("CacheConnection").ToString(); + return ConnectionMultiplexer.Connect(cacheConnection); + }); + + IDatabase cache = lazyConnection.Value.GetDatabase(); + await cache.StringSetAsync($"{value.Employee.Name}-{value.Employee.Surname}", JsonConvert.SerializeObject(entry)); + } // DELETE api/values/5