diff --git a/.idea/.idea.Hard_Demo/.idea/.gitignore b/.idea/.idea.Hard_Demo/.idea/.gitignore new file mode 100644 index 0000000..5b4f415 --- /dev/null +++ b/.idea/.idea.Hard_Demo/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/projectSettingsUpdater.xml +/contentModel.xml +/modules.xml +/.idea.Hard_Demo.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.Hard_Demo/.idea/encodings.xml b/.idea/.idea.Hard_Demo/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/.idea/.idea.Hard_Demo/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.Hard_Demo/.idea/indexLayout.xml b/.idea/.idea.Hard_Demo/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/.idea.Hard_Demo/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Hard_Demo/.idea/vcs.xml b/.idea/.idea.Hard_Demo/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/.idea.Hard_Demo/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Hard_Demo/Models/Client.cs b/Hard_Demo/Models/Client.cs new file mode 100644 index 0000000..de62b09 --- /dev/null +++ b/Hard_Demo/Models/Client.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; + +namespace Hard_Demo.Models; + +public partial class Client +{ + public int Id { get; set; } + + public string Fio { get; set; } = null!; + + public int ClientCode { get; set; } + + public string Passport { get; set; } = null!; + + public DateOnly Birthday { get; set; } + + public string Address { get; set; } = null!; + + public string Email { get; set; } = null!; + + public string Password { get; set; } = null!; + + public int RoleId { get; set; } +} diff --git a/Hard_Demo/Models/Employee.cs b/Hard_Demo/Models/Employee.cs new file mode 100644 index 0000000..3906810 --- /dev/null +++ b/Hard_Demo/Models/Employee.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +namespace Hard_Demo.Models; + +public partial class Employee +{ + public int EmployeId { get; set; } + + public int RoleId { get; set; } + + public string Fio { get; set; } = null!; + + public string EmployeLogin { get; set; } = null!; + + public string EmployePassword { get; set; } = null!; + + public string? EmployePhoto { get; set; } +} diff --git a/Hard_Demo/Models/LastEnter.cs b/Hard_Demo/Models/LastEnter.cs new file mode 100644 index 0000000..b600ef9 --- /dev/null +++ b/Hard_Demo/Models/LastEnter.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; + +namespace Hard_Demo.Models; + +public partial class LastEnter +{ + public int EmployeId { get; set; } + + public DateTime EnterDatetime { get; set; } + + public string EnterType { get; set; } = null!; + + public string? Login { get; set; } +} diff --git a/Hard_Demo/Models/Order.cs b/Hard_Demo/Models/Order.cs new file mode 100644 index 0000000..a4e4797 --- /dev/null +++ b/Hard_Demo/Models/Order.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; + +namespace Hard_Demo.Models; + +public partial class Order +{ + public int Id { get; set; } + + public string OrderCode { get; set; } = null!; + + public DateOnly OrderDate { get; set; } + + public TimeOnly OrderTime { get; set; } + + public int ClientCode { get; set; } + + public int ServiceId { get; set; } + + public string Status { get; set; } = null!; + + public DateOnly? DateClose { get; set; } + + public int RentalTime { get; set; } + + public virtual ICollection Idservices { get; set; } = new List(); +} diff --git a/Hard_Demo/Models/Role.cs b/Hard_Demo/Models/Role.cs new file mode 100644 index 0000000..1aaa0a7 --- /dev/null +++ b/Hard_Demo/Models/Role.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; + +namespace Hard_Demo.Models; + +public partial class Role +{ + public int RoleId { get; set; } + + public string RoleName { get; set; } = null!; +} diff --git a/Hard_Demo/Models/Service.cs b/Hard_Demo/Models/Service.cs new file mode 100644 index 0000000..51b33c8 --- /dev/null +++ b/Hard_Demo/Models/Service.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; + +namespace Hard_Demo.Models; + +public partial class Service +{ + public int Id { get; set; } + + public string ServiceName { get; set; } = null!; + + public string ServiceCode { get; set; } = null!; + + public string ServiceCost { get; set; } = null!; + + public virtual ICollection Idorders { get; set; } = new List(); +} diff --git a/Hard_Demo/Models/User2Context.cs b/Hard_Demo/Models/User2Context.cs new file mode 100644 index 0000000..d77fe89 --- /dev/null +++ b/Hard_Demo/Models/User2Context.cs @@ -0,0 +1,185 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; + +namespace Hard_Demo.Models; + +public partial class User2Context : DbContext +{ + public User2Context() + { + } + + public User2Context(DbContextOptions options) + : base(options) + { + } + + public virtual DbSet Clients { get; set; } + + public virtual DbSet Employees { get; set; } + + public virtual DbSet LastEnters { get; set; } + + public virtual DbSet Orders { get; set; } + + public virtual DbSet Roles { get; set; } + + public virtual DbSet Services { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) +#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263. + => optionsBuilder.UseNpgsql("Host=45.67.56.214;Port=5454;USERNAME=user2;DATABASE=user2;Password=hGcLvi0i"); + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("clients_pk"); + + entity.ToTable("clients"); + + entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.Address) + .HasColumnType("character varying") + .HasColumnName("address"); + entity.Property(e => e.Birthday).HasColumnName("birthday"); + entity.Property(e => e.ClientCode).HasColumnName("client_code"); + entity.Property(e => e.Email) + .HasColumnType("character varying") + .HasColumnName("email"); + entity.Property(e => e.Fio) + .HasColumnType("character varying") + .HasColumnName("fio"); + entity.Property(e => e.Passport) + .HasColumnType("character varying") + .HasColumnName("passport"); + entity.Property(e => e.Password) + .HasColumnType("character varying") + .HasColumnName("password"); + entity.Property(e => e.RoleId).HasColumnName("role_id"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.EmployeId).HasName("employees_pk"); + + entity.ToTable("employees"); + + entity.Property(e => e.EmployeId) + .ValueGeneratedNever() + .HasColumnName("employe_id"); + entity.Property(e => e.EmployeLogin) + .HasColumnType("character varying") + .HasColumnName("employe_login"); + entity.Property(e => e.EmployePassword) + .HasColumnType("character varying") + .HasColumnName("employe_password"); + entity.Property(e => e.EmployePhoto) + .HasColumnType("character varying") + .HasColumnName("employe_photo"); + entity.Property(e => e.Fio) + .HasColumnType("character varying") + .HasColumnName("fio"); + entity.Property(e => e.RoleId).HasColumnName("role_id"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.EmployeId).HasName("last_enter_pk"); + + entity.ToTable("last_enter"); + + entity.Property(e => e.EmployeId) + .ValueGeneratedNever() + .HasColumnName("employe_id"); + entity.Property(e => e.EnterDatetime) + .HasColumnType("timestamp without time zone") + .HasColumnName("enter_datetime"); + entity.Property(e => e.EnterType) + .HasColumnType("character varying") + .HasColumnName("enter_type"); + entity.Property(e => e.Login) + .HasColumnType("character varying") + .HasColumnName("login"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("orders_pk"); + + entity.ToTable("orders"); + + entity.Property(e => e.Id).HasColumnName("id"); + entity.Property(e => e.ClientCode).HasColumnName("client_code"); + entity.Property(e => e.DateClose).HasColumnName("date_close"); + entity.Property(e => e.OrderCode) + .HasColumnType("character varying") + .HasColumnName("order_code"); + entity.Property(e => e.OrderDate).HasColumnName("order_date"); + entity.Property(e => e.OrderTime).HasColumnName("order_time"); + entity.Property(e => e.RentalTime).HasColumnName("rental_time"); + entity.Property(e => e.ServiceId).HasColumnName("service_id"); + entity.Property(e => e.Status) + .HasColumnType("character varying") + .HasColumnName("status"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.RoleId).HasName("roles_pk"); + + entity.ToTable("roles"); + + entity.Property(e => e.RoleId).HasColumnName("role_id"); + entity.Property(e => e.RoleName) + .HasColumnType("character varying") + .HasColumnName("role_name"); + }); + + modelBuilder.Entity(entity => + { + entity.HasKey(e => e.Id).HasName("service_pk"); + + entity.ToTable("service"); + + entity.HasIndex(e => e.ServiceCode, "service_unique").IsUnique(); + + entity.Property(e => e.Id) + .ValueGeneratedNever() + .HasColumnName("id"); + entity.Property(e => e.ServiceCode) + .HasColumnType("character varying") + .HasColumnName("service_code"); + entity.Property(e => e.ServiceCost) + .HasColumnType("character varying") + .HasColumnName("service_cost"); + entity.Property(e => e.ServiceName) + .HasColumnType("character varying") + .HasColumnName("service_name"); + + entity.HasMany(d => d.Idorders).WithMany(p => p.Idservices) + .UsingEntity>( + "OrderService", + r => r.HasOne().WithMany() + .HasForeignKey("Idorder") + .OnDelete(DeleteBehavior.ClientSetNull) + .HasConstraintName("order_service_orders_fk"), + l => l.HasOne().WithMany() + .HasForeignKey("Idservice") + .OnDelete(DeleteBehavior.ClientSetNull) + .HasConstraintName("order_service_service_fk"), + j => + { + j.HasKey("Idservice", "Idorder").HasName("order_service_pk"); + j.ToTable("order_service"); + j.IndexerProperty("Idservice").HasColumnName("idservice"); + j.IndexerProperty("Idorder").HasColumnName("idorder"); + }); + }); + + OnModelCreatingPartial(modelBuilder); + } + + partial void OnModelCreatingPartial(ModelBuilder modelBuilder); +} diff --git a/Hard_Demo/Program.cs b/Hard_Demo/Program.cs new file mode 100644 index 0000000..bb0743e --- /dev/null +++ b/Hard_Demo/Program.cs @@ -0,0 +1,22 @@ +using Avalonia; +using System; +using Hard_Demo; + +namespace demo_hard; + +class Program +{ + // Initialization code. Don't use any Avalonia, third-party APIs or any + // SynchronizationContext-reliant code before AppMain is called: things aren't initialized + // yet and stuff might break. + [STAThread] + public static void Main(string[] args) => BuildAvaloniaApp() + .StartWithClassicDesktopLifetime(args); + + // Avalonia configuration, don't remove; also used by visual designer. + public static AppBuilder BuildAvaloniaApp() + => AppBuilder.Configure() + .UsePlatformDetect() + .WithInterFont() + .LogToTrace(); +} \ No newline at end of file diff --git a/Library/Library.cs b/Library/Library.cs new file mode 100644 index 0000000..8b60da8 --- /dev/null +++ b/Library/Library.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; + +namespace Library +{ + public class Calculations + { + public string[] AvailablePeriods(TimeSpan[] startTimes, int[] durations, TimeSpan beginWorkingTime, TimeSpan endWorkingTime, int consultationTime) + { + TimeSpan consultationDuration = TimeSpan.FromMinutes(consultationTime); + List freeSlots = new List(); + TimeSpan current = beginWorkingTime; + + for (int i = 0; i < startTimes.Length; i++) + { + TimeSpan start = startTimes[i]; + TimeSpan end = start.Add(TimeSpan.FromMinutes(durations[i])); + + while (current.Add(consultationDuration) <= start) + { + freeSlots.Add($"{current:hh\\:mm}-{current.Add(consultationDuration):hh\\:mm}"); + current = current.Add(consultationDuration); + } + + if (current < end) + { + current = end; + } + } + + while (current.Add(consultationDuration) <= endWorkingTime) + { + freeSlots.Add($"{current:hh\\:mm}-{current.Add(consultationDuration):hh\\:mm}"); + current = current.Add(consultationDuration); + } + + return freeSlots.ToArray(); + } + } +} \ No newline at end of file diff --git a/Library/Library.csproj b/Library/Library.csproj new file mode 100644 index 0000000..3a63532 --- /dev/null +++ b/Library/Library.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj new file mode 100644 index 0000000..cfb6060 --- /dev/null +++ b/Tests/Tests.csproj @@ -0,0 +1,27 @@ + + + + net8.0 + enable + enable + + false + true + + + + + + + + + + + + + + + + + + diff --git a/Tests/UnitTest1.cs b/Tests/UnitTest1.cs new file mode 100644 index 0000000..b63c38d --- /dev/null +++ b/Tests/UnitTest1.cs @@ -0,0 +1,68 @@ +using System; +using Xunit; +using Library; + +namespace Library.Tests +{ + public class CalculationsTests + { + [Fact] + public void AvailablePeriods_ReturnsFullDaySlots_WhenNoAppointments() + { + // Arrange + var calculations = new Calculations(); + TimeSpan[] startTimes = Array.Empty(); + int[] durations = Array.Empty(); + TimeSpan beginWorkingTime = new TimeSpan(9, 0, 0); + TimeSpan endWorkingTime = new TimeSpan(17, 0, 0); + int consultationTime = 30; + + // Act + var result = calculations.AvailablePeriods(startTimes, durations, beginWorkingTime, endWorkingTime, consultationTime); + + // Assert + Assert.NotEmpty(result); + Assert.Contains("09:00-09:30", result); + Assert.Contains("16:30-17:00", result); + } + + [Fact] + public void AvailablePeriods_ReturnsCorrectSlots_WhenThereAreAppointments() + { + // Arrange + var calculations = new Calculations(); + TimeSpan[] startTimes = { new TimeSpan(10, 0, 0), new TimeSpan(14, 0, 0) }; + int[] durations = { 60, 60 }; + TimeSpan beginWorkingTime = new TimeSpan(9, 0, 0); + TimeSpan endWorkingTime = new TimeSpan(17, 0, 0); + int consultationTime = 30; + + // Act + var result = calculations.AvailablePeriods(startTimes, durations, beginWorkingTime, endWorkingTime, consultationTime); + + // Assert + Assert.DoesNotContain("10:00-10:30", result); + Assert.DoesNotContain("14:00-14:30", result); + Assert.Contains("09:00-09:30", result); + Assert.Contains("15:30-16:00", result); + } + + [Fact] + public void AvailablePeriods_ReturnsEmpty_WhenNoFreeSlots() + { + // Arrange + var calculations = new Calculations(); + TimeSpan[] startTimes = { new TimeSpan(9, 0, 0) }; + int[] durations = { 480 }; // 8 hours (full workday) + TimeSpan beginWorkingTime = new TimeSpan(9, 0, 0); + TimeSpan endWorkingTime = new TimeSpan(17, 0, 0); + int consultationTime = 30; + + // Act + var result = calculations.AvailablePeriods(startTimes, durations, beginWorkingTime, endWorkingTime, consultationTime); + + // Assert + Assert.Empty(result); + } + } +}