diff --git a/barkmanAPI/Migrations/20250122011527_postyFirst.Designer.cs b/barkmanAPI/Migrations/20250122011527_postyFirst.Designer.cs
deleted file mode 100644
index 50a6aa3..0000000
--- a/barkmanAPI/Migrations/20250122011527_postyFirst.Designer.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using barkmanapi;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- [DbContext(typeof(BarkContext))]
- [Migration("20250122011527_postyFirst")]
- partial class postyFirst
- {
- ///
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "9.0.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
- NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
- modelBuilder.Entity("barkmanapi.InventoryItems", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer")
- .HasColumnName("id");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("Brand")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("brand");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.Property("Notes")
- .HasColumnType("text")
- .HasColumnName("notes");
-
- b.Property("RentalPrice")
- .HasColumnType("real")
- .HasColumnName("rental_price");
-
- b.Property("ReplacementCost")
- .HasColumnType("real")
- .HasColumnName("replacement_cost");
-
- b.Property("SerialNumber")
- .HasColumnType("text")
- .HasColumnName("serial_number");
-
- b.Property("Status")
- .HasColumnType("text")
- .HasColumnName("status");
-
- b.HasKey("Id")
- .HasName("pk_inventory");
-
- b.ToTable("inventory", (string)null);
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/barkmanAPI/Migrations/20250122011527_postyFirst.cs b/barkmanAPI/Migrations/20250122011527_postyFirst.cs
deleted file mode 100644
index 599a405..0000000
--- a/barkmanAPI/Migrations/20250122011527_postyFirst.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- ///
- public partial class postyFirst : Migration
- {
- ///
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "inventory",
- columns: table => new
- {
- id = table.Column(type: "integer", nullable: false)
- .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
- name = table.Column(type: "text", nullable: false),
- brand = table.Column(type: "text", nullable: false),
- serial_number = table.Column(type: "text", nullable: true),
- status = table.Column(type: "text", nullable: true),
- rental_price = table.Column(type: "real", nullable: true),
- replacement_cost = table.Column(type: "real", nullable: true),
- notes = table.Column(type: "text", nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("pk_inventory", x => x.id);
- });
- }
-
- ///
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "inventory");
- }
- }
-}
diff --git a/barkmanAPI/Migrations/20250123185805_status.Designer.cs b/barkmanAPI/Migrations/20250123185805_status.Designer.cs
deleted file mode 100644
index 995dce6..0000000
--- a/barkmanAPI/Migrations/20250123185805_status.Designer.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using barkmanapi;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- [DbContext(typeof(BarkContext))]
- [Migration("20250123185805_status")]
- partial class status
- {
- ///
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "9.0.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
- NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
- modelBuilder.Entity("barkmanapi.InventoryItems", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer")
- .HasColumnName("id");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("Brand")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("brand");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.Property("Notes")
- .HasColumnType("text")
- .HasColumnName("notes");
-
- b.Property("RentalPrice")
- .HasColumnType("real")
- .HasColumnName("rental_price");
-
- b.Property("ReplacementCost")
- .HasColumnType("real")
- .HasColumnName("replacement_cost");
-
- b.Property("SerialNumber")
- .HasColumnType("text")
- .HasColumnName("serial_number");
-
- b.Property("Status")
- .HasColumnType("text")
- .HasColumnName("status");
-
- b.HasKey("Id")
- .HasName("pk_inventory");
-
- b.ToTable("inventory", (string)null);
- });
-
- modelBuilder.Entity("barkmanapi.ItemStatus", b =>
- {
- b.Property("Id")
- .HasColumnType("text")
- .HasColumnName("id");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.HasKey("Id")
- .HasName("pk_item_status");
-
- b.ToTable("item_status", (string)null);
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/barkmanAPI/Migrations/20250123185805_status.cs b/barkmanAPI/Migrations/20250123185805_status.cs
deleted file mode 100644
index 0b2677d..0000000
--- a/barkmanAPI/Migrations/20250123185805_status.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- ///
- public partial class status : Migration
- {
- ///
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "item_status",
- columns: table => new
- {
- id = table.Column(type: "text", nullable: false),
- name = table.Column(type: "text", nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("pk_item_status", x => x.id);
- });
- }
-
- ///
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "item_status");
- }
- }
-}
diff --git a/barkmanAPI/Migrations/20250124005211_statuspt2.Designer.cs b/barkmanAPI/Migrations/20250124005211_statuspt2.Designer.cs
deleted file mode 100644
index 2c8627c..0000000
--- a/barkmanAPI/Migrations/20250124005211_statuspt2.Designer.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using barkmanapi;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- [DbContext(typeof(BarkContext))]
- [Migration("20250124005211_statuspt2")]
- partial class statuspt2
- {
- ///
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "9.0.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
- NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
- modelBuilder.Entity("barkmanapi.InventoryItems", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer")
- .HasColumnName("id");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("Brand")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("brand");
-
- b.Property("ItemStatusId")
- .HasColumnType("text")
- .HasColumnName("item_status_id");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.Property("Notes")
- .HasColumnType("text")
- .HasColumnName("notes");
-
- b.Property("RentalPrice")
- .HasColumnType("real")
- .HasColumnName("rental_price");
-
- b.Property("ReplacementCost")
- .HasColumnType("real")
- .HasColumnName("replacement_cost");
-
- b.Property("SerialNumber")
- .HasColumnType("text")
- .HasColumnName("serial_number");
-
- b.Property("StatusId")
- .HasColumnType("text")
- .HasColumnName("status_id");
-
- b.HasKey("Id")
- .HasName("pk_inventory");
-
- b.HasIndex("ItemStatusId")
- .HasDatabaseName("ix_inventory_item_status_id");
-
- b.ToTable("inventory", (string)null);
- });
-
- modelBuilder.Entity("barkmanapi.ItemStatus", b =>
- {
- b.Property("Id")
- .HasColumnType("text")
- .HasColumnName("id");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.HasKey("Id")
- .HasName("pk_item_status");
-
- b.ToTable("item_status", (string)null);
- });
-
- modelBuilder.Entity("barkmanapi.InventoryItems", b =>
- {
- b.HasOne("barkmanapi.ItemStatus", null)
- .WithMany("Items")
- .HasForeignKey("ItemStatusId")
- .HasConstraintName("fk_inventory_item_status_item_status_id");
- });
-
- modelBuilder.Entity("barkmanapi.ItemStatus", b =>
- {
- b.Navigation("Items");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/barkmanAPI/Migrations/20250124005211_statuspt2.cs b/barkmanAPI/Migrations/20250124005211_statuspt2.cs
deleted file mode 100644
index 2e12c05..0000000
--- a/barkmanAPI/Migrations/20250124005211_statuspt2.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- ///
- public partial class statuspt2 : Migration
- {
- ///
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.RenameColumn(
- name: "status",
- table: "inventory",
- newName: "status_id");
-
- migrationBuilder.AddColumn(
- name: "item_status_id",
- table: "inventory",
- type: "text",
- nullable: true);
-
- migrationBuilder.CreateIndex(
- name: "ix_inventory_item_status_id",
- table: "inventory",
- column: "item_status_id");
-
- migrationBuilder.AddForeignKey(
- name: "fk_inventory_item_status_item_status_id",
- table: "inventory",
- column: "item_status_id",
- principalTable: "item_status",
- principalColumn: "id");
- }
-
- ///
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropForeignKey(
- name: "fk_inventory_item_status_item_status_id",
- table: "inventory");
-
- migrationBuilder.DropIndex(
- name: "ix_inventory_item_status_id",
- table: "inventory");
-
- migrationBuilder.DropColumn(
- name: "item_status_id",
- table: "inventory");
-
- migrationBuilder.RenameColumn(
- name: "status_id",
- table: "inventory",
- newName: "status");
- }
- }
-}
diff --git a/barkmanAPI/Migrations/BarkContextModelSnapshot.cs b/barkmanAPI/Migrations/BarkContextModelSnapshot.cs
deleted file mode 100644
index 2e166f4..0000000
--- a/barkmanAPI/Migrations/BarkContextModelSnapshot.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using barkmanapi;
-
-#nullable disable
-
-namespace barkmanapi.Migrations
-{
- [DbContext(typeof(BarkContext))]
- partial class BarkContextModelSnapshot : ModelSnapshot
- {
- protected override void BuildModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "9.0.1")
- .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
- NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
- modelBuilder.Entity("barkmanapi.InventoryItems", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("integer")
- .HasColumnName("id");
-
- NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id"));
-
- b.Property("Brand")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("brand");
-
- b.Property("ItemStatusId")
- .HasColumnType("text")
- .HasColumnName("item_status_id");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.Property("Notes")
- .HasColumnType("text")
- .HasColumnName("notes");
-
- b.Property("RentalPrice")
- .HasColumnType("real")
- .HasColumnName("rental_price");
-
- b.Property("ReplacementCost")
- .HasColumnType("real")
- .HasColumnName("replacement_cost");
-
- b.Property("SerialNumber")
- .HasColumnType("text")
- .HasColumnName("serial_number");
-
- b.Property("StatusId")
- .HasColumnType("text")
- .HasColumnName("status_id");
-
- b.HasKey("Id")
- .HasName("pk_inventory");
-
- b.HasIndex("ItemStatusId")
- .HasDatabaseName("ix_inventory_item_status_id");
-
- b.ToTable("inventory", (string)null);
- });
-
- modelBuilder.Entity("barkmanapi.ItemStatus", b =>
- {
- b.Property("Id")
- .HasColumnType("text")
- .HasColumnName("id");
-
- b.Property("Name")
- .IsRequired()
- .HasColumnType("text")
- .HasColumnName("name");
-
- b.HasKey("Id")
- .HasName("pk_item_status");
-
- b.ToTable("item_status", (string)null);
- });
-
- modelBuilder.Entity("barkmanapi.InventoryItems", b =>
- {
- b.HasOne("barkmanapi.ItemStatus", null)
- .WithMany("Items")
- .HasForeignKey("ItemStatusId")
- .HasConstraintName("fk_inventory_item_status_item_status_id");
- });
-
- modelBuilder.Entity("barkmanapi.ItemStatus", b =>
- {
- b.Navigation("Items");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/barkmanAPI/Program.cs b/barkmanAPI/Program.cs
index 2d241e9..a98a7fd 100644
--- a/barkmanAPI/Program.cs
+++ b/barkmanAPI/Program.cs
@@ -53,7 +53,7 @@ inventoryGroup.MapGet("", async (BarkContext db) =>
inventoryGroup.MapGet("/{id}", async (int id, BarkContext db) =>
{
var item = await db.Inventory
- .Include(item => item.StatusId)
+ .Include(item => item.Status)
.FirstOrDefaultAsync(i => i.Id == id);
if (item == null)
@@ -75,7 +75,7 @@ inventoryGroup.MapPut("/{id}", async (int id, InventoryItems updatedItem, BarkCo
existingItem.Name = updatedItem.Name;
existingItem.Brand = updatedItem.Brand;
existingItem.SerialNumber = updatedItem.SerialNumber;
- existingItem.StatusId = updatedItem.StatusId;
+ existingItem.Status = updatedItem.Status;
existingItem.RentalPrice = updatedItem.RentalPrice;
existingItem.ReplacementCost = updatedItem.ReplacementCost;
existingItem.Notes = updatedItem.Notes;
diff --git a/barkmanAPI/barkDbModel.cs b/barkmanAPI/barkDbModel.cs
index 79ca512..91b0b40 100644
--- a/barkmanAPI/barkDbModel.cs
+++ b/barkmanAPI/barkDbModel.cs
@@ -14,7 +14,7 @@ public class InventoryItems
public string Name { get; set; }
public string Brand { get; set; }
public string? SerialNumber { get; set; }
- public ItemStatus StatusId { get; set; }
+ public ItemStatus Status { get; set; }
public float? RentalPrice { get; set; }
public float? ReplacementCost { get; set; }
public string? Notes { get; set; }
diff --git a/barkmanAPI/barkmanapi.csproj b/barkmanAPI/barkmanapi.csproj
index fa775f1..0cb694f 100644
--- a/barkmanAPI/barkmanapi.csproj
+++ b/barkmanAPI/barkmanapi.csproj
@@ -19,4 +19,8 @@
+
+
+
+