15 Commits

Author SHA1 Message Date
drew 0d2e049e69 added job itms endpoints 2026-07-19 20:50:02 -05:00
drew 656ccd7d52 added endpoints and fixed some typos 2026-07-19 20:41:02 -05:00
drew 7dcc366393 added job endpoints 2026-07-19 16:10:09 -05:00
drew 8b0a90d2e5 changed order to job 2026-07-19 15:41:47 -05:00
Drew Rautenberg f5efccea40 Merge pull request #39 from BarkProductions/38-add-customer-page
38 add customer page
2026-07-18 19:00:45 -05:00
drew be5260547b moved inputs to ctor for better encapsulation 2026-07-18 18:57:59 -05:00
drew 9374ad53e3 Added edit customer detail page 2026-07-18 18:46:53 -05:00
drew 34d421719c Added customer detail page 2026-07-18 18:33:48 -05:00
drew d15701a50b Fixed add customer page 2026-07-18 18:15:16 -05:00
drew 92afaafe7b add customer page 2026-07-17 12:44:39 -05:00
drew 854c55b7e0 added new customer type 2026-07-17 12:12:54 -05:00
drew 3b07318e34 fixed typos 2026-07-17 12:06:03 -05:00
drew 161a73cbb7 created customer endpoints 2026-07-17 11:56:33 -05:00
drew 65df987f62 added routes and header button 2026-07-17 09:48:05 -05:00
drew 29e9302d8e customer list component 2026-07-17 09:00:21 -05:00
14 changed files with 1119 additions and 43 deletions
@@ -0,0 +1,295 @@
// <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("20260719204137_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<string>("CustomerId")
.IsRequired()
.HasColumnType("text")
.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<string>(type: "text", 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<string>(type: "text", 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);
});
modelBuilder.Entity("barkmanapi.OrderItems", b =>
modelBuilder.Entity("barkmanapi.JobItems", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -159,29 +159,29 @@ namespace barkmanapi.Migrations
.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?>("OrdersId")
.HasColumnType("integer")
.HasColumnName("orders_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")
@@ -193,12 +193,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()
@@ -246,12 +246,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 =>
@@ -264,25 +264,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");
});
+230 -1
View File
@@ -47,6 +47,22 @@ var itemStatusGroup = app.MapGroup(prefix: "/itemstatus")
.WithTags("Item Status")
.WithDescription("Endpoints for managing item status");
var customerGroup = app.MapGroup(prefix: "/customers")
.WithTags("Customers")
.WithDescription("Endpoints for managing customers");
var jobGroup = app.MapGroup(prefix: "/jobs")
.WithTags("Jobs")
.WithDescription("Endpoints for managing jobs");
var jobStatusGroup = app.MapGroup(prefix: "/jobstatus")
.WithTags("Job Status")
.WithDescription("Endpoints for managing job status");
var jobItemGroup = app.MapGroup(prefix: "/jobitems")
.WithTags("Job Items")
.WithDescription("Endpoints for managing job items");
inventoryGroup.MapGet("", async (BarkContext db) =>
await db.Inventory.OrderBy(item => item.Barcode).ToListAsync());
@@ -140,7 +156,7 @@ itemStatusGroup.MapPut("/{id}", async (string id, ItemStatus updatedStatus, Bark
var existingStatus = await db.ItemStatus.FindAsync(id);
if (existingStatus == null)
{
return Results.NotFound(new { Message = "Inventory item not found" });
return Results.NotFound(new { Message = "Item status not found" });
}
existingStatus.Id = updatedStatus.Id;
@@ -163,6 +179,219 @@ itemStatusGroup.MapDelete("/{id}", async (string id, BarkContext db) =>
return Results.Ok(new { Message = "Item status deleted successfully" });
});
customerGroup.MapGet("", async (BarkContext db) =>
await db.Customers.OrderBy(customer => customer.Id).ToListAsync());
customerGroup.MapGet("/{id}", async (int id, BarkContext db) =>
{
var customer = await db.Customers
.FirstOrDefaultAsync(i => i.Id == id);
if (customer == null)
{
return Results.NotFound(new { Message = "Customer not found" });
}
return Results.Ok(customer);
});
customerGroup.MapPut("/{id}", async (int id, Customers updatedCustomer, BarkContext db) =>
{
var existingCustomer = await db.Customers.FindAsync(id);
if (existingCustomer == null)
{
return Results.NotFound(new { Message = "Customer not found" });
}
existingCustomer.Name = updatedCustomer.Name;
existingCustomer.Company = updatedCustomer.Company;
existingCustomer.Email = updatedCustomer.Email;
existingCustomer.PhoneNumber = updatedCustomer.PhoneNumber;
existingCustomer.Address = updatedCustomer.Address;
existingCustomer.BillingTerms = updatedCustomer.BillingTerms;
existingCustomer.Notes = updatedCustomer.Notes;
await db.SaveChangesAsync();
return Results.Ok(existingCustomer);
});
customerGroup.MapPost("", async (Customers newCustomerInput, BarkContext db) =>
{
var newCustomer = new Customers()
{
Name = newCustomerInput.Name,
Email = newCustomerInput.Email,
Company = newCustomerInput.Company,
PhoneNumber = newCustomerInput.PhoneNumber,
Address = newCustomerInput.Address,
};
db.Customers.Add(newCustomer);
await db.SaveChangesAsync();
return Results.Created($"/customers/{newCustomer.Id}", newCustomer);
});
customerGroup.MapDelete("/{id}", async (int id, BarkContext db) =>
{
var customer = await db.Customers.FindAsync(id);
if (customer == null)
{
return Results.NotFound(new { Message = "Customer not found" });
}
db.Customers.Remove(customer);
await db.SaveChangesAsync();
return Results.Ok(new { Message = "Customer deleted successfully" });
});
jobGroup.MapGet("", async (BarkContext db) =>
await db.Jobs.OrderBy(jobs => jobs.Id).ToListAsync());
jobGroup.MapGet("/{id}", async (int id, BarkContext db) =>
{
var job = await db.Jobs
.FirstOrDefaultAsync(i => i.Id == id);
if (job == null)
{
return Results.NotFound(new { Message = "Job not found" });
}
return Results.Ok(job);
});
jobGroup.MapPut("/{id}", async (int id, Jobs updatedJob, BarkContext db) =>
{
var existingJob = await db.Jobs.FindAsync(id);
if (existingJob == null)
{
return Results.NotFound(new { Message = "Job not found" });
}
existingJob.Name = updatedJob.Name;
existingJob.StartDate = updatedJob.StartDate;
existingJob.EndDate = updatedJob.EndDate;
existingJob.TotalPrice = updatedJob.TotalPrice;
existingJob.Venue = updatedJob.Venue;
existingJob.Address = updatedJob.Address;
existingJob.Notes = updatedJob.Notes;
await db.SaveChangesAsync();
return Results.Ok(existingJob);
});
jobGroup.MapPost("", async (Jobs newJobInput, BarkContext db) =>
{
var newJob = new Jobs()
{
CustomerId = newJobInput.CustomerId,
Name = newJobInput.Name,
StartDate = newJobInput.StartDate,
EndDate = newJobInput.EndDate,
Venue = newJobInput.Venue,
Address = newJobInput.Address,
};
db.Jobs.Add(newJob);
await db.SaveChangesAsync();
return Results.Created($"/jobs/{newJob.Id}", newJob);
});
jobStatusGroup.MapGet("/", async (BarkContext db) =>
await db.JobStatus.ToListAsync());
jobStatusGroup.MapPost("/", async (JobStatus newJobStatus, BarkContext db) =>
{
db.JobStatus.Add(newJobStatus);
await db.SaveChangesAsync();
return Results.Created($"/jobstatus/{newJobStatus.Id}", newJobStatus);
});
jobStatusGroup.MapGet("/{id}", async (string id, BarkContext db) =>
{
var jobStatus = await db.JobStatus.FindAsync(id);
if (jobStatus == null)
{
return Results.NotFound(new { Message = "Job Status not found" });
}
return Results.Ok(jobStatus);
});
jobStatusGroup.MapPut("/{id}", async (string id, JobStatus updatedStatus, BarkContext db) =>
{
var existingStatus = await db.JobStatus.FindAsync(id);
if (existingStatus == null)
{
return Results.NotFound(new { Message = "Job status not found" });
}
existingStatus.Id = updatedStatus.Id;
existingStatus.Name = updatedStatus.Name;
await db.SaveChangesAsync();
return Results.Ok(existingStatus);
});
jobStatusGroup.MapDelete("/{id}", async (string id, BarkContext db) =>
{
var jobStatus = await db.JobStatus.FindAsync(id);
if (jobStatus == null)
{
return Results.NotFound(new { Message = "Job status not found" });
}
db.JobStatus.Remove(jobStatus);
await db.SaveChangesAsync();
return Results.Ok(new { Message = "Job status deleted successfully" });
});
jobItemGroup.MapGet("", async (BarkContext db) =>
await db.JobItems.OrderBy(items => items.Id).ToListAsync());
jobItemGroup.MapGet("/{id}", async (int id, BarkContext db) =>
{
var jobItems = await db.JobItems
.FirstOrDefaultAsync(i => i.Id == id);
if (jobItems == null)
{
return Results.NotFound(new { Message = "Job Items not found" });
}
return Results.Ok(jobItems);
});
jobItemGroup.MapPut("/{id}", async (int id, JobItems updatedJobItems, BarkContext db) =>
{
var existingJobItems = await db.JobItems.FindAsync(id);
if (existingJobItems == null)
{
return Results.NotFound(new { Message = "Job Items not found" });
}
existingJobItems.OrderId = updatedJobItems.OrderId;
existingJobItems.ItemId = updatedJobItems.ItemId;
existingJobItems.Quantity = updatedJobItems.Quantity;
await db.SaveChangesAsync();
return Results.Ok(existingJobItems);
});
jobItemGroup.MapPost("", async (JobItems newJobItemsInput, BarkContext db) =>
{
var newJobItem = new JobItems()
{
OrderId = newJobItemsInput.OrderId,
ItemId = newJobItemsInput.ItemId,
Quantity = newJobItemsInput.Quantity,
};
db.JobItems.Add(newJobItem);
await db.SaveChangesAsync();
return Results.Created($"/jobItems/{newJobItem.Id}", newJobItem);
});
using (var serviceScope = app.Services.CreateScope())
{
var dbContext = serviceScope.ServiceProvider.GetRequiredService<BarkContext>();
+8 -8
View File
@@ -7,9 +7,9 @@ public class BarkContext(DbContextOptions<BarkContext> options) : DbContext(opti
public DbSet<InventoryItems> Inventory { get; set; }
public DbSet<ItemStatus> ItemStatus { get; set; }
public DbSet<Customers> Customers { get; set; }
public DbSet<Orders> Orders { get; set; }
public DbSet<OrderItems> OrderItems { get; set; }
public DbSet<OrderStatus> OrderStatus { get; set; }
public DbSet<Jobs> Jobs { get; set; }
public DbSet<JobItems> JobItems { get; set; }
public DbSet<JobStatus> JobStatus { get; set; }
}
[Index(nameof(Barcode), IsUnique = true)]
@@ -46,23 +46,23 @@ public class Customers
public string? Notes { get; set; }
}
public class Orders
public class Jobs
{
public int Id { get; set; }
public required string CustomerId { get; set; }
public required string Name { get; set; }
public OrderStatus Status { get; set; }
public JobStatus Status { get; set; }
public string? StatusId { get; set; }
public DateTimeOffset StartDate { get; set; }
public DateTimeOffset EndDate { get; set; }
public decimal TotalPrice { get; set; }
public string? Venue { get; set; }
public string? Address { get; set; }
public OrderItems[] Items { get; set; }
public JobItems[] Items { get; set; }
public string? Notes { get; set; }
}
public class OrderItems
public class JobItems
{
public int Id { get; set; }
public required string OrderId { get; set; }
@@ -70,7 +70,7 @@ public class OrderItems
public int Quantity { get; set; }
}
public class OrderStatus
public class JobStatus
{
public string Id { get; set; }
public string Name { get; set; }
+9
View File
@@ -10,6 +10,10 @@ import {BarkHeader} from "./common/components/BarkHeader.tsx";
import AddItem from "./features/inventory/AddItem.tsx";
import { Notifications } from '@mantine/notifications';
import '@mantine/notifications/styles.css';
import CustomerList from "@/features/customers/CustomerList.tsx";
import AddCustomer from "@/features/customers/AddCustomer.tsx";
import CustomerDetail from "@/features/customers/CustomerDetail.tsx";
import EditCustomer from "@/features/customers/EditCustomer.tsx";
// Create a client
const queryClient = new QueryClient()
@@ -46,6 +50,11 @@ function App() {
<Route path="inventory/itemDetail/:itemId" element={<ItemDetail/>}/>
<Route path="inventory/editItem/:itemId" element={<EditItem/>}/>
<Route path="inventory/addItem" element={<AddItem/>}/>
<Route path="customers" element={<CustomerList/>}/>
<Route path="customers/addCustomer" element={<AddCustomer/>}/>
<Route path="customers/customerDetail/:customerId" element={<CustomerDetail/>}/>
<Route path="customers/editCustomer/:customerId" element={<EditCustomer/>}/>
</Routes>
</>
</QueryClientProvider>
@@ -7,6 +7,7 @@ import BarkLogo from '@/assets/barklogo.png';
const links = [
{ link: '/', label: 'Home' },
{ link: '/customers', label: 'Customers' },
{ link: '/inventory', label: 'Inventory' },
];
@@ -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 {NewCustomer} from "./types.ts";
import {useNavigate} from "react-router";
import {IconX, IconCheck} from '@tabler/icons-react';
import {notifications} from '@mantine/notifications';
import useCustomerList from "./hooks/useCustomerList.tsx";
function AddCustomer() {
const navigate = useNavigate();
const customerQuery = useCustomerList();
const newCustomerForm = useForm<NewCustomer>({
mode: 'uncontrolled',
initialValues: {
name: "",
company: "",
email: "",
phone: "",
address: "",
},
validate: {},
});
const updateCustomer = useMutation({
mutationFn: async (values: NewCustomer) => {
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;
@@ -0,0 +1,45 @@
import {Container, Text, Title} from "@mantine/core";
import {Link, useParams} from "react-router";
import {Customer} from "./types.ts";
import {useQuery} from "@tanstack/react-query";
function CustomerDetail() {
const params = useParams();
const {isPending, error, data, isFetching} = useQuery({
queryKey: ['customers', params.customerId],
queryFn: async (): Promise<Customer> => {
const response = await fetch(
import.meta.env.VITE_API_URL + '/customers/' + params.customerId,
)
if (!response.ok) throw new Error('Failed to fetch customer ' + response.statusText)
return await response.json()
},
});
if (isPending) return 'Loading...'
if (error) return 'An error has occurred: ' + error.message
return (
<>
<Container m="lg">
<Title order={1}>Customer Detail</Title>
<div>{isFetching ? 'Updating...' : ''}</div>
<Text>Name: {data.name}</Text>
<Text>Company: {data.company}</Text>
<Text>Email: {data.email}</Text>
<Text>Phone Number: {data.phone}</Text>
<Text>Address: ${data.address}</Text>
<Text>Notes: {data.notes}</Text>
<Link to={`/customers/editCustomer/${data.id}`}>Edit</Link>
</Container>
</>
)
}
export default CustomerDetail
@@ -0,0 +1,54 @@
import {Flex, Table} from '@mantine/core';
import BarkButton from "../../common/components/BarkButton.tsx";
import {Link, NavLink} from "react-router";
import useCustomerList from "./hooks/useCustomerList.tsx";
function CustomerList() {
const customerQuery = useCustomerList();
if (customerQuery.isPending) return 'Loading...'
if (customerQuery.error) return 'An error has occurred: ' + customerQuery.error.message
return (
<>
<Flex
mih={50}
gap="xl"
justify="center"
align="center"
direction="row"
wrap="wrap"
>
<p>
ARFF ARFF BARK BARK
</p>
<NavLink to={'/customers/AddCustomer'}><BarkButton>Add Customer</BarkButton></NavLink>
</Flex>
<Table striped>
<Table.Thead>
<Table.Tr>
<Table.Th c="red">Name</Table.Th>
<Table.Th c="red">Company</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{customerQuery.data?.map((data) => (
<Table.Tr key={data.id}>
<Table.Td>{data.name}</Table.Td>
<Table.Td>{data.company}</Table.Td>
<Table.Td>
<Link to={`/customers/customerDetail/${data.id}`}>Details</Link>
</Table.Td>
</Table.Tr>
))}
</Table.Tbody>
</Table>
</>
)
}
export default CustomerList;
@@ -0,0 +1,134 @@
import {Button, Group, TextInput, Container, Title, Flex} from '@mantine/core';
import {useForm} from '@mantine/form';
import {useNavigate, useParams} from "react-router";
import {useMutation, useQuery, useQueryClient} from "@tanstack/react-query";
import {Customer} from "./types.ts";
import {useEffect} from "react";
import {notifications} from "@mantine/notifications";
import {IconCheck, IconX} from "@tabler/icons-react";
type EditableCustomer= Omit<Customer, 'id'>;
function EditCustomer() {
const params = useParams();
const navigate = useNavigate();
const editCustomerForm = useForm<EditableCustomer>({
mode: 'uncontrolled',
initialValues: {
name: "",
company: "",
email: "",
phone: "",
address: "",
billingTerms: "",
notes: "",
},
validate: {},
});
const {isPending, error, data, isFetching} = useQuery({
queryKey: ['customer', params.customerId],
queryFn: async (): Promise<Customer> => {
const response = await fetch(
import.meta.env.VITE_API_URL + '/customers/' + params.customerId,
)
if (!response.ok) throw new Error('Failed to fetch customer ' + response.statusText)
return await response.json()
},
});
const queryClient = useQueryClient();
const updateCustomer = useMutation({
mutationFn: async (values: EditableCustomer) => {
// await <call the api, do the things>
const result = await fetch(import.meta.env.VITE_API_URL + '/customers/' + params.customerId, {
method: 'PUT',
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 Updated",
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 update customer');
}
// invalidate the queries so they pull updated information
// this is a prefix, so it covers both the query that pulls a list, and also `['customers', customerId]` in this file
await queryClient.invalidateQueries({
queryKey: ['customers']
});
}
})
useEffect(() => {
if (data) {
// Even if query.data changes, form will be initialized only once
editCustomerForm.initialize(data);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [data]);
if (isPending) return 'Loading...'
if (error) return 'An error has occurred: ' + error.message
return (
<form onSubmit={editCustomerForm.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">
<div>{isFetching ? 'Updating...' : ''}</div>
<Title order={1}>Edit Customer</Title>
<TextInput withAsterisk key={editCustomerForm.key('name')} size="md" label="Name"
placeholder="Name" {...editCustomerForm.getInputProps('name')}/>
<TextInput size="md" key={editCustomerForm.key('company')} label="Company"
placeholder="Company"{...editCustomerForm.getInputProps('company')}/>
<TextInput withAsterisk size="md" key={editCustomerForm.key('email')} label="Email"
placeholder="Email" {...editCustomerForm.getInputProps('email')}/>
<TextInput size="md" key={editCustomerForm.key('phone')} label="Phone"
placeholder="Phone" {...editCustomerForm.getInputProps('phone')}/>
<TextInput size="md" key={editCustomerForm.key('address')} label="Address"
placeholder="Address" {...editCustomerForm.getInputProps('address')}/>
<Group justify="flex-end" mt="md">
<Button type="submit">Submit</Button>
</Group>
</Flex>
</Container>
</form>
);
}
export default EditCustomer;
@@ -0,0 +1,17 @@
import {useQuery} from "@tanstack/react-query";
import {Customer} from "../types.ts";
const useCustomerList = () => useQuery({
queryKey: ['customer'],
queryFn: async (): Promise<Customer[]> => {
const response = await fetch(
import.meta.env.VITE_API_URL + '/customers',
)
if (!response.ok) throw new Error('Failed to fetch customers ' + response.statusText)
return await response.json()
},
});
export default useCustomerList;
+17
View File
@@ -0,0 +1,17 @@
export interface Customer {
id: number,
name: string,
company: string,
email: string,
phone: string,
address: string,
billingTerms: string,
notes: string,
}
export interface NewCustomer {
name: string,
company: string,
email: string,
phone: string,
address: string,
}
-10
View File
@@ -19,13 +19,3 @@ export interface NewItem {
rentalPrice: number,
replacementCost: number,
}
export interface Customer {
id: number,
name: string,
company: string,
email: string,
phone: string,
address: string,
billingTerms: string,
notes: string,
}