diff --git a/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa.xml b/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa.xml index f2b020c..c88c096 100644 --- a/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa.xml +++ b/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa.xml @@ -3,15 +3,7 @@ mdy - 1||-9223372036854775808|c|G -1||10|c|G -1||10|C|G -1||10|T|G -4||-9223372036854775808|c|G -4||10|c|G -4||10|C|G -4||10|T|G - 763 + 783 15.0 1668829780 true ACDT @@ -798,7 +790,20 @@ false Zulu 1 + 11||10|C|G +11||-9223372036854775808|U|G +11||10|U|G +2200||6171|C|G +2200||-9223372036854775808|U|G +2200||6171|U|G +13471||10|C|G +13471||-9223372036854775808|U|G +13471||10|U|G + 783 16391 + sequence|table|16507|16508|1 +sequence|table|16535|16536|1 + sivacharan @@ -875,23 +880,4011 @@ false Zulu 1 postgres - + + block range index (BRIN) access method + 3580 + 1 + index + 335 + brinhandler + pg_catalog + + + b-tree index access method + 403 + 1 + index + 330 + bthandler + pg_catalog + + + GIN index access method + 2742 + 1 + index + 333 + ginhandler + pg_catalog + + + GiST index access method + 783 + 1 + index + 332 + gisthandler + pg_catalog + + + hash index access method + 405 + 1 + index + 331 + hashhandler + pg_catalog + + + heap table access method + 2 + 1 + table + 3 + heap_tableam_handler + pg_catalog + + + SP-GiST index access method + 4000 + 1 + index + 334 + spghandler + pg_catalog + + + explicit + function + 10035 + 1 + 2558 + int4 + pg_catalog + 16 + bool + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10201 + 1 + 2971 + text + pg_catalog + 16 + bool + pg_catalog + 1042 + bpchar + pg_catalog + + + assignment + function + 10191 + 1 + 2971 + text + pg_catalog + 16 + bool + pg_catalog + 25 + text + pg_catalog + + + assignment + function + 10196 + 1 + 2971 + text + pg_catalog + 16 + bool + pg_catalog + 1043 + varchar + pg_catalog + + + explicit + function + 10143 + 1 + 77 + int4 + pg_catalog + 18 + char + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10133 + 1 + 946 + text + pg_catalog + 18 + char + pg_catalog + 1043 + varchar + pg_catalog + + + implicit + function + 10131 + 1 + 946 + text + pg_catalog + 18 + char + pg_catalog + 25 + text + pg_catalog + + + assignment + function + 10132 + 1 + 860 + bpchar + pg_catalog + 18 + char + pg_catalog + 1042 + bpchar + pg_catalog + + + assignment + function + 10135 + 1 + 408 + bpchar + pg_catalog + 19 + name + pg_catalog + 1042 + bpchar + pg_catalog + + + implicit + function + 10134 + 1 + 406 + text + pg_catalog + 19 + name + pg_catalog + 25 + text + pg_catalog + + + assignment + function + 10136 + 1 + 1401 + varchar + pg_catalog + 19 + name + pg_catalog + 1043 + varchar + pg_catalog + + + implicit + function + 10090 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 2206 + regtype + pg_catalog + + + implicit + function + 10060 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 2203 + regoper + pg_catalog + + + implicit + function + 10003 + 1 + 482 + float8 + pg_catalog + 20 + int8 + pg_catalog + 701 + float8 + pg_catalog + + + implicit + function + 10069 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 2204 + regoperator + pg_catalog + + + assignment + function + 10001 + 1 + 480 + int4 + pg_catalog + 20 + int8 + pg_catalog + 23 + int4 + pg_catalog + + + implicit + function + 10044 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 24 + regproc + pg_catalog + + + implicit + function + 10113 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 4096 + regrole + pg_catalog + + + implicit + function + 10120 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 4089 + regnamespace + pg_catalog + + + implicit + function + 10002 + 1 + 652 + float4 + pg_catalog + 20 + int8 + pg_catalog + 700 + float4 + pg_catalog + + + implicit + function + 10104 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 3769 + regdictionary + pg_catalog + + + implicit + function + 10083 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 4191 + regcollation + pg_catalog + + + assignment + function + 10033 + 1 + 3812 + money + pg_catalog + 20 + int8 + pg_catalog + 790 + money + pg_catalog + + + implicit + function + 10037 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 26 + oid + pg_catalog + + + implicit + function + 10097 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 3734 + regconfig + pg_catalog + + + assignment + function + 10000 + 1 + 714 + int2 + pg_catalog + 20 + int8 + pg_catalog + 21 + int2 + pg_catalog + + + explicit + function + 10185 + 1 + 2075 + bit + pg_catalog + 20 + int8 + pg_catalog + 1560 + bit + pg_catalog + + + implicit + function + 10004 + 1 + 1781 + numeric + pg_catalog + 20 + int8 + pg_catalog + 1700 + numeric + pg_catalog + + + implicit + function + 10053 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 2202 + regprocedure + pg_catalog + + + implicit + function + 10076 + 1 + 1287 + oid + pg_catalog + 20 + int8 + pg_catalog + 2205 + regclass + pg_catalog + + + implicit + function + 10045 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 24 + regproc + pg_catalog + + + implicit + function + 10091 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 2206 + regtype + pg_catalog + + + implicit + function + 10084 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 4191 + regcollation + pg_catalog + + + implicit + function + 10070 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 2204 + regoperator + pg_catalog + + + implicit + function + 10038 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 26 + oid + pg_catalog + + + implicit + function + 10009 + 1 + 1782 + numeric + pg_catalog + 21 + int2 + pg_catalog + 1700 + numeric + pg_catalog + + + implicit + function + 10077 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 2205 + regclass + pg_catalog + + + implicit + function + 10006 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 23 + int4 + pg_catalog + + + implicit + function + 10054 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 2202 + regprocedure + pg_catalog + + + implicit + function + 10007 + 1 + 236 + float4 + pg_catalog + 21 + int2 + pg_catalog + 700 + float4 + pg_catalog + + + implicit + function + 10005 + 1 + 754 + int8 + pg_catalog + 21 + int2 + pg_catalog + 20 + int8 + pg_catalog + + + implicit + function + 10114 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 4096 + regrole + pg_catalog + + + implicit + function + 10008 + 1 + 235 + float8 + pg_catalog + 21 + int2 + pg_catalog + 701 + float8 + pg_catalog + + + implicit + function + 10105 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 3769 + regdictionary + pg_catalog + + + implicit + function + 10121 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 4089 + regnamespace + pg_catalog + + + implicit + function + 10061 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 2203 + regoper + pg_catalog + + + implicit + function + 10098 + 1 + 313 + int4 + pg_catalog + 21 + int2 + pg_catalog + 3734 + regconfig + pg_catalog + + + implicit + binary + 10078 + 1 + 23 + int4 + pg_catalog + 2205 + regclass + pg_catalog + + + implicit + binary + 10085 + 1 + 23 + int4 + pg_catalog + 4191 + regcollation + pg_catalog + + + implicit + binary + 10115 + 1 + 23 + int4 + pg_catalog + 4096 + regrole + pg_catalog + + + explicit + function + 10144 + 1 + 78 + char + pg_catalog + 23 + int4 + pg_catalog + 18 + char + pg_catalog + + + implicit + binary + 10122 + 1 + 23 + int4 + pg_catalog + 4089 + regnamespace + pg_catalog + + + implicit + function + 10010 + 1 + 481 + int8 + pg_catalog + 23 + int4 + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10106 + 1 + 23 + int4 + pg_catalog + 3769 + regdictionary + pg_catalog + + + implicit + binary + 10099 + 1 + 23 + int4 + pg_catalog + 3734 + regconfig + pg_catalog + + + assignment + function + 10011 + 1 + 314 + int2 + pg_catalog + 23 + int4 + pg_catalog + 21 + int2 + pg_catalog + + + implicit + binary + 10092 + 1 + 23 + int4 + pg_catalog + 2206 + regtype + pg_catalog + + + implicit + binary + 10071 + 1 + 23 + int4 + pg_catalog + 2204 + regoperator + pg_catalog + + + implicit + binary + 10062 + 1 + 23 + int4 + pg_catalog + 2203 + regoper + pg_catalog + + + implicit + binary + 10046 + 1 + 23 + int4 + pg_catalog + 24 + regproc + pg_catalog + + + implicit + binary + 10055 + 1 + 23 + int4 + pg_catalog + 2202 + regprocedure + pg_catalog + + + explicit + function + 10034 + 1 + 2557 + bool + pg_catalog + 23 + int4 + pg_catalog + 16 + bool + pg_catalog + + + implicit + function + 10014 + 1 + 1740 + numeric + pg_catalog + 23 + int4 + pg_catalog + 1700 + numeric + pg_catalog + + + implicit + binary + 10039 + 1 + 23 + int4 + pg_catalog + 26 + oid + pg_catalog + + + explicit + function + 10186 + 1 + 1683 + bit + pg_catalog + 23 + int4 + pg_catalog + 1560 + bit + pg_catalog + + + implicit + function + 10012 + 1 + 318 + float4 + pg_catalog + 23 + int4 + pg_catalog + 700 + float4 + pg_catalog + + + implicit + function + 10013 + 1 + 316 + float8 + pg_catalog + 23 + int4 + pg_catalog + 701 + float8 + pg_catalog + + + assignment + function + 10032 + 1 + 3811 + money + pg_catalog + 23 + int4 + pg_catalog + 790 + money + pg_catalog + + + assignment + binary + 10048 + 1 + 24 + regproc + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10047 + 1 + 1288 + int8 + pg_catalog + 24 + regproc + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10043 + 1 + 24 + regproc + pg_catalog + 26 + oid + pg_catalog + + + implicit + binary + 10049 + 1 + 24 + regproc + pg_catalog + 2202 + regprocedure + pg_catalog + + + implicit + binary + 10125 + 1 + 25 + text + pg_catalog + 1042 + bpchar + pg_catalog + + + implicit + function + 10140 + 1 + 407 + name + pg_catalog + 25 + text + pg_catalog + 19 + name + pg_catalog + + + assignment + function + 10137 + 1 + 944 + char + pg_catalog + 25 + text + pg_catalog + 18 + char + pg_catalog + + + implicit + binary + 10126 + 1 + 25 + text + pg_catalog + 1043 + varchar + pg_catalog + + + explicit + function + 10193 + 1 + 2896 + xml + pg_catalog + 25 + text + pg_catalog + 142 + xml + pg_catalog + + + implicit + function + 10109 + 1 + 1079 + regclass + pg_catalog + 25 + text + pg_catalog + 2205 + regclass + pg_catalog + + + implicit + binary + 10074 + 1 + 26 + oid + pg_catalog + 2205 + regclass + pg_catalog + + + implicit + binary + 10051 + 1 + 26 + oid + pg_catalog + 2202 + regprocedure + pg_catalog + + + implicit + binary + 10095 + 1 + 26 + oid + pg_catalog + 3734 + regconfig + pg_catalog + + + implicit + binary + 10058 + 1 + 26 + oid + pg_catalog + 2203 + regoper + pg_catalog + + + implicit + binary + 10081 + 1 + 26 + oid + pg_catalog + 4191 + regcollation + pg_catalog + + + implicit + binary + 10067 + 1 + 26 + oid + pg_catalog + 2204 + regoperator + pg_catalog + + + implicit + binary + 10042 + 1 + 26 + oid + pg_catalog + 24 + regproc + pg_catalog + + + assignment + function + 10040 + 1 + 1288 + int8 + pg_catalog + 26 + oid + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10111 + 1 + 26 + oid + pg_catalog + 4096 + regrole + pg_catalog + + + implicit + binary + 10102 + 1 + 26 + oid + pg_catalog + 3769 + regdictionary + pg_catalog + + + implicit + binary + 10088 + 1 + 26 + oid + pg_catalog + 2206 + regtype + pg_catalog + + + assignment + binary + 10041 + 1 + 26 + oid + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10118 + 1 + 26 + oid + pg_catalog + 4089 + regnamespace + pg_catalog + + + assignment + io + 10214 + 1 + 114 + json + pg_catalog + 3802 + jsonb + pg_catalog + + + assignment + binary + 10202 + 1 + 142 + xml + pg_catalog + 1042 + bpchar + pg_catalog + + + assignment + binary + 10197 + 1 + 142 + xml + pg_catalog + 1043 + varchar + pg_catalog + + + assignment + binary + 10192 + 1 + 142 + xml + pg_catalog + 25 + text + pg_catalog + + + implicit + binary + 10145 + 1 + 194 + pg_node_tree + pg_catalog + 25 + text + pg_catalog + + + assignment + function + 10165 + 1 + 4091 + box + pg_catalog + 600 + point + pg_catalog + 603 + box + pg_catalog + + + explicit + function + 10166 + 1 + 1532 + point + pg_catalog + 601 + lseg + pg_catalog + 600 + point + pg_catalog + + + assignment + function + 10167 + 1 + 1449 + polygon + pg_catalog + 602 + path + pg_catalog + 604 + polygon + pg_catalog + + + explicit + function + 10168 + 1 + 1534 + point + pg_catalog + 603 + box + pg_catalog + 600 + point + pg_catalog + + + explicit + function + 10171 + 1 + 1479 + circle + pg_catalog + 603 + box + pg_catalog + 718 + circle + pg_catalog + + + explicit + function + 10169 + 1 + 1541 + lseg + pg_catalog + 603 + box + pg_catalog + 601 + lseg + pg_catalog + + + assignment + function + 10170 + 1 + 1448 + polygon + pg_catalog + 603 + box + pg_catalog + 604 + polygon + pg_catalog + + + explicit + function + 10172 + 1 + 1540 + point + pg_catalog + 604 + polygon + pg_catalog + 600 + point + pg_catalog + + + explicit + function + 10175 + 1 + 1474 + circle + pg_catalog + 604 + polygon + pg_catalog + 718 + circle + pg_catalog + + + explicit + function + 10174 + 1 + 1446 + box + pg_catalog + 604 + polygon + pg_catalog + 603 + box + pg_catalog + + + assignment + function + 10173 + 1 + 1447 + path + pg_catalog + 604 + polygon + pg_catalog + 602 + path + pg_catalog + + + assignment + function + 10194 + 1 + 730 + text + pg_catalog + 650 + cidr + pg_catalog + 1043 + varchar + pg_catalog + + + assignment + function + 10199 + 1 + 730 + text + pg_catalog + 650 + cidr + pg_catalog + 1042 + bpchar + pg_catalog + + + assignment + function + 10189 + 1 + 730 + text + pg_catalog + 650 + cidr + pg_catalog + 25 + text + pg_catalog + + + implicit + binary + 10181 + 1 + 650 + cidr + pg_catalog + 869 + inet + pg_catalog + + + assignment + function + 10016 + 1 + 238 + int2 + pg_catalog + 700 + float4 + pg_catalog + 21 + int2 + pg_catalog + + + assignment + function + 10015 + 1 + 653 + int8 + pg_catalog + 700 + float4 + pg_catalog + 20 + int8 + pg_catalog + + + implicit + function + 10018 + 1 + 311 + float8 + pg_catalog + 700 + float4 + pg_catalog + 701 + float8 + pg_catalog + + + assignment + function + 10019 + 1 + 1742 + numeric + pg_catalog + 700 + float4 + pg_catalog + 1700 + numeric + pg_catalog + + + assignment + function + 10017 + 1 + 319 + int4 + pg_catalog + 700 + float4 + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10024 + 1 + 1743 + numeric + pg_catalog + 701 + float8 + pg_catalog + 1700 + numeric + pg_catalog + + + assignment + function + 10020 + 1 + 483 + int8 + pg_catalog + 701 + float8 + pg_catalog + 20 + int8 + pg_catalog + + + assignment + function + 10021 + 1 + 237 + int2 + pg_catalog + 701 + float8 + pg_catalog + 21 + int2 + pg_catalog + + + assignment + function + 10022 + 1 + 317 + int4 + pg_catalog + 701 + float8 + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10023 + 1 + 312 + float4 + pg_catalog + 701 + float8 + pg_catalog + 700 + float4 + pg_catalog + + + explicit + function + 10178 + 1 + 1544 + polygon + pg_catalog + 718 + circle + pg_catalog + 604 + polygon + pg_catalog + + + explicit + function + 10176 + 1 + 1416 + point + pg_catalog + 718 + circle + pg_catalog + 600 + point + pg_catalog + + + explicit + function + 10177 + 1 + 1480 + box + pg_catalog + 718 + circle + pg_catalog + 603 + box + pg_catalog + + + implicit + function + 10180 + 1 + 4124 + macaddr + pg_catalog + 774 + macaddr8 + pg_catalog + 829 + macaddr + pg_catalog + + + assignment + function + 10030 + 1 + 3823 + numeric + pg_catalog + 790 + money + pg_catalog + 1700 + numeric + pg_catalog + + + implicit + function + 10179 + 1 + 4123 + macaddr8 + pg_catalog + 829 + macaddr + pg_catalog + 774 + macaddr8 + pg_catalog + + + assignment + function + 10195 + 1 + 730 + text + pg_catalog + 869 + inet + pg_catalog + 1043 + varchar + pg_catalog + + + assignment + function + 10190 + 1 + 730 + text + pg_catalog + 869 + inet + pg_catalog + 25 + text + pg_catalog + + + assignment + function + 10182 + 1 + 1715 + cidr + pg_catalog + 869 + inet + pg_catalog + 650 + cidr + pg_catalog + + + assignment + function + 10200 + 1 + 730 + text + pg_catalog + 869 + inet + pg_catalog + 1042 + bpchar + pg_catalog + + + implicit + function + 10204 + 1 + 668 + bpchar + pg_catalog + 1042 + bpchar + pg_catalog + 1042 + bpchar + pg_catalog + + + implicit + function + 10128 + 1 + 401 + text + pg_catalog + 1042 + bpchar + pg_catalog + 1043 + varchar + pg_catalog + + + explicit + function + 10203 + 1 + 2896 + xml + pg_catalog + 1042 + bpchar + pg_catalog + 142 + xml + pg_catalog + + + implicit + function + 10127 + 1 + 401 + text + pg_catalog + 1042 + bpchar + pg_catalog + 25 + text + pg_catalog + + + assignment + function + 10138 + 1 + 944 + char + pg_catalog + 1042 + bpchar + pg_catalog + 18 + char + pg_catalog + + + implicit + function + 10141 + 1 + 409 + name + pg_catalog + 1042 + bpchar + pg_catalog + 19 + name + pg_catalog + + + implicit + binary + 10129 + 1 + 1043 + varchar + pg_catalog + 25 + text + pg_catalog + + + implicit + function + 10142 + 1 + 1400 + name + pg_catalog + 1043 + varchar + pg_catalog + 19 + name + pg_catalog + + + implicit + binary + 10130 + 1 + 1043 + varchar + pg_catalog + 1042 + bpchar + pg_catalog + + + explicit + function + 10198 + 1 + 2896 + xml + pg_catalog + 1043 + varchar + pg_catalog + 142 + xml + pg_catalog + + + implicit + function + 10110 + 1 + 1079 + regclass + pg_catalog + 1043 + varchar + pg_catalog + 2205 + regclass + pg_catalog + + + implicit + function + 10205 + 1 + 669 + varchar + pg_catalog + 1043 + varchar + pg_catalog + 1043 + varchar + pg_catalog + + + assignment + function + 10139 + 1 + 944 + char + pg_catalog + 1043 + varchar + pg_catalog + 18 + char + pg_catalog + + + implicit + function + 10152 + 1 + 2024 + timestamp + pg_catalog + 1082 + date + pg_catalog + 1114 + timestamp + pg_catalog + + + implicit + function + 10153 + 1 + 1174 + timestamptz + pg_catalog + 1082 + date + pg_catalog + 1184 + timestamptz + pg_catalog + + + implicit + function + 10206 + 1 + 1968 + time + pg_catalog + 1083 + time + pg_catalog + 1083 + time + pg_catalog + + + implicit + function + 10155 + 1 + 2047 + timetz + pg_catalog + 1083 + time + pg_catalog + 1266 + timetz + pg_catalog + + + implicit + function + 10154 + 1 + 1370 + interval + pg_catalog + 1083 + time + pg_catalog + 1186 + interval + pg_catalog + + + implicit + function + 10158 + 1 + 2028 + timestamptz + pg_catalog + 1114 + timestamp + pg_catalog + 1184 + timestamptz + pg_catalog + + + assignment + function + 10156 + 1 + 2029 + date + pg_catalog + 1114 + timestamp + pg_catalog + 1082 + date + pg_catalog + + + assignment + function + 10157 + 1 + 1316 + time + pg_catalog + 1114 + timestamp + pg_catalog + 1083 + time + pg_catalog + + + implicit + function + 10207 + 1 + 1961 + timestamp + pg_catalog + 1114 + timestamp + pg_catalog + 1114 + timestamp + pg_catalog + + + assignment + function + 10159 + 1 + 1178 + date + pg_catalog + 1184 + timestamptz + pg_catalog + 1082 + date + pg_catalog + + + assignment + function + 10162 + 1 + 1388 + timetz + pg_catalog + 1184 + timestamptz + pg_catalog + 1266 + timetz + pg_catalog + + + assignment + function + 10160 + 1 + 2019 + time + pg_catalog + 1184 + timestamptz + pg_catalog + 1083 + time + pg_catalog + + + assignment + function + 10161 + 1 + 2027 + timestamp + pg_catalog + 1184 + timestamptz + pg_catalog + 1114 + timestamp + pg_catalog + + + implicit + function + 10208 + 1 + 1967 + timestamptz + pg_catalog + 1184 + timestamptz + pg_catalog + 1184 + timestamptz + pg_catalog + + + implicit + function + 10209 + 1 + 1200 + interval + pg_catalog + 1186 + interval + pg_catalog + 1186 + interval + pg_catalog + + + assignment + function + 10163 + 1 + 1419 + time + pg_catalog + 1186 + interval + pg_catalog + 1083 + time + pg_catalog + + + assignment + function + 10164 + 1 + 2046 + time + pg_catalog + 1266 + timetz + pg_catalog + 1083 + time + pg_catalog + + + implicit + function + 10210 + 1 + 1969 + timetz + pg_catalog + 1266 + timetz + pg_catalog + 1266 + timetz + pg_catalog + + + explicit + function + 10187 + 1 + 2076 + int8 + pg_catalog + 1560 + bit + pg_catalog + 20 + int8 + pg_catalog + + + implicit + function + 10211 + 1 + 1685 + bit + pg_catalog + 1560 + bit + pg_catalog + 1560 + bit + pg_catalog + + + implicit + binary + 10183 + 1 + 1560 + bit + pg_catalog + 1562 + varbit + pg_catalog + + + explicit + function + 10188 + 1 + 1684 + int4 + pg_catalog + 1560 + bit + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10184 + 1 + 1562 + varbit + pg_catalog + 1560 + bit + pg_catalog + + + implicit + function + 10212 + 1 + 1687 + varbit + pg_catalog + 1562 + varbit + pg_catalog + 1562 + varbit + pg_catalog + + + assignment + function + 10025 + 1 + 1779 + int8 + pg_catalog + 1700 + numeric + pg_catalog + 20 + int8 + pg_catalog + + + assignment + function + 10026 + 1 + 1783 + int2 + pg_catalog + 1700 + numeric + pg_catalog + 21 + int2 + pg_catalog + + + assignment + function + 10027 + 1 + 1744 + int4 + pg_catalog + 1700 + numeric + pg_catalog + 23 + int4 + pg_catalog + + + implicit + function + 10213 + 1 + 1703 + numeric + pg_catalog + 1700 + numeric + pg_catalog + 1700 + numeric + pg_catalog + + + implicit + function + 10029 + 1 + 1746 + float8 + pg_catalog + 1700 + numeric + pg_catalog + 701 + float8 + pg_catalog + + + assignment + function + 10031 + 1 + 3824 + money + pg_catalog + 1700 + numeric + pg_catalog + 790 + money + pg_catalog + + + implicit + function + 10028 + 1 + 1745 + float4 + pg_catalog + 1700 + numeric + pg_catalog + 700 + float4 + pg_catalog + + + assignment + binary + 10057 + 1 + 2202 + regprocedure + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10052 + 1 + 2202 + regprocedure + pg_catalog + 26 + oid + pg_catalog + + + assignment + function + 10056 + 1 + 1288 + int8 + pg_catalog + 2202 + regprocedure + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10050 + 1 + 2202 + regprocedure + pg_catalog + 24 + regproc + pg_catalog + + + implicit + binary + 10065 + 1 + 2203 + regoper + pg_catalog + 2204 + regoperator + pg_catalog + + + assignment + function + 10063 + 1 + 1288 + int8 + pg_catalog + 2203 + regoper + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10059 + 1 + 2203 + regoper + pg_catalog + 26 + oid + pg_catalog + + + assignment + binary + 10064 + 1 + 2203 + regoper + pg_catalog + 23 + int4 + pg_catalog + + + assignment + binary + 10073 + 1 + 2204 + regoperator + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10068 + 1 + 2204 + regoperator + pg_catalog + 26 + oid + pg_catalog + + + assignment + function + 10072 + 1 + 1288 + int8 + pg_catalog + 2204 + regoperator + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10066 + 1 + 2204 + regoperator + pg_catalog + 2203 + regoper + pg_catalog + + + assignment + function + 10079 + 1 + 1288 + int8 + pg_catalog + 2205 + regclass + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10075 + 1 + 2205 + regclass + pg_catalog + 26 + oid + pg_catalog + + + assignment + binary + 10080 + 1 + 2205 + regclass + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10093 + 1 + 1288 + int8 + pg_catalog + 2206 + regtype + pg_catalog + 20 + int8 + pg_catalog + + + assignment + binary + 10094 + 1 + 2206 + regtype + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10089 + 1 + 2206 + regtype + pg_catalog + 26 + oid + pg_catalog + + + implicit + binary + 10146 + 1 + 3361 + pg_ndistinct + pg_catalog + 17 + bytea + pg_catalog + + + implicit + io + 10147 + 1 + 3361 + pg_ndistinct + pg_catalog + 25 + text + pg_catalog + + + implicit + binary + 10148 + 1 + 3402 + pg_dependencies + pg_catalog + 17 + bytea + pg_catalog + + + implicit + io + 10149 + 1 + 3402 + pg_dependencies + pg_catalog + 25 + text + pg_catalog + + + implicit + binary + 10096 + 1 + 3734 + regconfig + pg_catalog + 26 + oid + pg_catalog + + + assignment + function + 10100 + 1 + 1288 + int8 + pg_catalog + 3734 + regconfig + pg_catalog + 20 + int8 + pg_catalog + + + assignment + binary + 10101 + 1 + 3734 + regconfig + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10103 + 1 + 3769 + regdictionary + pg_catalog + 26 + oid + pg_catalog + + + assignment + binary + 10108 + 1 + 3769 + regdictionary + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10107 + 1 + 1288 + int8 + pg_catalog + 3769 + regdictionary + pg_catalog + 20 + int8 + pg_catalog + + + assignment + io + 10215 + 1 + 3802 + jsonb + pg_catalog + 114 + json + pg_catalog + + + explicit + function + 10218 + 1 + 3450 + int2 + pg_catalog + 3802 + jsonb + pg_catalog + 21 + int2 + pg_catalog + + + explicit + function + 10220 + 1 + 3452 + int8 + pg_catalog + 3802 + jsonb + pg_catalog + 20 + int8 + pg_catalog + + + explicit + function + 10219 + 1 + 3451 + int4 + pg_catalog + 3802 + jsonb + pg_catalog + 23 + int4 + pg_catalog + + + explicit + function + 10216 + 1 + 3556 + bool + pg_catalog + 3802 + jsonb + pg_catalog + 16 + bool + pg_catalog + + + explicit + function + 10221 + 1 + 3453 + float4 + pg_catalog + 3802 + jsonb + pg_catalog + 700 + float4 + pg_catalog + + + explicit + function + 10217 + 1 + 3449 + numeric + pg_catalog + 3802 + jsonb + pg_catalog + 1700 + numeric + pg_catalog + + + explicit + function + 10222 + 1 + 2580 + float8 + pg_catalog + 3802 + jsonb + pg_catalog + 701 + float8 + pg_catalog + + + explicit + function + 10223 + 1 + 4281 + int4multirange + pg_catalog + 3904 + int4range + pg_catalog + 4451 + int4multirange + pg_catalog + + + explicit + function + 10225 + 1 + 4284 + nummultirange + pg_catalog + 3906 + numrange + pg_catalog + 4532 + nummultirange + pg_catalog + + + explicit + function + 10227 + 1 + 4287 + tsmultirange + pg_catalog + 3908 + tsrange + pg_catalog + 4533 + tsmultirange + pg_catalog + + + explicit + function + 10228 + 1 + 4290 + tstzmultirange + pg_catalog + 3910 + tstzrange + pg_catalog + 4534 + tstzmultirange + pg_catalog + + + explicit + function + 10226 + 1 + 4293 + datemultirange + pg_catalog + 3912 + daterange + pg_catalog + 4535 + datemultirange + pg_catalog + + + explicit + function + 10224 + 1 + 4296 + int8multirange + pg_catalog + 3926 + int8range + pg_catalog + 4536 + int8multirange + pg_catalog + + + assignment + binary + 10124 + 1 + 4089 + regnamespace + pg_catalog + 23 + int4 + pg_catalog + + + assignment + function + 10123 + 1 + 1288 + int8 + pg_catalog + 4089 + regnamespace + pg_catalog + 20 + int8 + pg_catalog + + + implicit + binary + 10119 + 1 + 4089 + regnamespace + pg_catalog + 26 + oid + pg_catalog + + + assignment + binary + 10117 + 1 + 4096 + regrole + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10112 + 1 + 4096 + regrole + pg_catalog + 26 + oid + pg_catalog + + + assignment + function + 10116 + 1 + 1288 + int8 + pg_catalog + 4096 + regrole + pg_catalog + 20 + int8 + pg_catalog + + + assignment + function + 10086 + 1 + 1288 + int8 + pg_catalog + 4191 + regcollation + pg_catalog + 20 + int8 + pg_catalog + + + assignment + binary + 10087 + 1 + 4191 + regcollation + pg_catalog + 23 + int4 + pg_catalog + + + implicit + binary + 10082 + 1 + 4191 + regcollation + pg_catalog + 26 + oid + pg_catalog + + + implicit + binary + 10150 + 1 + 5017 + pg_mcv_list + pg_catalog + 17 + bytea + pg_catalog + + + implicit + io + 10151 + 1 + 5017 + pg_mcv_list + pg_catalog + 25 + text + pg_catalog + + + explicit + function + 10036 + 1 + 5071 + xid + pg_catalog + 5069 + xid8 + pg_catalog + 28 + xid + pg_catalog + + + PL/pgSQL procedural language + 13823 + 677 + 1.0 + 11 + pg_catalog + + + dynamically-loaded C functions + 13 + 1 + fmgr_c_validator + pg_catalog + + + built-in functions + 12 + 1 + fmgr_internal_validator + pg_catalog + + + PL/pgSQL procedural language + plpgsql_call_handler + pg_catalog + plpgsql_inline_handler + pg_catalog + 13827 + 677 + 1 + plpgsql_validator + pg_catalog + + + SQL-language functions + 14 + 1 + 1 + fmgr_sql_validator + pg_catalog + + 13471 523 postgres - + system catalog schema 11 517 postgres - + standard public schema 1 + 783 2200 517 pg_database_owner + + bigint|0s + 16535 + 779 + sivacharan + + + bigint|0s + 16507 + 778 + sivacharan + + + 16516 + 779 + 2 + sivacharan +
+ + 16536 + 779 + 2 + sivacharan +
+ + 16508 + 779 + 2 + sivacharan +
+ + 16544 + 779 + 2 + sivacharan +
+ + 16528 + 779 + 2 + sivacharan +
+ + 16523 + 779 + 2 + sivacharan +
+ + 16558 + 779 + 2 + sivacharan +
+ + 16551 + 779 + 2 + sivacharan +
+ + 16570 + 779 + 2 + sivacharan +
+ + 16563 + 779 + 2 + sivacharan +
+ + integer|0s + 1 + 1 + 779 + 23 + + + varchar|0s + 1 + 2 + 779 + 1043 + + + double precision|0s + 1 + 3 + 779 + 701 + + + id + 16521 + 1 + 779 + 1 + 403 + + + 16522 + 1 + 779 + 16521 + + + integer|0s + nextval('addresses_id_seq'::regclass) + 1 + 1 + 779 + 23 + + + varchar|0s + 2 + 779 + 1043 + + + varchar|0s + 3 + 779 + 1043 + + + integer|0s + 4 + 779 + 23 + + + varchar|0s + 5 + 779 + 1043 + + + varchar|0s + 6 + 779 + 1043 + + + id + 16542 + 1 + 779 + 1 + 403 + + + 16543 + 1 + 779 + 16542 + + + integer|0s + nextval('appointments_id_seq'::regclass) + 1 + 1 + 779 + 23 + + + timestamp|0s + 1 + 2 + 779 + 1114 + + + timestamp|0s + 1 + 3 + 779 + 1114 + + + integer|0s + 1 + 4 + 779 + 23 + + + integer|0s + 1 + 5 + 779 + 23 + + + varchar|0s + 6 + 779 + 1043 + + + id + 16514 + 1 + 779 + 1 + 403 + + + 16515 + 1 + 779 + 16514 + + + integer|0s + 1 + 1 + 779 + 23 + + + varchar|0s + 1 + 2 + 779 + 1043 + + + varchar|0s + 3 + 779 + 1043 + + + date|0s + 4 + 779 + 1082 + + + varchar|0s + 5 + 779 + 1043 + + + integer|0s + 1 + 6 + 779 + 23 + + + addressid + 16597 + id + 1 + 779 + 16536 + addresses + table + + + id + 16549 + 1 + 779 + 1 + 403 + + + 16550 + 1 + 779 + 16549 + + + integer|0s + 1 + 1 + 779 + 23 + + + double precision|0s + 2 + 779 + 701 + + + double precision|0s + 3 + 779 + 701 + + + varchar|0s + 4 + 779 + 1043 + + + date|0s + 5 + 779 + 1082 + + + date|0s + 6 + 779 + 1082 + + + id + 16533 + 1 + 779 + 1 + 403 + + + 16534 + 1 + 779 + 16533 + + + integer|0s + 1 + 1 + 779 + 23 + + + date|0s + 1 + 2 + 779 + 1082 + + + double precision|0s + 1 + 3 + 779 + 701 + + + integer|0s + 1 + 4 + 779 + 23 + + + activityid + 16582 + id + 1 + 779 + 16516 + activities + table + + + id + 16526 + 1 + 779 + 1 + 403 + + + 16527 + 1 + 779 + 16526 + + + integer|0s + 1 + 1 + 779 + 23 + + + integer|0s + 1 + 2 + 779 + 23 + + + integer|0s + 1 + 3 + 779 + 23 + + + integer|0s + 1 + 4 + 779 + 23 + + + integer|0s + 1 + 5 + 779 + 23 + + + activityid + 16587 + id + 1 + 779 + 16516 + activities + table + + + appointmentid + 16577 + id + 1 + 779 + 16508 + appointments + table + + + orderid + 16617 + id + 1 + 779 + 16551 + orders + table + + + id + 16561 + 1 + 779 + 1 + 403 + + + 16562 + 1 + 779 + 16561 + + + integer|0s + 1 + 1 + 779 + 23 + + + date|0s + 1 + 2 + 779 + 1082 + + + time|0s + 1 + 3 + 779 + 1083 + + + integer|0s + 1 + 4 + 779 + 23 + + + double precision|0s + 1 + 5 + 779 + 701 + + + varchar|0s + 1 + 6 + 779 + 1043 + + + integer|0s + 1 + 7 + 779 + 23 + + + customerid + 16602 + id + 1 + 779 + 16544 + customers + table + + + discountschemeid + 16592 + id + 1 + 779 + 16528 + discountscheme + table + + + id + 16556 + 1 + 779 + 1 + 403 + + + 16557 + 1 + 779 + 16556 + + + integer|0s + 1 + 1 + 779 + 23 + + + varchar|0s + 1 + 2 + 779 + 1043 + + + varchar|0s + 1 + 3 + 779 + 1043 + + + varchar|0s + 1 + 4 + 779 + 1043 + + + id + 16612 + id + 1 + 779 + 16544 + customers + table + + + id + 16575 + 1 + 779 + 1 + 403 + + + 16576 + 1 + 779 + 16575 + + + integer|0s + 1 + 1 + 779 + 23 + + + date|0s + 1 + 2 + 779 + 1082 + + + varchar|0s + 1 + 3 + 779 + 1043 + + + varchar|0s + 1 + 4 + 779 + 1043 + + + date|0s + 1 + 5 + 779 + 1082 + + + id + 16607 + id + 1 + 779 + 16544 + customers + table + + + id + 16568 + 1 + 779 + 1 + 403 + + + 16569 + 1 + 779 + 16568 +
\ No newline at end of file diff --git a/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa/storage_v2/_src_/database/brcm.ukQuAA/schema/public.abK9xQ.meta b/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa/storage_v2/_src_/database/brcm.ukQuAA/schema/public.abK9xQ.meta new file mode 100644 index 0000000..43359d6 --- /dev/null +++ b/brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa/storage_v2/_src_/database/brcm.ukQuAA/schema/public.abK9xQ.meta @@ -0,0 +1,2 @@ +#n:public +! [783, 0, null, null, -2147483648, -2147483648] diff --git a/brcm/.idea/jpa-buddy.xml b/brcm/.idea/jpa-buddy.xml index ae36f18..22b36ed 100644 --- a/brcm/.idea/jpa-buddy.xml +++ b/brcm/.idea/jpa-buddy.xml @@ -1,8 +1,9 @@ + \ No newline at end of file diff --git a/brcm/core/pom.xml b/brcm/core/pom.xml index fa9bbfa..902d2d6 100644 --- a/brcm/core/pom.xml +++ b/brcm/core/pom.xml @@ -79,5 +79,15 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + diff --git a/brcm/core/src/main/java/dtos/AppointmentDto.java b/brcm/core/src/main/java/dtos/AppointmentDto.java index 95835fc..742a56a 100644 --- a/brcm/core/src/main/java/dtos/AppointmentDto.java +++ b/brcm/core/src/main/java/dtos/AppointmentDto.java @@ -12,13 +12,15 @@ public class AppointmentDto implements Serializable { private final Instant endtime; private final Integer activityid; private final Integer customerid; + private final String status; - public AppointmentDto(Integer id, Instant starttime, Instant endtime, Integer activityid, Integer customerid) { + public AppointmentDto(Integer id, Instant starttime, Instant endtime, Integer activityid, Integer customerid, String status) { this.id = id; this.starttime = starttime; this.endtime = endtime; this.activityid = activityid; this.customerid = customerid; + this.status = status; } public Integer getId() { @@ -40,4 +42,6 @@ public class AppointmentDto implements Serializable { public Integer getCustomerid() { return customerid; } + + public String getStatus() { return status; } } \ No newline at end of file diff --git a/brcm/core/src/main/java/dtos/LineitemDto.java b/brcm/core/src/main/java/dtos/LineitemDto.java index 0230da7..93d5492 100644 --- a/brcm/core/src/main/java/dtos/LineitemDto.java +++ b/brcm/core/src/main/java/dtos/LineitemDto.java @@ -1,7 +1,5 @@ package dtos; -import entities.Lineitem; - import java.io.Serializable; /** diff --git a/brcm/core/src/main/java/dtos/OrderDto.java b/brcm/core/src/main/java/dtos/OrderDto.java index 7d57650..d1ff14a 100644 --- a/brcm/core/src/main/java/dtos/OrderDto.java +++ b/brcm/core/src/main/java/dtos/OrderDto.java @@ -1,10 +1,10 @@ package dtos; -import entities.Order; - import java.io.Serializable; import java.time.LocalDate; import java.time.LocalTime; +import java.util.ArrayList; +import java.util.List; /** * A DTO for the {@link Order} entity @@ -16,14 +16,30 @@ public class OrderDto implements Serializable { private final Double discountapplied; private final String totalprice; + private final List lineitems; + public OrderDto(Integer id, LocalDate date, LocalTime time, Double discountapplied, String totalprice) { this.id = id; this.date = date; this.time = time; this.discountapplied = discountapplied; this.totalprice = totalprice; + this.lineitems = new ArrayList(); + } + public void addLineItem(LineitemDto lineitem){ + this.lineitems.add(lineitem); + } + public void deleteLineItem(int id){ + LineitemDto objToRemove = null; + for (LineitemDto lineitem : this.lineitems) { + if (lineitem.getId() == id) { + objToRemove = lineitem; + } + } + if(objToRemove != null){ + this.lineitems.remove(objToRemove); + } } - public Integer getId() { return id; } diff --git a/brcm/core/src/main/java/dtos/ProfessorDto.java b/brcm/core/src/main/java/dtos/ProfessorDto.java index 0423716..6f802c5 100644 --- a/brcm/core/src/main/java/dtos/ProfessorDto.java +++ b/brcm/core/src/main/java/dtos/ProfessorDto.java @@ -1,19 +1,19 @@ package dtos; -import entities.Professor; - import java.io.Serializable; +import java.time.LocalDate; /** * A DTO for the {@link Professor} entity */ -public class ProfessorDto implements Serializable { +public class ProfessorDto extends CustomerDto implements Serializable { private final Integer id; private final String department; private final String office; private final String research; - public ProfessorDto(Integer id, String department, String office, String research) { + public ProfessorDto(Integer id, String department, String office, String research, String firstname, String lastname, LocalDate dateofbirth, String phone) { + super(id, firstname, lastname, dateofbirth, phone); this.id = id; this.department = department; this.office = office; diff --git a/brcm/core/src/main/java/dtos/StudentDto.java b/brcm/core/src/main/java/dtos/StudentDto.java index 3a3679b..3c272d2 100644 --- a/brcm/core/src/main/java/dtos/StudentDto.java +++ b/brcm/core/src/main/java/dtos/StudentDto.java @@ -1,21 +1,20 @@ package dtos; -import entities.Student; - import java.io.Serializable; import java.time.LocalDate; /** * A DTO for the {@link Student} entity */ -public class StudentDto implements Serializable { +public class StudentDto extends CustomerDto implements Serializable { private final Integer id; private final LocalDate enterdate; private final String major; private final String minor; private final LocalDate graddate; - public StudentDto(Integer id, LocalDate enterdate, String major, String minor, LocalDate graddate) { + public StudentDto(Integer id, LocalDate enterdate, String major, String minor, LocalDate graddate, String firstname, String lastname, LocalDate dateofbirth, String phone) { + super(id, firstname, lastname, dateofbirth, phone); this.id = id; this.enterdate = enterdate; this.major = major; diff --git a/brcm/core/src/main/java/entities/Address.java b/brcm/core/src/main/java/entities/Address.java index d985f24..e22afbb 100644 --- a/brcm/core/src/main/java/entities/Address.java +++ b/brcm/core/src/main/java/entities/Address.java @@ -10,22 +10,22 @@ public class Address { private Integer id; @Lob - @Column(name = "street", nullable = false) + @Column(name = "street") private String street; @Lob - @Column(name = "number", nullable = false) + @Column(name = "number") private String number; - @Column(name = "zipcode", nullable = false) + @Column(name = "zipcode") private Integer zipcode; @Lob - @Column(name = "city", nullable = false) + @Column(name = "city") private String city; @Lob - @Column(name = "state", nullable = false) + @Column(name = "state") private String state; public Integer getId() { diff --git a/brcm/core/src/main/java/entities/Appointment.java b/brcm/core/src/main/java/entities/Appointment.java index 8b98c1e..e3aeeec 100644 --- a/brcm/core/src/main/java/entities/Appointment.java +++ b/brcm/core/src/main/java/entities/Appointment.java @@ -1,9 +1,6 @@ package entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import java.time.Instant; @Entity @@ -25,6 +22,10 @@ public class Appointment { @Column(name = "customerid", nullable = false) private Integer customerid; + @Lob + @Column(name = "status") + private String status; + public Integer getId() { return id; } @@ -65,4 +66,12 @@ public class Appointment { this.customerid = customerid; } + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + } \ No newline at end of file diff --git a/brcm/core/src/main/java/entities/Customer.java b/brcm/core/src/main/java/entities/Customer.java index af5f8d1..9ed0852 100644 --- a/brcm/core/src/main/java/entities/Customer.java +++ b/brcm/core/src/main/java/entities/Customer.java @@ -15,14 +15,14 @@ public class Customer { private String firstname; @Lob - @Column(name = "lastname", nullable = false) + @Column(name = "lastname") private String lastname; - @Column(name = "dateofbirth", nullable = false) + @Column(name = "dateofbirth") private LocalDate dateofbirth; @Lob - @Column(name = "phone", nullable = false) + @Column(name = "phone") private String phone; @ManyToOne(fetch = FetchType.LAZY, optional = false) diff --git a/brcm/core/src/main/java/entities/Discountscheme.java b/brcm/core/src/main/java/entities/Discountscheme.java index ac773fa..17418f7 100644 --- a/brcm/core/src/main/java/entities/Discountscheme.java +++ b/brcm/core/src/main/java/entities/Discountscheme.java @@ -10,20 +10,20 @@ public class Discountscheme { @Column(name = "id", nullable = false) private Integer id; - @Column(name = "pricediscount", nullable = false) + @Column(name = "pricediscount") private Double pricediscount; - @Column(name = "percentdiscount", nullable = false) + @Column(name = "percentdiscount") private Double percentdiscount; @Lob - @Column(name = "customertype", nullable = false) + @Column(name = "customertype") private String customertype; - @Column(name = "startdate", nullable = false) + @Column(name = "startdate") private LocalDate startdate; - @Column(name = "enddate", nullable = false) + @Column(name = "enddate") private LocalDate enddate; public Integer getId() { diff --git a/brcm/core/src/main/java/entities/Professor.java b/brcm/core/src/main/java/entities/Professor.java index 856023c..598d11b 100644 --- a/brcm/core/src/main/java/entities/Professor.java +++ b/brcm/core/src/main/java/entities/Professor.java @@ -12,7 +12,7 @@ public class Professor { @MapsId @OneToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "id", nullable = false) - private Customer customers; + private Customer customer; @Lob @Column(name = "department", nullable = false) @@ -34,12 +34,12 @@ public class Professor { this.id = id; } - public Customer getCustomers() { - return customers; + public Customer getCustomer() { + return customer; } - public void setCustomers(Customer customers) { - this.customers = customers; + public void setCustomer(Customer customer) { + this.customer = customer; } public String getDepartment() { diff --git a/brcm/core/src/main/java/entities/Student.java b/brcm/core/src/main/java/entities/Student.java index 6795eaf..34e2a0e 100644 --- a/brcm/core/src/main/java/entities/Student.java +++ b/brcm/core/src/main/java/entities/Student.java @@ -13,7 +13,7 @@ public class Student { @MapsId @OneToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "id", nullable = false) - private Customer customers; + private Customer customer; @Column(name = "enterdate", nullable = false) private LocalDate enterdate; @@ -37,12 +37,12 @@ public class Student { this.id = id; } - public Customer getCustomers() { - return customers; + public Customer getCustomer() { + return customer; } - public void setCustomers(Customer customers) { - this.customers = customers; + public void setCustomer(Customer customer) { + this.customer = customer; } public LocalDate getEnterdate() { diff --git a/brcm/core/src/main/java/impl/CustomerManagementServiceImpl.java b/brcm/core/src/main/java/impl/CustomerManagementServiceImpl.java new file mode 100644 index 0000000..9aacc8e --- /dev/null +++ b/brcm/core/src/main/java/impl/CustomerManagementServiceImpl.java @@ -0,0 +1,70 @@ +package impl; + +import dtos.ProfessorDto; +import dtos.StudentDto; +import repositories.ProfessorRepository; +import repositories.StudentRepository; +import services.CustomerManagementService; + +import java.util.List; + +public class CustomerManagementServiceImpl implements CustomerManagementService { + + private final ProfessorRepository professorRepository; + private final StudentRepository studentRepository; + + public CustomerManagementServiceImpl(StudentRepository studentRepository, ProfessorRepository professorRepository){ + this.studentRepository = studentRepository; + this.professorRepository = professorRepository; + } + + @Override + public void saveStudent(StudentDto student) { + + } + + @Override + public void saveProfessor(ProfessorDto professor) { + + } + + @Override + public StudentDto getStudentByBroncoId(int id) { + return null; + } + + @Override + public ProfessorDto getProfessorByBroncoId(int id) { + return null; + } + + @Override + public void updateStudent(StudentDto student) { + + } + + @Override + public void updateProfessor(ProfessorDto professor) { + + } + + @Override + public void deleteStudentByBroncoId(int id) { + + } + + @Override + public void deleteProfessorByBroncoId(int id) { + + } + + @Override + public List listStudentsbyMajor(String major) { + return null; + } + + @Override + public List listProfessorsbyDept(String dept) { + return null; + } +} diff --git a/brcm/core/src/main/java/repositories/ActivityRepository.java b/brcm/core/src/main/java/repositories/ActivityRepository.java new file mode 100644 index 0000000..507ca7b --- /dev/null +++ b/brcm/core/src/main/java/repositories/ActivityRepository.java @@ -0,0 +1,12 @@ +package repositories; + +import entities.Activity; + +import java.util.List; + +public interface ActivityRepository { + Activity saveActivity(Activity activity); + List getAllActivities(); + void updateActivity(Activity activity); + void deleteActivity(int id); +} diff --git a/brcm/core/src/main/java/repositories/AppointmentRepository.java b/brcm/core/src/main/java/repositories/AppointmentRepository.java new file mode 100644 index 0000000..a63fa8f --- /dev/null +++ b/brcm/core/src/main/java/repositories/AppointmentRepository.java @@ -0,0 +1,13 @@ +package repositories; + +import entities.Appointment; + +import java.time.LocalDate; +import java.util.List; + +public interface AppointmentRepository { + Appointment saveAppointment(Appointment appointment); + void updateAppointment(Appointment appointment); + void updateAppointmentStatus(int id, String status); + List getAllAppointmentsBetweenDates(LocalDate startDate, LocalDate endDate); +} diff --git a/brcm/core/src/main/java/repositories/DiscountSchemeRepository.java b/brcm/core/src/main/java/repositories/DiscountSchemeRepository.java new file mode 100644 index 0000000..521c768 --- /dev/null +++ b/brcm/core/src/main/java/repositories/DiscountSchemeRepository.java @@ -0,0 +1,12 @@ +package repositories; + +import entities.Discountscheme; + +import java.util.List; + +public interface DiscountSchemeRepository { + Discountscheme AddDiscount(Discountscheme discountscheme); + void DeleteDiscount(int id); + List getAllDiscounts(); + void UpdateDiscount(Discountscheme discountscheme); +} diff --git a/brcm/core/src/main/java/repositories/LineItemRepository.java b/brcm/core/src/main/java/repositories/LineItemRepository.java new file mode 100644 index 0000000..7a188a7 --- /dev/null +++ b/brcm/core/src/main/java/repositories/LineItemRepository.java @@ -0,0 +1,12 @@ +package repositories; + +import entities.Lineitem; + +import java.util.List; + +public interface LineItemRepository { + void saveLineItem(Lineitem lineitem); + void deleteLineItem(int id); + void updateLineItem(Lineitem lineitem); + List getLineItemsForOrderId(int id); +} diff --git a/brcm/core/src/main/java/repositories/OrderRepository.java b/brcm/core/src/main/java/repositories/OrderRepository.java new file mode 100644 index 0000000..23b4025 --- /dev/null +++ b/brcm/core/src/main/java/repositories/OrderRepository.java @@ -0,0 +1,12 @@ +package repositories; + +import entities.Order; + +import java.util.Date; +import java.util.List; + +public interface OrderRepository { + void saveOrder(Order order); + void updateOrder(Order order); + List getOrdersBetweenDates(Date start, Date end); +} diff --git a/brcm/core/src/main/java/repositories/PriceHistoryRepository.java b/brcm/core/src/main/java/repositories/PriceHistoryRepository.java new file mode 100644 index 0000000..4432c33 --- /dev/null +++ b/brcm/core/src/main/java/repositories/PriceHistoryRepository.java @@ -0,0 +1,9 @@ +package repositories; + +import entities.Historicalprice; + +import java.util.List; + +public interface PriceHistoryRepository { + List getPriceHistoryForActivity(int activityId); +} diff --git a/brcm/core/src/main/java/repositories/ProfessorRepository.java b/brcm/core/src/main/java/repositories/ProfessorRepository.java new file mode 100644 index 0000000..5a1aea6 --- /dev/null +++ b/brcm/core/src/main/java/repositories/ProfessorRepository.java @@ -0,0 +1,11 @@ +package repositories; + +import entities.Professor; +import java.util.List; +public interface ProfessorRepository { + Professor saveProfessor(Professor Professor); + void deleteProfessor(int id); + void updateProfessor(int id); + void getProfessorById(int id); + List getProfessorsByDept(String dept); +} diff --git a/brcm/core/src/main/java/repositories/StudentRepository.java b/brcm/core/src/main/java/repositories/StudentRepository.java new file mode 100644 index 0000000..efadd07 --- /dev/null +++ b/brcm/core/src/main/java/repositories/StudentRepository.java @@ -0,0 +1,12 @@ +package repositories; + +import entities.Student; +import java.util.List; + +public interface StudentRepository { + Student saveStudent(Student student); + void deleteStudent(int id); + void updateStudent(int id); + void getStudentById(int id); + List getStudentsByMajor(String major); +} diff --git a/brcm/core/src/main/java/services/ActivityRegistrationService.java b/brcm/core/src/main/java/services/ActivityRegistrationService.java new file mode 100644 index 0000000..8ca1cdc --- /dev/null +++ b/brcm/core/src/main/java/services/ActivityRegistrationService.java @@ -0,0 +1,4 @@ +package services; + +public interface ActivityRegistrationService { +} diff --git a/brcm/core/src/main/java/services/CustomerManagementService.java b/brcm/core/src/main/java/services/CustomerManagementService.java new file mode 100644 index 0000000..9e832ca --- /dev/null +++ b/brcm/core/src/main/java/services/CustomerManagementService.java @@ -0,0 +1,18 @@ +package services; + +import dtos.ProfessorDto; +import dtos.StudentDto; +import java.util.List; + +public interface CustomerManagementService { + void saveStudent(StudentDto student); + void saveProfessor(ProfessorDto professor); + StudentDto getStudentByBroncoId(int id); + ProfessorDto getProfessorByBroncoId(int id); + void updateStudent(StudentDto student); + void updateProfessor(ProfessorDto professor); + void deleteStudentByBroncoId(int id); + void deleteProfessorByBroncoId(int id); + List listStudentsbyMajor(String major); + List listProfessorsbyDept(String dept); +} diff --git a/brcm/core/src/main/java/services/DiscountManagementService.java b/brcm/core/src/main/java/services/DiscountManagementService.java new file mode 100644 index 0000000..78efeb9 --- /dev/null +++ b/brcm/core/src/main/java/services/DiscountManagementService.java @@ -0,0 +1,4 @@ +package services; + +public interface DiscountManagementService { +} diff --git a/brcm/core/src/main/java/services/PriceHistoryService.java b/brcm/core/src/main/java/services/PriceHistoryService.java new file mode 100644 index 0000000..eb54727 --- /dev/null +++ b/brcm/core/src/main/java/services/PriceHistoryService.java @@ -0,0 +1,4 @@ +package services; + +public interface PriceHistoryService { +} diff --git a/brcm/core/src/main/java/services/RevenueReportService.java b/brcm/core/src/main/java/services/RevenueReportService.java new file mode 100644 index 0000000..ca88e56 --- /dev/null +++ b/brcm/core/src/main/java/services/RevenueReportService.java @@ -0,0 +1,4 @@ +package services; + +public interface RevenueReportService { +} diff --git a/brcm/core/src/main/java/services/VisitRegistrationService.java b/brcm/core/src/main/java/services/VisitRegistrationService.java new file mode 100644 index 0000000..1e519a0 --- /dev/null +++ b/brcm/core/src/main/java/services/VisitRegistrationService.java @@ -0,0 +1,4 @@ +package services; + +public interface VisitRegistrationService { +} diff --git a/docs/brcm_sql.architect b/docs/brcm_sql.architect index b7ddeff..dfc51c7 100644 --- a/docs/brcm_sql.architect +++ b/docs/brcm_sql.architect @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -515,6 +515,76 @@
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
@@ -522,352 +592,355 @@
- +
- - + + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + + + + - + - + - - - + + +
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
- + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -916,7 +989,7 @@ - + diff --git a/docs/brcm_sql.architect~ b/docs/brcm_sql.architect~ index f756285..4d18aa8 100644 --- a/docs/brcm_sql.architect~ +++ b/docs/brcm_sql.architect~ @@ -506,6 +506,76 @@ + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
@@ -513,352 +583,355 @@ - +
- - + + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + - + - + - - - + + +
- +
- - + + - + - + - + - + + + + - + - + - - - + + +
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
- + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -907,7 +980,7 @@ - + diff --git a/src/brcm/.idea/workspace.xml b/src/brcm/.idea/workspace.xml deleted file mode 100644 index e35a3fe..0000000 --- a/src/brcm/.idea/workspace.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1667113660957 - - - - - - - \ No newline at end of file