From 090576a1d9eb45adc3fa167873334bd50cd2faf4 Mon Sep 17 00:00:00 2001
From: Ben <36240171+benkyd@users.noreply.github.com>
Date: Thu, 3 Feb 2022 22:39:57 +0000
Subject: [PATCH] haa

Former-commit-id: c4d0ca7e32c5625287103613b9f84784c8699605
---
 db/LegoLog Schema Proj.dbs     | 152 ---------------------------------
 db/LegoLog Schema Proj.dbs.bak | 143 -------------------------------
 db/dev.sqlite                  | Bin 40960 -> 0 bytes
 db/schema.sql                  | 136 +++++++++++++++++------------
 4 files changed, 83 insertions(+), 348 deletions(-)
 delete mode 100644 db/LegoLog Schema Proj.dbs
 delete mode 100644 db/LegoLog Schema Proj.dbs.bak
 delete mode 100644 db/dev.sqlite

diff --git a/db/LegoLog Schema Proj.dbs b/db/LegoLog Schema Proj.dbs
deleted file mode 100644
index 4b596a0..0000000
--- a/db/LegoLog Schema Proj.dbs	
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project name="schema.sql" id="Project-323" database="Sqlite" >
-	<schema name="public" >
-		<table name="Brick" spec="" >
-			<column name="id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="name" type="text" length="100" jt="-1" mandatory="y" />
-			<column name="colour" type="integer" jt="4" />
-			<column name="catagory" type="integer" jt="4" />
-			<column name="weight" type="decimal" jt="3" />
-			<column name="dimensions_x" type="integer" jt="4" />
-			<column name="dimensions_y" type="integer" jt="4" />
-			<column name="dimensions_z" type="integer" jt="4" />
-			<column name="date_from" type="date" jt="91" />
-			<column name="date_to" type="date" jt="91" />
-			<index name="pk_Brick" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-			<fk name="FK_Brick BrickColour" to_schema="public" to_table="BrickColour" options="" >
-				<fk_column name="colour" pk="id" />
-			</fk>
-			<fk name="FK_Brick Catagory" to_schema="public" to_table="Catagory" options="" >
-				<fk_column name="catagory" pk="id" />
-			</fk>
-		</table>
-		<table name="BrickColour" spec="" >
-			<column name="id" type="integer" jt="4" mandatory="y" />
-			<column name="name" type="varchar" length="100" jt="12" />
-			<column name="hexrgb" type="varchar" length="6" jt="12" mandatory="y" />
-			<column name="col_type" type="integer" jt="4" />
-			<index name="pk_BrickColour" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-			<fk name="FK_BrickColour ColourType" to_schema="public" to_table="ColourType" options="" >
-				<fk_column name="col_type" pk="id" />
-			</fk>
-		</table>
-		<table name="BrickInventory" >
-			<column name="id" type="varchar" length="50" jt="12" />
-		</table>
-		<table name="BrickSet" spec="" >
-			<column name="id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="catagory" type="integer" jt="4" />
-			<column name="name" type="varchar" length="100" jt="12" />
-			<column name="date_released" type="date" jt="91" />
-			<column name="dimensions_x" type="decimal" jt="3" />
-			<column name="dimensions_y" type="decimal" jt="3" />
-			<column name="dimensions_z" type="decimal" jt="3" />
-			<fk name="FK_BrickSet Catagory" to_schema="public" to_table="Catagory" options="" >
-				<fk_column name="catagory" pk="id" />
-			</fk>
-		</table>
-		<table name="BrickSetInventory" >
-			<column name="id" type="varchar" length="50" jt="12" />
-		</table>
-		<table name="Catagory" spec="" >
-			<column name="id" type="integer" jt="4" mandatory="y" />
-			<column name="name" type="varchar" length="100" jt="12" />
-			<index name="pk_Catagory" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-		</table>
-		<table name="ColourType" spec="" >
-			<column name="id" type="integer" jt="4" mandatory="y" />
-			<column name="name" type="varchar" length="64" jt="12" />
-			<index name="pk_ColourType" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-		</table>
-		<table name="SetBrick" spec="" >
-			<column name="id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="set_id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="brick_id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="amount" type="integer" jt="4" />
-			<index name="pk_SetBrick" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-			<fk name="FK_SetBrick BrickSet" to_schema="public" to_table="BrickSet" options="" >
-				<fk_column name="set_id" pk="id" />
-			</fk>
-			<fk name="FK_SetBrick Brick" to_schema="public" to_table="Brick" options="" >
-				<fk_column name="brick_id" pk="id" />
-			</fk>
-		</table>
-	</schema>
-	<connector name="Sqlite" database="Sqlite" driver_class="org.sqlite.JDBC" driver_jar="sqlite-jdbc-3.36.0.3.jar" driver_desc="Standard" host="localhost" port="7210" />
-	<layout name="Layout" id="Layout-20e8" show_column_type="y" show_relation="columns" >
-		<entity schema="public" name="Brick" color="BED3F4" x="272" y="48" />
-		<entity schema="public" name="BrickColour" color="BED3F4" x="512" y="48" />
-		<entity schema="public" name="BrickInventory" color="C1D8EE" x="848" y="272" />
-		<entity schema="public" name="BrickSet" color="BED3F4" x="272" y="352" />
-		<entity schema="public" name="BrickSetInventory" color="C1D8EE" x="848" y="352" />
-		<entity schema="public" name="Catagory" color="BED3F4" x="464" y="256" />
-		<entity schema="public" name="ColourType" color="BED3F4" x="720" y="48" />
-		<entity schema="public" name="SetBrick" color="BED3F4" x="48" y="256" />
-		<script name="schema.sql" id="Editor-1de1" language="SQL" >
-			<string><![CDATA[CREATE TABLE Catagory ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(100)     
- );
-
-CREATE TABLE ColourType ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name               varchar(64)     
- );
-
-CREATE TABLE BrickSet ( 
-	id                   varchar(50) NOT NULL    ,
-	catagory             integer     ,
-	name                 varchar(100)     ,
-	date_released        date     ,
-	dimensions_x         decimal     ,
-	dimensions_y         decimal     ,
-	dimensions_z         decimal     ,
-	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )  
- );
-
-CREATE TABLE SetBrick ( 
-	id 				 	 varchar(50) NOT NULL  PRIMARY KEY  ,
-	set_id               varchar(50) NOT NULL     ,
-	brick_id             varchar(50) NOT NULL     ,
-	amount               integer     ,
-	FOREIGN KEY ( set_id ) REFERENCES BrickSet( id )  ,
-	FOREIGN KEY ( brick_id ) REFERENCES Brick( id )  ,
-
- );
-
-CREATE TABLE BrickColour ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(100)     ,
-	hexrgb               varchar(6) NOT NULL    ,
-	col_type               integer     ,
-	FOREIGN KEY ( col_type ) REFERENCES ColourType( id )  
- );
-
-CREATE TABLE Brick ( 
-	id                   varchar(50) NOT NULL  PRIMARY KEY  ,
-	name                 text(100) NOT NULL    ,
-	colour               integer     ,
-	catagory             integer     ,
-	weight               decimal     ,
-	dimensions_x         integer     ,
-	dimensions_y         integer     ,
-	dimensions_z         integer     ,
-	date_from            date     ,
-	date_to              date     ,
-	FOREIGN KEY ( colour ) REFERENCES BrickColour( id )  ,
-	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )  
- );
-]]></string>
-		</script>
-	</layout>
-</project>
\ No newline at end of file
diff --git a/db/LegoLog Schema Proj.dbs.bak b/db/LegoLog Schema Proj.dbs.bak
deleted file mode 100644
index d5ed916..0000000
--- a/db/LegoLog Schema Proj.dbs.bak	
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project name="schema.sql" id="Project-323" database="Sqlite" >
-	<schema name="public" >
-		<table name="Brick" spec="" >
-			<column name="id" type="varchar" length="20" jt="12" mandatory="y" />
-			<column name="name" type="text" length="100" jt="-1" mandatory="y" />
-			<column name="colour" type="integer" jt="4" />
-			<column name="catagory" type="integer" jt="4" />
-			<column name="weight" type="decimal" jt="3" />
-			<column name="dimensions_x" type="integer" jt="4" />
-			<column name="dimensions_y" type="integer" jt="4" />
-			<column name="dimensions_z" type="integer" jt="4" />
-			<column name="date_from" type="date" jt="91" />
-			<column name="date_to" type="date" jt="91" />
-			<index name="pk_Brick" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-			<fk name="FK_Brick BrickColour" to_schema="public" to_table="BrickColour" options="" >
-				<fk_column name="colour" pk="id" />
-			</fk>
-			<fk name="FK_Brick Catagory" to_schema="public" to_table="Catagory" options="" >
-				<fk_column name="catagory" pk="id" />
-			</fk>
-		</table>
-		<table name="BrickColour" spec="" >
-			<column name="id" type="integer" jt="4" mandatory="y" />
-			<column name="name" type="varchar" length="100" jt="12" />
-			<column name="hexrgb" type="varchar" length="6" jt="12" mandatory="y" />
-			<column name="col_type" type="integer" jt="4" />
-			<index name="pk_BrickColour" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-			<fk name="FK_BrickColour ColourType" to_schema="public" to_table="ColourType" options="" >
-				<fk_column name="col_type" pk="id" />
-			</fk>
-		</table>
-		<table name="BrickSet" spec="" >
-			<column name="id" type="varchar" length="20" jt="12" mandatory="y" />
-			<column name="catagory" type="integer" jt="4" />
-			<column name="name" type="varchar" length="100" jt="12" />
-			<column name="date_released" type="date" jt="91" />
-			<column name="dimensions_x" type="decimal" jt="3" />
-			<column name="dimensions_y" type="decimal" jt="3" />
-			<column name="dimensions_z" type="decimal" jt="3" />
-			<fk name="FK_BrickSet Catagory" to_schema="public" to_table="Catagory" options="" >
-				<fk_column name="catagory" pk="id" />
-			</fk>
-		</table>
-		<table name="Catagory" spec="" >
-			<column name="id" type="integer" jt="4" mandatory="y" />
-			<column name="name" type="varchar" length="100" jt="12" />
-			<index name="pk_Catagory" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-		</table>
-		<table name="ColourType" spec="" >
-			<column name="id" type="integer" jt="4" mandatory="y" />
-			<column name="name" type="varchar" length="64" jt="12" />
-			<index name="pk_ColourType" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-		</table>
-		<table name="SetBrick" spec="" >
-			<column name="id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="set_id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="brick_id" type="varchar" length="50" jt="12" mandatory="y" />
-			<column name="amount" type="integer" jt="4" />
-			<index name="pk_SetBrick" unique="PRIMARY_KEY" >
-				<column name="id" />
-			</index>
-			<fk name="FK_SetBrick BrickSet" to_schema="public" to_table="BrickSet" options="" >
-				<fk_column name="set_id" pk="id" />
-			</fk>
-			<fk name="FK_SetBrick Brick" to_schema="public" to_table="Brick" options="" >
-				<fk_column name="brick_id" pk="id" />
-			</fk>
-		</table>
-	</schema>
-	<layout name="Layout" id="Layout-20e8" show_relation="columns" >
-		<entity schema="public" name="Brick" color="BED3F4" x="272" y="48" />
-		<entity schema="public" name="BrickColour" color="BED3F4" x="464" y="48" />
-		<entity schema="public" name="BrickSet" color="BED3F4" x="272" y="352" />
-		<entity schema="public" name="Catagory" color="BED3F4" x="464" y="256" />
-		<entity schema="public" name="ColourType" color="BED3F4" x="624" y="48" />
-		<entity schema="public" name="SetBrick" color="BED3F4" x="48" y="256" />
-		<script name="schema.sql" id="Editor-1de1" language="SQL" >
-			<string><![CDATA[CREATE TABLE Catagory ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(100)     
- );
-
-CREATE TABLE ColourType ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name               varchar(64)     
- );
-
-CREATE TABLE BrickSet ( 
-	id                   varchar(20) NOT NULL    ,
-	catagory             integer     ,
-	name                 varchar(100)     ,
-	date_released        date     ,
-	dimensions_x         decimal     ,
-	dimensions_y         decimal     ,
-	dimensions_z         decimal     ,
-	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )  
- );
-
-CREATE TABLE SetBrick ( 
-	id 				 	 varchar(50) NOT NULL  PRIMARY KEY  ,
-	set_id               varchar(50) NOT NULL     ,
-	brick_id             varchar(50) NOT NULL     ,
-	amount               integer     ,
-	FOREIGN KEY ( set_id ) REFERENCES BrickSet( id )  ,
-	FOREIGN KEY ( brick_id ) REFERENCES Brick( id )  ,
-
- );
-
-CREATE TABLE BrickColour ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(100)     ,
-	hexrgb               varchar(6) NOT NULL    ,
-	col_type               integer     ,
-	FOREIGN KEY ( col_type ) REFERENCES ColourType( id )  
- );
-
-CREATE TABLE Brick ( 
-	id                   varchar(20) NOT NULL  PRIMARY KEY  ,
-	name                 text(100) NOT NULL    ,
-	colour               integer     ,
-	catagory             integer     ,
-	weight               decimal     ,
-	dimensions_x         integer     ,
-	dimensions_y         integer     ,
-	dimensions_z         integer     ,
-	date_from            date     ,
-	date_to              date     ,
-	FOREIGN KEY ( colour ) REFERENCES BrickColour( id )  ,
-	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )  
- );
-]]></string>
-		</script>
-	</layout>
-</project>
\ No newline at end of file
diff --git a/db/dev.sqlite b/db/dev.sqlite
deleted file mode 100644
index 72774492b0a1788a5b99e7feaa3e2a9be0389597..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40960
zcmeI*$!^m?7{GD6TNbF=n=e!h>ZOqorDC}u(FTJeN(yNz(Ni$Z&{`xhb=(rTwJH+N
z!i#X?&ZBT->}0$oL~4<^n7^eYwr4!c@0*!)ltXu4ZM%UK?>xWj1md2tY?!9;SO~)~
zit1HXFMWj9bNWJknyK??r$yt=?wiG>Uq-2TVJv=I`mwlt{rK8e>3gYJ{HbnnAb<b@
z2q1vKe=5)@Em*57X5a0#<>15n)|T%cyx*09{w!A;_GZ%-d-d9@JzLc3Pwdwsl~3%{
zh0ZJ1gxeMs@wr&A*4NFm)xde%kvg^3JC(h_^FK}8D2?i9Zf<ScacOaWRcyJW3Z6Vp
z9sl6S@z);Qtwf1sQ8_LYtV+c^TS@AU3yLa^uZokk#%Wio@_evRuvS*gFV&>Zlwe`9
z9+i5z8tOYuQQzC%4tsaITsm+9=THe|B-~yg52YX7Q+aw$S7y?~3k|h#cO<1Uww*w>
zeA$ssU&grMO<hvk?aE%?^?Lo*ATF^j58STP`9q$hRnzl)o>tD&orYa|Ru|9heI*n3
zvmzSyQ@df;tM;y_j(R^DWkN;!{PujoT3t0SZYK0quj8HgQLKlj3zGpDCQOfkHck9r
zHfk?68~afM!%$qB`A81@!?$t2hbKB74=W<6Vi;nt(+WO)$c9iiCwy4dJ%**9$YMnb
zO;u8g>+Hr{!Mb(JJfDrYh6-Vx<ZM2JmE8YlRuAvTbN9@ejV98$Ic(l2-a77c*{12a
zFm-j%YKidQ1yPN&3t<*4%QC;F##uDNW-@JxZcUfcQ4g1^D>f>SgJ3P1y~%@myr|JW
zHoSDtN8=@)PU&o8c|J<_@F+-UQ0LPpa<U+dm6KXDk_BOUo@7B7&l9dr?|iSDZc=7-
z3Nr*=I$1S1wR}y?lF%tLM^bBqo+OjAOAoWmlX^(%$J7w1%q&=sEYpa-Nc+bfwX<(I
zCxI7T55HDh8&Qq3>Q9YuKW{9CZ_D8u2LcEnfB*srAb<b@2q1s}0tn<)Ao_uy{eND=
zOTQ36009ILKmY**5I_I{1Q3V>`2C-OfB*srAb<b@2q1s}0tg_0K>h{T|K~r(^bi3A
z5I_I{1Q0*~0R#|000H*@i~$4?KmY**5I_I{1Q0*~0R-|d!2Un~F{XzIAb<b@2q1s}
z0tg_000IcG|7Q#!fB*srAb<b@2q1s}0tg_Ge*yOY`HwL@L;wK<5I_I{1Q0*~0R#|0
dfdBu;7(f641Q0*~0R#|0009ILKp_7DzX7wF0(JlZ

diff --git a/db/schema.sql b/db/schema.sql
index fcb2aa7..e9a5611 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -1,61 +1,91 @@
-CREATE TABLE LegoBrickInventory ( 
-	id                   varchar(50)
- );
+CREATE TABLE LegoBrickPriceHistory (
+	id 					integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	brick_id 			integer NOT NULL,
+	price_point			decimal NOT NULL,
+	date_point 			date NOT NULL,
+	FOREIGN KEY ( id ) REFERENCES LegoBrick( id )
+);
 
-CREATE TABLE LegoSetInventory ( 
-	id                   varchar(50)
- );
+CREATE TABLE LegoSetPriceHistory (
+	id 					integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	set_id 				integer NOT NULL,
+	price_point			decimal NOT NULL,
+	date_point 			date NOT NULL,
+	FOREIGN KEY ( id ) REFERENCES LegoSet( id )
+);
 
-CREATE TABLE Catagory ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(100)     
- );
+CREATE TABLE LegoBrickInventory (
+	id                  varchar(50) NOT NULL PRIMARY KEY,
+	stock				int NOT NULL,
+	price				decimal NOT NULL,
+	demand_factor		decimal NOT NULL,
+	backorder 		  	boolean,
+	backorder_stock	  	int,
+	last_updated		datetime NOT NULL
+	FOREIGN KEY ( id ) REFERENCES LegoBrick( id )
+);
 
-CREATE TABLE ColourType ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(64)     
- );
+CREATE TABLE LegoSetInventory (
+	id                  varchar(50) NOT NULL PRIMARY KEY,
+	stock				int NOT NULL,
+	price				decimal NOT NULL,
+	demand_factor		decimal NOT NULL,
+	backorder 		  	boolean,
+	backorder_stock	  	int,
+	last_updated		datetime NOT NULL
+	FOREIGN KEY ( id ) REFERENCES LegoSet( id )
+);
 
-CREATE TABLE LegoBrickColour ( 
-	id                   integer NOT NULL  PRIMARY KEY  ,
-	name                 varchar(100)     ,
-	hexrgb               varchar(6) NOT NULL    ,
-	col_type             integer     ,
-	FOREIGN KEY ( col_type ) REFERENCES ColourType( id )  
- );
+CREATE TABLE Catagory (
+	id                   integer NOT NULL PRIMARY KEY,
+	name                 varchar(100)   
+);
 
-CREATE TABLE LegoSet ( 
-	id                   varchar(50) NOT NULL  PRIMARY KEY  ,
-	catagory             integer     ,
-	name                 varchar(100)     ,
-	date_released        date     ,
-	dimensions_x         decimal     ,
-	dimensions_y         decimal     ,
-	dimensions_z         decimal     ,
-	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )  
- );
+CREATE TABLE ColourType (
+	id                   integer NOT NULL PRIMARY KEY,
+	name                 varchar(64)
+);
 
-CREATE TABLE LegoBrick ( 
-	id                   varchar(50) NOT NULL  PRIMARY KEY  ,
-	name                 text(100) NOT NULL    ,
-	colour               integer     ,
-	catagory             integer     ,
-	weight               decimal     ,
-	dimensions_x         integer     ,
-	dimensions_y         integer     ,
-	dimensions_z         integer     ,
-	date_from            date     ,
-	date_to              date     ,
-	FOREIGN KEY ( colour ) REFERENCES LegoBrickColour( id )  ,
-	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )  
- );
+CREATE TABLE LegoBrickColour (
+	id                   integer NOT NULL PRIMARY KEY,
+	name                 varchar(100),
+	hexrgb               varchar(6) NOT NULL,
+	col_type             integer,
+	FOREIGN KEY ( col_type ) REFERENCES ColourType( id )
+);
 
-CREATE TABLE SetDescriptor ( 
-	id                   varchar(50) NOT NULL  PRIMARY KEY  ,
-	set_id               varchar(50) NOT NULL    ,
-	brick_id             varchar(50) NOT NULL    ,
-	amount               integer     ,
-	FOREIGN KEY ( set_id ) REFERENCES LegoSet( id )  ,
-	FOREIGN KEY ( brick_id ) REFERENCES LegoBrick( id )  
- );
+CREATE TABLE LegoSet (
+	id                   varchar(50) NOT NULL PRIMARY KEY,
+	catagory             integer,
+	name                 varchar(100),
+	date_released        date,
+	dimensions_x         decimal,
+	dimensions_y         decimal,
+	dimensions_z         decimal,
+	FOREIGN KEY ( catagory ) REFERENCES Catagory( id ),
+	FOREIGN KEY ( id ) REFERENCES LegoSetInventory( id )
+);
 
+CREATE TABLE LegoBrick (
+	id                   varchar(50) NOT NULL PRIMARY KEY,
+	name                 text(100) NOT NULL,
+	colour               integer,
+	catagory             integer,
+	weight               decimal,
+	dimensions_x         integer,
+	dimensions_y         integer,
+	dimensions_z         integer,
+	date_from            date,
+	date_to              date,
+	FOREIGN KEY ( colour ) REFERENCES LegoBrickColour( id ),
+	FOREIGN KEY ( catagory ) REFERENCES Catagory( id )
+);
+
+CREATE TABLE SetDescriptor (
+	id                   varchar(50) NOT NULL PRIMARY KEY,
+	set_id               varchar(50) NOT NULL,
+	brick_id             varchar(50) NOT NULL,
+	amount               integer,
+	FOREIGN KEY ( set_id ) REFERENCES LegoSet( id ),
+	FOREIGN KEY ( brick_id ) REFERENCES LegoBrick( id )
+);