drew/barkman
1
0
Fork 0
mirror of https://github.com/BarkProductions/barkman.git synced 2026-08-11 11:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate changedOrderToJob migration blocking build

Browse Source 
Two divergent copies of this branch each independently regenerated an
EF migration named changedOrderToJob, and merging both left two files
with the same C# class name (compile error) plus an orphaned
fixedOrderCustomerID migration referencing the already-renamed orders
table. Removed the dead/unapplied migrations, committed the two
migrations already live on the shared dev DB, and added
FixJobsCustomerIdType to bring jobs.customer_id in line with the model
(text -> integer) using an explicit USING cast.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Drew Rautenberg
2026-07-25 15:45:09 -05:00
parent c79bda3960
commit 5517924259
14 changed files with 470 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
barkmanAPI/Migrations/20260723003407_fixedOrderCustomerID.cs
-34
View File
@@ -1,34 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class fixedOrderCustomerID : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<int>(
name: "customer_id",
table: "orders",
type: "integer",
nullable: false,
oldClrType: typeof(string),
oldType: "text");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "customer_id",
table: "orders",
type: "text",
nullable: false,
oldClrType: typeof(int),
oldType: "integer");
}
}
}
barkmanAPI/Migrations/20260723004900_changedOrderToJob.cs
-176
View File
@@ -1,176 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class changedOrderToJob : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "order_items");
migrationBuilder.DropTable(
name: "orders");
migrationBuilder.DropTable(
name: "order_status");
migrationBuilder.CreateTable(
name: "job_status",
columns: table => new
{
id = table.Column<string>(type: "text", nullable: false),
name = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("pk_job_status", x => x.id);
});
migrationBuilder.CreateTable(
name: "jobs",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
customer_id = table.Column<int>(type: "integer", nullable: false),
name = table.Column<string>(type: "text", nullable: false),
status_id = table.Column<string>(type: "text", nullable: true),
start_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
end_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
total_price = table.Column<decimal>(type: "numeric", nullable: false),
venue = table.Column<string>(type: "text", nullable: true),
address = table.Column<string>(type: "text", nullable: true),
notes = table.Column<string>(type: "text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("pk_jobs", x => x.id);
table.ForeignKey(
name: "fk_jobs_job_status_status_id",
column: x => x.status_id,
principalTable: "job_status",
principalColumn: "id");
});
migrationBuilder.CreateTable(
name: "job_items",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
order_id = table.Column<string>(type: "text", nullable: false),
item_id = table.Column<string>(type: "text", nullable: false),
quantity = table.Column<int>(type: "integer", nullable: false),
jobs_id = table.Column<int>(type: "integer", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("pk_job_items", x => x.id);
table.ForeignKey(
name: "fk_job_items_jobs_jobs_id",
column: x => x.jobs_id,
principalTable: "jobs",
principalColumn: "id");
});
migrationBuilder.CreateIndex(
name: "ix_job_items_jobs_id",
table: "job_items",
column: "jobs_id");
migrationBuilder.CreateIndex(
name: "ix_jobs_status_id",
table: "jobs",
column: "status_id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "job_items");
migrationBuilder.DropTable(
name: "jobs");
migrationBuilder.DropTable(
name: "job_status");
migrationBuilder.CreateTable(
name: "order_status",
columns: table => new
{
id = table.Column<string>(type: "text", nullable: false),
name = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("pk_order_status", x => x.id);
});
migrationBuilder.CreateTable(
name: "orders",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
status_id = table.Column<string>(type: "text", nullable: true),
address = table.Column<string>(type: "text", nullable: true),
customer_id = table.Column<int>(type: "integer", nullable: false),
end_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
name = table.Column<string>(type: "text", nullable: false),
notes = table.Column<string>(type: "text", nullable: true),
start_date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
total_price = table.Column<decimal>(type: "numeric", nullable: false),
venue = table.Column<string>(type: "text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("pk_orders", x => x.id);
table.ForeignKey(
name: "fk_orders_order_status_status_id",
column: x => x.status_id,
principalTable: "order_status",
principalColumn: "id");
});
migrationBuilder.CreateTable(
name: "order_items",
columns: table => new
{
id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
item_id = table.Column<string>(type: "text", nullable: false),
order_id = table.Column<string>(type: "text", nullable: false),
orders_id = table.Column<int>(type: "integer", nullable: true),
quantity = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("pk_order_items", x => x.id);
table.ForeignKey(
name: "fk_order_items_orders_orders_id",
column: x => x.orders_id,
principalTable: "orders",
principalColumn: "id");
});
migrationBuilder.CreateIndex(
name: "ix_order_items_orders_id",
table: "order_items",
column: "orders_id");
migrationBuilder.CreateIndex(
name: "ix_orders_status_id",
table: "orders",
column: "status_id");
}
}
}
barkmanAPI/Migrations/20260723004900_changedOrderToJob.Designer.cs → barkmanAPI/Migrations/20260723200239_maybethisworks.Designer.cs
Generated
+2 -2
View File
@@ -12,8 +12,8 @@ using barkmanapi;
namespace barkmanapi.Migrations
{
[DbContext(typeof(BarkContext))]
[Migration("20260723004900_changedOrderToJob")]
partial class changedOrderToJob
[Migration("20260723200239_maybethisworks")]
partial class maybethisworks
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
barkmanAPI/Migrations/20260723200239_maybethisworks.cs
+22
View File
@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class maybethisworks : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
barkmanAPI/Migrations/20260723003407_fixedOrderCustomerID.Designer.cs → barkmanAPI/Migrations/20260723200547_changedordertojobpt2.Designer.cs
Generated
+26 -26
View File
@@ -12,8 +12,8 @@ using barkmanapi;
namespace barkmanapi.Migrations
{
[DbContext(typeof(BarkContext))]
[Migration("20260723003407_fixedOrderCustomerID")]
partial class fixedOrderCustomerID
[Migration("20260723200547_changedordertojobpt2")]
partial class changedordertojobpt2
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -148,7 +148,7 @@ namespace barkmanapi.Migrations
b.ToTable("item_status", (string)null);
});
modelBuilder.Entity("barkmanapi.OrderItems", b =>
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -162,29 +162,29 @@ namespace barkmanapi.Migrations
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("OrderId")
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("order_id");
.HasColumnName("job_id");
b.Property<int?>("OrdersId")
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("orders_id");
.HasColumnName("jobs_id");
b.Property<int>("Quantity")
.HasColumnType("integer")
.HasColumnName("quantity");
b.HasKey("Id")
.HasName("pk_order_items");
.HasName("pk_job_items");
b.HasIndex("OrdersId")
.HasDatabaseName("ix_order_items_orders_id");
b.HasIndex("JobsId")
.HasDatabaseName("ix_job_items_jobs_id");
b.ToTable("order_items", (string)null);
b.ToTable("job_items", (string)null);
});
modelBuilder.Entity("barkmanapi.OrderStatus", b =>
modelBuilder.Entity("barkmanapi.JobStatus", b =>
{
b.Property<string>("Id")
.HasColumnType("text")
@@ -196,12 +196,12 @@ namespace barkmanapi.Migrations
.HasColumnName("name");
b.HasKey("Id")
.HasName("pk_order_status");
.HasName("pk_job_status");
b.ToTable("order_status", (string)null);
b.ToTable("job_status", (string)null);
});
modelBuilder.Entity("barkmanapi.Orders", b =>
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -248,12 +248,12 @@ namespace barkmanapi.Migrations
.HasColumnName("venue");
b.HasKey("Id")
.HasName("pk_orders");
.HasName("pk_jobs");
b.HasIndex("StatusId")
.HasDatabaseName("ix_orders_status_id");
.HasDatabaseName("ix_jobs_status_id");
b.ToTable("orders", (string)null);
b.ToTable("jobs", (string)null);
});
modelBuilder.Entity("barkmanapi.InventoryItems", b =>
@@ -266,25 +266,25 @@ namespace barkmanapi.Migrations
b.Navigation("Status");
});
modelBuilder.Entity("barkmanapi.OrderItems", b =>
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.HasOne("barkmanapi.Orders", null)
b.HasOne("barkmanapi.Jobs", null)
.WithMany("Items")
.HasForeignKey("OrdersId")
.HasConstraintName("fk_order_items_orders_orders_id");
.HasForeignKey("JobsId")
.HasConstraintName("fk_job_items_jobs_jobs_id");
});
modelBuilder.Entity("barkmanapi.Orders", b =>
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.HasOne("barkmanapi.OrderStatus", "Status")
b.HasOne("barkmanapi.JobStatus", "Status")
.WithMany()
.HasForeignKey("StatusId")
.HasConstraintName("fk_orders_order_status_status_id");
.HasConstraintName("fk_jobs_job_status_status_id");
b.Navigation("Status");
});
modelBuilder.Entity("barkmanapi.Orders", b =>
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.Navigation("Items");
});
barkmanAPI/Migrations/20260723200547_changedordertojobpt2.cs
+28
View File
@@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class changedordertojobpt2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "order_id",
table: "job_items",
newName: "job_id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "job_id",
table: "job_items",
newName: "order_id");
}
}
}
barkmanAPI/Migrations/20260725204039_FixJobsCustomerIdType.Designer.cs
Generated
+294
View File
@@ -0,0 +1,294 @@
// <auto-generated />
using System;
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("20260725204039_FixJobsCustomerIdType")]
partial class FixJobsCustomerIdType
{
/// <inheritdoc />
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.Customers", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Address")
.HasColumnType("text")
.HasColumnName("address");
b.Property<string>("BillingTerms")
.HasColumnType("text")
.HasColumnName("billing_terms");
b.Property<string>("Company")
.HasColumnType("text")
.HasColumnName("company");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("text")
.HasColumnName("email");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<string>("PhoneNumber")
.HasColumnType("text")
.HasColumnName("phone_number");
b.HasKey("Id")
.HasName("pk_customers");
b.ToTable("customers", (string)null);
});
modelBuilder.Entity("barkmanapi.InventoryItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Barcode")
.IsRequired()
.HasColumnType("text")
.HasColumnName("barcode");
b.Property<string>("Brand")
.IsRequired()
.HasColumnType("text")
.HasColumnName("brand");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<float?>("RentalPrice")
.HasColumnType("real")
.HasColumnName("rental_price");
b.Property<float?>("ReplacementCost")
.HasColumnType("real")
.HasColumnName("replacement_cost");
b.Property<string>("SerialNumber")
.HasColumnType("text")
.HasColumnName("serial_number");
b.Property<string>("StatusId")
.HasColumnType("text")
.HasColumnName("status_id");
b.Property<float?>("Weight")
.HasColumnType("real")
.HasColumnName("weight");
b.HasKey("Id")
.HasName("pk_inventory");
b.HasIndex("Barcode")
.IsUnique()
.HasDatabaseName("ix_inventory_barcode");
b.HasIndex("StatusId")
.HasDatabaseName("ix_inventory_status_id");
b.ToTable("inventory", (string)null);
});
modelBuilder.Entity("barkmanapi.ItemStatus", b =>
{
b.Property<string>("Id")
.HasColumnType("text")
.HasColumnName("id");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.HasKey("Id")
.HasName("pk_item_status");
b.ToTable("item_status", (string)null);
});
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ItemId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("job_id");
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("jobs_id");
b.Property<int>("Quantity")
.HasColumnType("integer")
.HasColumnName("quantity");
b.HasKey("Id")
.HasName("pk_job_items");
b.HasIndex("JobsId")
.HasDatabaseName("ix_job_items_jobs_id");
b.ToTable("job_items", (string)null);
});
modelBuilder.Entity("barkmanapi.JobStatus", b =>
{
b.Property<string>("Id")
.HasColumnType("text")
.HasColumnName("id");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.HasKey("Id")
.HasName("pk_job_status");
b.ToTable("job_status", (string)null);
});
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Address")
.HasColumnType("text")
.HasColumnName("address");
b.Property<int>("CustomerId")
.HasColumnType("integer")
.HasColumnName("customer_id");
b.Property<DateTimeOffset>("EndDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("end_date");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text")
.HasColumnName("name");
b.Property<string>("Notes")
.HasColumnType("text")
.HasColumnName("notes");
b.Property<DateTimeOffset>("StartDate")
.HasColumnType("timestamp with time zone")
.HasColumnName("start_date");
b.Property<string>("StatusId")
.HasColumnType("text")
.HasColumnName("status_id");
b.Property<decimal>("TotalPrice")
.HasColumnType("numeric")
.HasColumnName("total_price");
b.Property<string>("Venue")
.HasColumnType("text")
.HasColumnName("venue");
b.HasKey("Id")
.HasName("pk_jobs");
b.HasIndex("StatusId")
.HasDatabaseName("ix_jobs_status_id");
b.ToTable("jobs", (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");
});
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.HasOne("barkmanapi.Jobs", null)
.WithMany("Items")
.HasForeignKey("JobsId")
.HasConstraintName("fk_job_items_jobs_jobs_id");
});
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.HasOne("barkmanapi.JobStatus", "Status")
.WithMany()
.HasForeignKey("StatusId")
.HasConstraintName("fk_jobs_job_status_status_id");
b.Navigation("Status");
});
modelBuilder.Entity("barkmanapi.Jobs", b =>
{
b.Navigation("Items");
});
#pragma warning restore 612, 618
}
}
}
barkmanAPI/Migrations/20260725204039_FixJobsCustomerIdType.cs
+24
View File
@@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace barkmanapi.Migrations
{
/// <inheritdoc />
public partial class FixJobsCustomerIdType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.Sql(
"ALTER TABLE jobs ALTER COLUMN customer_id TYPE integer USING customer_id::integer;");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.Sql(
"ALTER TABLE jobs ALTER COLUMN customer_id TYPE text USING customer_id::text;");
}
}
}
barkmanAPI/Migrations/BarkContextModelSnapshot.cs
+5 -5
View File
@@ -159,15 +159,15 @@ namespace barkmanapi.Migrations
.HasColumnType("text")
.HasColumnName("item_id");
b.Property<string>("JobId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("job_id");
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("jobs_id");
b.Property<string>("OrderId")
.IsRequired()
.HasColumnType("text")
.HasColumnName("order_id");
b.Property<int>("Quantity")
.HasColumnType("integer")
.HasColumnName("quantity");
barkmanAPI/Program.cs
+3 -2
View File
@@ -290,6 +290,7 @@ jobGroup.MapPost("", async (Jobs newJobInput, BarkContext db) =>
EndDate = newJobInput.EndDate,
Venue = newJobInput.Venue,
Address = newJobInput.Address,
Notes = newJobInput.Notes,
};
db.Jobs.Add(newJob);
@@ -370,7 +371,7 @@ jobItemGroup.MapPut("/{id}", async (int id, JobItems updatedJobItems, BarkContex
return Results.NotFound(new { Message = "Job Items not found" });
}
existingJobItems.OrderId = updatedJobItems.OrderId;
existingJobItems.JobId = updatedJobItems.JobId;
existingJobItems.ItemId = updatedJobItems.ItemId;
existingJobItems.Quantity = updatedJobItems.Quantity;
@@ -382,7 +383,7 @@ jobItemGroup.MapPost("", async (JobItems newJobItemsInput, BarkContext db) =>
{
var newJobItem = new JobItems()
{
OrderId = newJobItemsInput.OrderId,
JobId = newJobItemsInput.JobId,
ItemId = newJobItemsInput.ItemId,
Quantity = newJobItemsInput.Quantity,
};
barkmanAPI/barkDbModel.cs
+1 -1
View File
@@ -65,7 +65,7 @@ public class Jobs
public class JobItems
{
public int Id { get; set; }
public required string OrderId { get; set; }
public required string JobId { get; set; }
public required string ItemId { get; set; }
public int Quantity { get; set; }
}