Selaa lähdekoodia

commented Company : temp

zinab_elgendy 1 vuosi sitten
vanhempi
commit
9706ba2627

+ 2 - 1
MTWorkHR.Core/Entities/Auth/Company.cs

@@ -13,8 +13,9 @@ namespace MTWorkHR.Core.Entities
         public long UserId { get; set; }
 
         public string CompanyName { get; set; }
+
         public string CRNumber { get; set; }
-        public decimal TaxNumber { get; set; }
+        public int TaxNumber { get; set; }
         public bool IsDeleted { get; set; }
     }
 }

+ 1 - 1
MTWorkHR.Core/IUnitOfWork/IUnitOfWork.cs

@@ -9,7 +9,7 @@ namespace MTWorkHR.Core.UnitOfWork
     public interface IUnitOfWork
     {
         IPermissionRepository Permission { get; }
-        ICompanyRepository Company { get; }
+        //ICompanyRepository Company { get; }
         Task<int> CompleteAsync();
 
         void BeginTran();

+ 2 - 2
MTWorkHR.Identity/Migrations/20240212110250_updateUserConfig.Designer.cs

@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace MTWorkHR.Identity.Migrations
 {
     [DbContext(typeof(HRIdentityDBContext))]
-    [Migration("20240212110250_updateUserConfig")]
-    partial class updateUserConfig
+    [Migration("20240212140551_updateCompanyConfig")]
+    partial class updateCompanyConfig
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

+ 1 - 1
MTWorkHR.Identity/Migrations/20240212110250_updateUserConfig.cs

@@ -5,7 +5,7 @@
 namespace MTWorkHR.Identity.Migrations
 {
     /// <inheritdoc />
-    public partial class updateUserConfig : Migration
+    public partial class updateCompanyConfig : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

+ 1 - 1
MTWorkHR.Infrastructure/Data/HRDataContext.cs

@@ -14,7 +14,7 @@ namespace MTWorkHR.Infrastructure.Data
     {
         public HRDataContext(DbContextOptions<HRDataContext> options) : base(options) { }
 
-        public DbSet<Company> Companies { get; set; }
+       // public DbSet<Company> Companies { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

+ 0 - 79
MTWorkHR.Infrastructure/Migrations/20240131192339_addCompany.Designer.cs

@@ -1,79 +0,0 @@
-// <auto-generated />
-using System;
-using MTWorkHR.Infrastructure.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace MTWorkHR.Infrastructure.Migrations
-{
-    [DbContext(typeof(HRDataContext))]
-    [Migration("20240131192339_addCompany")]
-    partial class addCompany
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.1")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("MTWorkHR.Core.Entities.Company", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasColumnOrder(0);
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
-
-                    b.Property<string>("CRNumber")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("CompanyName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("CreateDate")
-                        .HasColumnType("datetime2")
-                        .HasColumnOrder(3);
-
-                    b.Property<string>("CreateUser")
-                        .HasMaxLength(450)
-                        .HasColumnType("nvarchar(450)")
-                        .HasColumnOrder(1);
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("bit");
-
-                    b.Property<decimal>("TaxNumber")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime?>("UpdateDate")
-                        .HasColumnType("datetime2")
-                        .HasColumnOrder(4);
-
-                    b.Property<string>("UpdateUser")
-                        .HasMaxLength(450)
-                        .HasColumnType("nvarchar(450)")
-                        .HasColumnOrder(2);
-
-                    b.Property<long>("UserId")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Companies");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

+ 0 - 43
MTWorkHR.Infrastructure/Migrations/20240131192339_addCompany.cs

@@ -1,43 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace MTWorkHR.Infrastructure.Migrations
-{
-    /// <inheritdoc />
-    public partial class addCompany : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Companies",
-                columns: table => new
-                {
-                    Id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    CreateUser = table.Column<string>(type: "nvarchar(450)", maxLength: 450, nullable: true),
-                    UpdateUser = table.Column<string>(type: "nvarchar(450)", maxLength: 450, nullable: true),
-                    CreateDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    UpdateDate = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    UserId = table.Column<long>(type: "bigint", nullable: false),
-                    CompanyName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    CRNumber = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    TaxNumber = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Companies", x => x.Id);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Companies");
-        }
-    }
-}

+ 0 - 76
MTWorkHR.Infrastructure/Migrations/HRDataContextModelSnapshot.cs

@@ -1,76 +0,0 @@
-// <auto-generated />
-using System;
-using MTWorkHR.Infrastructure.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace MTWorkHR.Infrastructure.Migrations
-{
-    [DbContext(typeof(HRDataContext))]
-    partial class HRDataContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.1")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("MTWorkHR.Core.Entities.Company", b =>
-                {
-                    b.Property<long>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint")
-                        .HasColumnOrder(0);
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
-
-                    b.Property<string>("CRNumber")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("CompanyName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("CreateDate")
-                        .HasColumnType("datetime2")
-                        .HasColumnOrder(3);
-
-                    b.Property<string>("CreateUser")
-                        .HasMaxLength(450)
-                        .HasColumnType("nvarchar(450)")
-                        .HasColumnOrder(1);
-
-                    b.Property<bool>("IsDeleted")
-                        .HasColumnType("bit");
-
-                    b.Property<decimal>("TaxNumber")
-                        .HasColumnType("decimal(18,2)");
-
-                    b.Property<DateTime?>("UpdateDate")
-                        .HasColumnType("datetime2")
-                        .HasColumnOrder(4);
-
-                    b.Property<string>("UpdateUser")
-                        .HasMaxLength(450)
-                        .HasColumnType("nvarchar(450)")
-                        .HasColumnOrder(2);
-
-                    b.Property<long>("UserId")
-                        .HasColumnType("bigint");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Companies");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

+ 3 - 3
MTWorkHR.Infrastructure/UnitOfWork/UnitOfWork.cs

@@ -14,18 +14,18 @@ namespace MTWorkHR.Infrastructure.UnitOfWorks
         private readonly HRDataContext context;
 
         public IPermissionRepository Permission { get; }
-        public ICompanyRepository Company { get; }
+        //public ICompanyRepository Company { get; }
 
 
         public UnitOfWork(HRDataContext _context
             , IPermissionRepository Permission
-            , ICompanyRepository Company
+            //, ICompanyRepository Company
             )
         {
             context = _context;
 
             this.Permission = Permission;
-            this.Company = Company;
+            //this.Company = Company;
 		}
 
         public async Task<int> CompleteAsync()