Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix new matched aliases population #239

Draft
wants to merge 26 commits into
base: dev
Choose a base branch
from
Draft

Fix new matched aliases population #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c6203a6
quickfix: add unmatched in function
felix-lipski Jul 8, 2024
ce8a31c
seed based on prod
felix-lipski Jul 10, 2024
dc48215
upload mock invoice; improve seed
felix-lipski Jul 10, 2024
0c0eefc
README edit xp
felix-lipski Jul 10, 2024
a674c73
initial process-invoice rework
felix-lipski Jul 10, 2024
2ac86ef
remove unmatchedNames
felix-lipski Jul 10, 2024
2d4cb06
cascades and alias compound key migration
felix-lipski Jul 11, 2024
bbe291f
product records by product_id in app rework
felix-lipski Jul 11, 2024
e5972c4
Merge branch 'dev' into fix-new-matched-aliases-population
felix-lipski Jul 11, 2024
a824a24
new records found in invoice add
felix-lipski Jul 13, 2024
6ca900e
Merge branch 'dev' into fix-new-matched-aliases-population
michalstruck Jul 13, 2024
97b9fbd
wip: updating records works
felix-lipski Jul 18, 2024
39187eb
Merge branch 'fix-new-matched-aliases-population' of github.com:InvTr…
felix-lipski Jul 18, 2024
65e52a0
wip: merge into stock screen
felix-lipski Jul 18, 2024
0cc1a05
wip: remove documentScanner state from redux
felix-lipski Jul 18, 2024
b57d4f1
wip: merge document scanner components
felix-lipski Jul 23, 2024
9475af3
wip: records from invoice appear in stock
felix-lipski Jul 28, 2024
297113c
wip: remove immer; write aliases to db
felix-lipski Aug 1, 2024
9d35ec8
fix: remove some wips
felix-lipski Aug 1, 2024
7cbba45
wip: fix recipies
felix-lipski Aug 27, 2024
e627fdb
fix: can add stock when none exist
felix-lipski Aug 27, 2024
5f961a0
feat: mergeRawAndScanned
felix-lipski Aug 28, 2024
3f12c05
test: set up e2e tests via Maestro
felix-lipski Aug 29, 2024
83524e1
fix: remove warnings
felix-lipski Aug 30, 2024
0f66b88
fix: dark background on loading
felix-lipski Aug 30, 2024
2a9298b
documents rework wip
felix-lipski Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# invtrack
# InvTrack

## Setup

