From 3742927fc874af905f3a1afa8b542ceb9a473c6c Mon Sep 17 00:00:00 2001 From: Mouaz Abdelsamad <ma03081@surrey.ac.uk> Date: Tue, 5 Mar 2024 19:45:36 +0000 Subject: [PATCH] folder restructure --- .gitignore | 8 +-- .../ApplicationDbContextModelSnapshot.cs | 71 ------------------- .../Controllers}/UserController.cs | 0 .../Models}/ApplicationDbContext .cs | 0 .../Models}/AuthTokenPair.cs | 0 .../Models}/LoginModel.cs | 0 .../Models}/RefreshToken.cs | 0 .../Models}/RegisterModel.cs | 0 {Models => UserMicroservice/Models}/User.cs | 0 Program.cs => UserMicroservice/Program.cs | 0 .../Properties}/launchSettings.json | 0 .../Services}/AuthService.cs | 0 .../Services}/IAuthService.cs | 0 .../Services}/IUserService.cs | 0 .../Services}/UserService.cs | 0 .../UserMicroservice.csproj | 0 .../UserMicroservice.csproj.user | 0 .../UserMicroservice.http | 0 .../UserMicroservice.sln | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 21 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 Migrations/ApplicationDbContextModelSnapshot.cs rename {Controllers => UserMicroservice/Controllers}/UserController.cs (100%) rename {Models => UserMicroservice/Models}/ApplicationDbContext .cs (100%) rename {Models => UserMicroservice/Models}/AuthTokenPair.cs (100%) rename {Models => UserMicroservice/Models}/LoginModel.cs (100%) rename {Models => UserMicroservice/Models}/RefreshToken.cs (100%) rename {Models => UserMicroservice/Models}/RegisterModel.cs (100%) rename {Models => UserMicroservice/Models}/User.cs (100%) rename Program.cs => UserMicroservice/Program.cs (100%) rename {Properties => UserMicroservice/Properties}/launchSettings.json (100%) rename {Services => UserMicroservice/Services}/AuthService.cs (100%) rename {Services => UserMicroservice/Services}/IAuthService.cs (100%) rename {Services => UserMicroservice/Services}/IUserService.cs (100%) rename {Services => UserMicroservice/Services}/UserService.cs (100%) rename UserMicroservice.csproj => UserMicroservice/UserMicroservice.csproj (100%) rename UserMicroservice.csproj.user => UserMicroservice/UserMicroservice.csproj.user (100%) rename UserMicroservice.http => UserMicroservice/UserMicroservice.http (100%) rename UserMicroservice.sln => UserMicroservice/UserMicroservice.sln (100%) rename appsettings.Development.json => UserMicroservice/appsettings.Development.json (100%) rename appsettings.json => UserMicroservice/appsettings.json (100%) diff --git a/.gitignore b/.gitignore index 36bc62a..1bfe8c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -bin/ -.vs/ -obj/ -Migrations/ +**/bin/ +**/.vs/ +**/obj/ +**/Migrations/ diff --git a/Migrations/ApplicationDbContextModelSnapshot.cs b/Migrations/ApplicationDbContextModelSnapshot.cs deleted file mode 100644 index 833f523..0000000 --- a/Migrations/ApplicationDbContextModelSnapshot.cs +++ /dev/null @@ -1,71 +0,0 @@ -// <auto-generated /> -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using UserMicroservice.Models; - -#nullable disable - -namespace UserMicroservice.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - partial class ApplicationDbContextModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "8.0.2") - .HasAnnotation("Relational:MaxIdentifierLength", 64); - - modelBuilder.Entity("UserMicroservice.Models.RefreshToken", b => - { - b.Property<int>("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property<DateTime>("ExpirationDate") - .HasColumnType("datetime(6)"); - - b.Property<string>("Token") - .IsRequired() - .HasColumnType("longtext"); - - b.Property<int>("UserId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.ToTable("RefreshTokens"); - }); - - modelBuilder.Entity("UserMicroservice.Models.User", b => - { - b.Property<int>("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - b.Property<string>("Email") - .IsRequired() - .HasColumnType("longtext"); - - b.Property<string>("PasswordHash") - .IsRequired() - .HasColumnType("longtext"); - - b.Property<int>("Type") - .HasColumnType("int"); - - b.Property<string>("Username") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("Users"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Controllers/UserController.cs b/UserMicroservice/Controllers/UserController.cs similarity index 100% rename from Controllers/UserController.cs rename to UserMicroservice/Controllers/UserController.cs diff --git a/Models/ApplicationDbContext .cs b/UserMicroservice/Models/ApplicationDbContext .cs similarity index 100% rename from Models/ApplicationDbContext .cs rename to UserMicroservice/Models/ApplicationDbContext .cs diff --git a/Models/AuthTokenPair.cs b/UserMicroservice/Models/AuthTokenPair.cs similarity index 100% rename from Models/AuthTokenPair.cs rename to UserMicroservice/Models/AuthTokenPair.cs diff --git a/Models/LoginModel.cs b/UserMicroservice/Models/LoginModel.cs similarity index 100% rename from Models/LoginModel.cs rename to UserMicroservice/Models/LoginModel.cs diff --git a/Models/RefreshToken.cs b/UserMicroservice/Models/RefreshToken.cs similarity index 100% rename from Models/RefreshToken.cs rename to UserMicroservice/Models/RefreshToken.cs diff --git a/Models/RegisterModel.cs b/UserMicroservice/Models/RegisterModel.cs similarity index 100% rename from Models/RegisterModel.cs rename to UserMicroservice/Models/RegisterModel.cs diff --git a/Models/User.cs b/UserMicroservice/Models/User.cs similarity index 100% rename from Models/User.cs rename to UserMicroservice/Models/User.cs diff --git a/Program.cs b/UserMicroservice/Program.cs similarity index 100% rename from Program.cs rename to UserMicroservice/Program.cs diff --git a/Properties/launchSettings.json b/UserMicroservice/Properties/launchSettings.json similarity index 100% rename from Properties/launchSettings.json rename to UserMicroservice/Properties/launchSettings.json diff --git a/Services/AuthService.cs b/UserMicroservice/Services/AuthService.cs similarity index 100% rename from Services/AuthService.cs rename to UserMicroservice/Services/AuthService.cs diff --git a/Services/IAuthService.cs b/UserMicroservice/Services/IAuthService.cs similarity index 100% rename from Services/IAuthService.cs rename to UserMicroservice/Services/IAuthService.cs diff --git a/Services/IUserService.cs b/UserMicroservice/Services/IUserService.cs similarity index 100% rename from Services/IUserService.cs rename to UserMicroservice/Services/IUserService.cs diff --git a/Services/UserService.cs b/UserMicroservice/Services/UserService.cs similarity index 100% rename from Services/UserService.cs rename to UserMicroservice/Services/UserService.cs diff --git a/UserMicroservice.csproj b/UserMicroservice/UserMicroservice.csproj similarity index 100% rename from UserMicroservice.csproj rename to UserMicroservice/UserMicroservice.csproj diff --git a/UserMicroservice.csproj.user b/UserMicroservice/UserMicroservice.csproj.user similarity index 100% rename from UserMicroservice.csproj.user rename to UserMicroservice/UserMicroservice.csproj.user diff --git a/UserMicroservice.http b/UserMicroservice/UserMicroservice.http similarity index 100% rename from UserMicroservice.http rename to UserMicroservice/UserMicroservice.http diff --git a/UserMicroservice.sln b/UserMicroservice/UserMicroservice.sln similarity index 100% rename from UserMicroservice.sln rename to UserMicroservice/UserMicroservice.sln diff --git a/appsettings.Development.json b/UserMicroservice/appsettings.Development.json similarity index 100% rename from appsettings.Development.json rename to UserMicroservice/appsettings.Development.json diff --git a/appsettings.json b/UserMicroservice/appsettings.json similarity index 100% rename from appsettings.json rename to UserMicroservice/appsettings.json -- GitLab