changed order to job - updated model,

This commit is contained in:
2026-07-22 19:49:24 -05:00
parent c2c48b4cb1
commit ddd90aa5a5
5 changed files with 611 additions and 32 deletions
@@ -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("20260723004900_changedOrderToJob")]
partial class changedOrderToJob
{
/// <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<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");
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
}
}
}
@@ -0,0 +1,176 @@
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");
}
}
}
@@ -145,7 +145,7 @@ namespace barkmanapi.Migrations
b.ToTable("item_status", (string)null); b.ToTable("item_status", (string)null);
}); });
modelBuilder.Entity("barkmanapi.OrderItems", b => modelBuilder.Entity("barkmanapi.JobItems", b =>
{ {
b.Property<int>("Id") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@@ -159,29 +159,29 @@ namespace barkmanapi.Migrations
.HasColumnType("text") .HasColumnType("text")
.HasColumnName("item_id"); .HasColumnName("item_id");
b.Property<int?>("JobsId")
.HasColumnType("integer")
.HasColumnName("jobs_id");
b.Property<string>("OrderId") b.Property<string>("OrderId")
.IsRequired() .IsRequired()
.HasColumnType("text") .HasColumnType("text")
.HasColumnName("order_id"); .HasColumnName("order_id");
b.Property<int?>("OrdersId")
.HasColumnType("integer")
.HasColumnName("orders_id");
b.Property<int>("Quantity") b.Property<int>("Quantity")
.HasColumnType("integer") .HasColumnType("integer")
.HasColumnName("quantity"); .HasColumnName("quantity");
b.HasKey("Id") b.HasKey("Id")
.HasName("pk_order_items"); .HasName("pk_job_items");
b.HasIndex("OrdersId") b.HasIndex("JobsId")
.HasDatabaseName("ix_order_items_orders_id"); .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") b.Property<string>("Id")
.HasColumnType("text") .HasColumnType("text")
@@ -193,12 +193,12 @@ namespace barkmanapi.Migrations
.HasColumnName("name"); .HasColumnName("name");
b.HasKey("Id") 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") b.Property<int>("Id")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@@ -245,12 +245,12 @@ namespace barkmanapi.Migrations
.HasColumnName("venue"); .HasColumnName("venue");
b.HasKey("Id") b.HasKey("Id")
.HasName("pk_orders"); .HasName("pk_jobs");
b.HasIndex("StatusId") 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 => modelBuilder.Entity("barkmanapi.InventoryItems", b =>
@@ -263,25 +263,25 @@ namespace barkmanapi.Migrations
b.Navigation("Status"); 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") .WithMany("Items")
.HasForeignKey("OrdersId") .HasForeignKey("JobsId")
.HasConstraintName("fk_order_items_orders_orders_id"); .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() .WithMany()
.HasForeignKey("StatusId") .HasForeignKey("StatusId")
.HasConstraintName("fk_orders_order_status_status_id"); .HasConstraintName("fk_jobs_job_status_status_id");
b.Navigation("Status"); b.Navigation("Status");
}); });
modelBuilder.Entity("barkmanapi.Orders", b => modelBuilder.Entity("barkmanapi.Jobs", b =>
{ {
b.Navigation("Items"); b.Navigation("Items");
}); });
+8 -8
View File
@@ -7,9 +7,9 @@ public class BarkContext(DbContextOptions<BarkContext> options) : DbContext(opti
public DbSet<InventoryItems> Inventory { get; set; } public DbSet<InventoryItems> Inventory { get; set; }
public DbSet<ItemStatus> ItemStatus { get; set; } public DbSet<ItemStatus> ItemStatus { get; set; }
public DbSet<Customers> Customers { get; set; } public DbSet<Customers> Customers { get; set; }
public DbSet<Orders> Orders { get; set; } public DbSet<Jobs> Jobs { get; set; }
public DbSet<OrderItems> OrderItems { get; set; } public DbSet<JobItems> JobItems { get; set; }
public DbSet<OrderStatus> OrderStatus { get; set; } public DbSet<JobStatus> JobStatus { get; set; }
} }
[Index(nameof(Barcode), IsUnique = true)] [Index(nameof(Barcode), IsUnique = true)]
@@ -46,23 +46,23 @@ public class Customers
public string? Notes { get; set; } public string? Notes { get; set; }
} }
public class Orders public class Jobs
{ {
public int Id { get; set; } public int Id { get; set; }
public required int CustomerId { get; set; } public required int CustomerId { get; set; }
public required string Name { get; set; } public required string Name { get; set; }
public OrderStatus Status { get; set; } public JobStatus Status { get; set; }
public string? StatusId { get; set; } public string? StatusId { get; set; }
public DateTimeOffset StartDate { get; set; } public DateTimeOffset StartDate { get; set; }
public DateTimeOffset EndDate { get; set; } public DateTimeOffset EndDate { get; set; }
public decimal TotalPrice { get; set; } public decimal TotalPrice { get; set; }
public string? Venue { get; set; } public string? Venue { get; set; }
public string? Address { get; set; } public string? Address { get; set; }
public OrderItems[] Items { get; set; } public JobItems[] Items { get; set; }
public string? Notes { get; set; } public string? Notes { get; set; }
} }
public class OrderItems public class JobItems
{ {
public int Id { get; set; } public int Id { get; set; }
public required string OrderId { get; set; } public required string OrderId { get; set; }
@@ -70,7 +70,7 @@ public class OrderItems
public int Quantity { get; set; } public int Quantity { get; set; }
} }
public class OrderStatus public class JobStatus
{ {
public string Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
+109
View File
@@ -0,0 +1,109 @@
import {Button, Group, TextInput, Container, Title, Flex} from '@mantine/core';
import {useForm} from '@mantine/form';
import {useMutation} from "@tanstack/react-query";
import {NewJob} from "./types.ts";
import {useNavigate} from "react-router";
import {IconX, IconCheck} from '@tabler/icons-react';
import {notifications} from '@mantine/notifications';
import useJobList from "./hooks/useJobList.tsx";
function AddJob() {
const navigate = useNavigate();
const customerQuery = useCustomerList();
const newJobForm = useForm<NewJob>({
mode: 'uncontrolled',
initialValues: {
name: "",
company: "",
email: "",
phone: "",
address: "",
},
validate: {},
});
const updateCustomer = useMutation({
mutationFn: async (values: newJob) => {
const result = await fetch(import.meta.env.VITE_API_URL + '/customers', {
method: 'POST',
body: JSON.stringify(values),
headers: {
'Content-Type': 'application/json'
}
});
if (result.ok) {
notifications.show({
icon: <IconCheck size={20}/>,
color: "teal",
title: "All good!",
message: "Customer Created",
position: 'top-center',
});
navigate("/customers");
}
if (!result.ok) {
notifications.show({
icon: <IconX size={20}/>,
color: "red",
title: "Bummer!",
message: "Something went wrong",
position: 'top-center',
});
throw new Error('Failed to create customer');
}
},
})
if (customerQuery.isPending) return 'Loading...'
if (customerQuery.error) return 'An error has occurred: ' + customerQuery.error.message
return (
<>
<form onSubmit={newCustomerForm.onSubmit(async (values) => await
updateCustomer.mutateAsync(values))}>
<Container m="lg">
<Flex mih={50}
gap="md"
justify="flex-start"
align="flex-start"
direction="column"
wrap="wrap">
<Title order={1}>Add Item</Title>
<TextInput withAsterisk key={newCustomerForm.key('name')} size="md" label="Name"
placeholder="Name" {...newCustomerForm.getInputProps('name')}/>
<TextInput size="md" key={newCustomerForm.key('company')} label="Company"
placeholder="Company"{...newCustomerForm.getInputProps('company')}/>
<TextInput withAsterisk size="md" key={newCustomerForm.key('email')} label="Email"
placeholder="Email" {...newCustomerForm.getInputProps('email')}/>
<TextInput size="md" key={newCustomerForm.key('phone')} label="Phone"
placeholder="Phone" {...newCustomerForm.getInputProps('phone')}/>
<TextInput size="md" key={newCustomerForm.key('address')} label="Address"
placeholder="Address" {...newCustomerForm.getInputProps('address')}/>
<Group justify="flex-end" mt="md">
<Button type="submit">Submit</Button>
</Group>
</Flex>
</Container>
</form>
</>
);
}
export default AddCustomer;