Expand Down
73 changes: 37 additions & 36 deletions admin/src/lib/database.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "inventory_company_id_fkey"
foreignKeyName: "public_inventory_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
Expand All @@ -147,21 +147,18 @@ export type Database = {
Row: {
alias: string
company_id: number
id: number
product_id: number | null
recipe_id: number | null
}
Insert: {
alias: string
company_id: number
id?: number
product_id?: number | null
recipe_id?: number | null
}
Update: {
alias?: string
company_id?: number
id?: number
product_id?: number | null
recipe_id?: number | null
}
Expand Down Expand Up @@ -249,7 +246,7 @@ export type Database = {
referencedColumns: ["id"]
},
{
foreignKeyName: "product_company_id_fkey"
foreignKeyName: "public_product_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
Expand Down Expand Up @@ -316,35 +313,35 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "product_record_inventory_id_fkey"
foreignKeyName: "public_product_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "inventory"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_inventory_id_fkey"
foreignKeyName: "public_product_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "low_quantity_notifications_user_id_view"
referencedColumns: ["inventory_id"]
},
{
foreignKeyName: "product_record_product_id_fkey"
foreignKeyName: "public_product_record_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "deleted_products"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_product_id_fkey"
foreignKeyName: "public_product_record_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "existing_products"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_product_id_fkey"
foreignKeyName: "public_product_record_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "product"
Expand All @@ -357,19 +354,19 @@ export type Database = {
company_id: number | null
created_at: string
id: number
name: string | null
name: string
}
Insert: {
company_id?: number | null
created_at?: string
id?: number
name?: string | null
name: string
}
Update: {
company_id?: number | null
created_at?: string
id?: number
name?: string | null
name?: string
}
Relationships: [
{
Expand Down Expand Up @@ -402,21 +399,21 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "recipe_part_product_id_fkey"
foreignKeyName: "public_recipe_part_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "deleted_products"
referencedColumns: ["id"]
},
{
foreignKeyName: "recipe_part_product_id_fkey"
foreignKeyName: "public_recipe_part_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "existing_products"
referencedColumns: ["id"]
},
{
foreignKeyName: "recipe_part_product_id_fkey"
foreignKeyName: "public_recipe_part_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "product"
Expand Down Expand Up @@ -458,28 +455,28 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "recipe_record_company_id_fkey"
foreignKeyName: "public_recipe_record_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
referencedColumns: ["id"]
},
{
foreignKeyName: "recipe_record_inventory_id_fkey"
foreignKeyName: "public_recipe_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "inventory"
referencedColumns: ["id"]
},
{
foreignKeyName: "recipe_record_inventory_id_fkey"
foreignKeyName: "public_recipe_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "low_quantity_notifications_user_id_view"
referencedColumns: ["inventory_id"]
},
{
foreignKeyName: "recipe_record_recipe_id_fkey"
foreignKeyName: "public_recipe_record_recipe_id_fkey"
columns: ["recipe_id"]
isOneToOne: false
referencedRelation: "recipe"
Expand Down Expand Up @@ -514,14 +511,14 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "worker_company_id_fkey"
foreignKeyName: "public_worker_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
referencedColumns: ["id"]
},
{
foreignKeyName: "worker_id_fkey"
foreignKeyName: "public_worker_id_fkey"
columns: ["id"]
isOneToOne: true
referencedRelation: "users"
Expand All @@ -543,7 +540,7 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "worker_company_id_fkey"
foreignKeyName: "public_worker_company_id_fkey"
columns: ["id"]
isOneToOne: false
referencedRelation: "company"
Expand Down Expand Up @@ -597,7 +594,7 @@ export type Database = {
referencedColumns: ["id"]
},
{
foreignKeyName: "product_company_id_fkey"
foreignKeyName: "public_product_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
Expand Down Expand Up @@ -651,7 +648,7 @@ export type Database = {
referencedColumns: ["id"]
},
{
foreignKeyName: "product_company_id_fkey"
foreignKeyName: "public_product_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
Expand All @@ -666,7 +663,7 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "worker_id_fkey"
foreignKeyName: "public_worker_id_fkey"
columns: ["user_id"]
isOneToOne: true
referencedRelation: "users"
Expand All @@ -686,21 +683,21 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "product_company_id_fkey"
foreignKeyName: "public_product_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_inventory_id_fkey"
foreignKeyName: "public_product_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "inventory"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_inventory_id_fkey"
foreignKeyName: "public_product_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "low_quantity_notifications_user_id_view"
Expand All @@ -725,35 +722,35 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "product_record_inventory_id_fkey"
foreignKeyName: "public_product_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "inventory"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_inventory_id_fkey"
foreignKeyName: "public_product_record_inventory_id_fkey"
columns: ["inventory_id"]
isOneToOne: false
referencedRelation: "low_quantity_notifications_user_id_view"
referencedColumns: ["inventory_id"]
},
{
foreignKeyName: "product_record_product_id_fkey"
foreignKeyName: "public_product_record_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "product"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_product_id_fkey"
foreignKeyName: "public_product_record_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "deleted_products"
referencedColumns: ["id"]
},
{
foreignKeyName: "product_record_product_id_fkey"
foreignKeyName: "public_product_record_product_id_fkey"
columns: ["product_id"]
isOneToOne: false
referencedRelation: "existing_products"
Expand All @@ -772,14 +769,14 @@ export type Database = {
}
Relationships: [
{
foreignKeyName: "worker_company_id_fkey"
foreignKeyName: "public_worker_company_id_fkey"
columns: ["company_id"]
isOneToOne: false
referencedRelation: "company"
referencedColumns: ["id"]
},
{
foreignKeyName: "worker_id_fkey"
foreignKeyName: "public_worker_id_fkey"
columns: ["id"]
isOneToOne: true
referencedRelation: "users"
Expand Down Expand Up @@ -1121,6 +1118,10 @@ export type Database = {
updated_at: string
}[]
}
operation: {
Args: Record<PropertyKey, never>
Returns: string
}
search: {
Args: {
prefix: string
Expand Down
Loading