From faa8f13a421518a9b17086001498b087e9f92062 Mon Sep 17 00:00:00 2001 From: Drew Rautenberg Date: Mon, 3 Feb 2025 10:06:11 -0600 Subject: [PATCH] backed end add --- .../20250203160519_add-barcodes.Designer.cs | 108 ++++++++++++++++++ .../Migrations/20250203160519_add-barcodes.cs | 29 +++++ .../Migrations/BarkContextModelSnapshot.cs | 4 + barkmanAPI/Program.cs | 2 + barkmanAPI/barkDbModel.cs | 3 +- barkmanui/.env | 4 +- 6 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 barkmanAPI/Migrations/20250203160519_add-barcodes.Designer.cs create mode 100644 barkmanAPI/Migrations/20250203160519_add-barcodes.cs diff --git a/barkmanAPI/Migrations/20250203160519_add-barcodes.Designer.cs b/barkmanAPI/Migrations/20250203160519_add-barcodes.Designer.cs new file mode 100644 index 0000000..5611d82 --- /dev/null +++ b/barkmanAPI/Migrations/20250203160519_add-barcodes.Designer.cs @@ -0,0 +1,108 @@ +// +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("20250203160519_add-barcodes")] + partial class addbarcodes + { + /// + 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("Barcode") + .HasColumnType("integer") + .HasColumnName("barcode"); + + 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("StatusId") + .HasColumnType("text") + .HasColumnName("status_id"); + + b.HasKey("Id") + .HasName("pk_inventory"); + + b.HasIndex("StatusId") + .HasDatabaseName("ix_inventory_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", "Status") + .WithMany() + .HasForeignKey("StatusId") + .HasConstraintName("fk_inventory_item_status_status_id"); + + b.Navigation("Status"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/barkmanAPI/Migrations/20250203160519_add-barcodes.cs b/barkmanAPI/Migrations/20250203160519_add-barcodes.cs new file mode 100644 index 0000000..15424dc --- /dev/null +++ b/barkmanAPI/Migrations/20250203160519_add-barcodes.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace barkmanapi.Migrations +{ + /// + public partial class addbarcodes : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "barcode", + table: "inventory", + type: "integer", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "barcode", + table: "inventory"); + } + } +} diff --git a/barkmanAPI/Migrations/BarkContextModelSnapshot.cs b/barkmanAPI/Migrations/BarkContextModelSnapshot.cs index 10252f0..332a8b9 100644 --- a/barkmanAPI/Migrations/BarkContextModelSnapshot.cs +++ b/barkmanAPI/Migrations/BarkContextModelSnapshot.cs @@ -30,6 +30,10 @@ namespace barkmanapi.Migrations NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + b.Property("Barcode") + .HasColumnType("integer") + .HasColumnName("barcode"); + b.Property("Brand") .IsRequired() .HasColumnType("text") diff --git a/barkmanAPI/Program.cs b/barkmanAPI/Program.cs index 5549237..0d3297c 100644 --- a/barkmanAPI/Program.cs +++ b/barkmanAPI/Program.cs @@ -73,6 +73,7 @@ inventoryGroup.MapPut("/{id}", async (int id, InventoryItems updatedItem, BarkCo } existingItem.Name = updatedItem.Name; + existingItem.Barcode = updatedItem.Barcode; existingItem.Brand = updatedItem.Brand; existingItem.SerialNumber = updatedItem.SerialNumber; existingItem.Status = updatedItem.Status; @@ -88,6 +89,7 @@ inventoryGroup.MapPost("", async (InventoryItems newItemInput, BarkContext db) = { var newItem = new InventoryItems(); newItem.Name = newItemInput.Name; + newItem.Barcode = newItemInput.Barcode; newItem.Brand = newItemInput.Brand; newItem.SerialNumber = newItemInput.SerialNumber; newItem.RentalPrice = newItemInput.RentalPrice; diff --git a/barkmanAPI/barkDbModel.cs b/barkmanAPI/barkDbModel.cs index 77cce27..1e283bb 100644 --- a/barkmanAPI/barkDbModel.cs +++ b/barkmanAPI/barkDbModel.cs @@ -10,7 +10,8 @@ public class BarkContext(DbContextOptions options) : DbContext(opti public class InventoryItems { - public int Id {get; set;} + public int Id {get; set;} + public int Barcode {get; set;} public string Name { get; set; } public string Brand { get; set; } public string? SerialNumber { get; set; } diff --git a/barkmanui/.env b/barkmanui/.env index 889752b..1104091 100644 --- a/barkmanui/.env +++ b/barkmanui/.env @@ -1,4 +1,4 @@ #Staging API -#VITE_API_URL=https://barkdev.ts.drewr.io +VITE_API_URL=https://barkdev.ts.drewr.io #Local Dev API -VITE_API_URL=http://localhost:5145 \ No newline at end of file +#VITE_API_URL=http://localhost:5145 \ No newline at end of file