From 6e08825ad242e216d22162d9944226f8c5e5e5b4 Mon Sep 17 00:00:00 2001 From: Jadowyne Ulve Date: Sat, 24 May 2025 09:58:03 -0500 Subject: [PATCH] fixed external_api bug --- .gitignore | 54 +++++++++++++++++- __pycache__/MyDataclasses.cpython-312.pyc | Bin 17654 -> 17624 bytes __pycache__/api.cpython-312.pyc | Bin 23020 -> 22990 bytes __pycache__/api_admin.cpython-312.pyc | Bin 18590 -> 18560 bytes __pycache__/config.cpython-312.pyc | Bin 3534 -> 3504 bytes __pycache__/database.cpython-312.pyc | Bin 85819 -> 85789 bytes __pycache__/database_admin.cpython-312.pyc | Bin 1468 -> 1438 bytes __pycache__/external_API.cpython-312.pyc | Bin 8596 -> 8566 bytes __pycache__/group_api.cpython-312.pyc | Bin 2924 -> 2894 bytes __pycache__/main.cpython-312.pyc | Bin 44086 -> 44056 bytes __pycache__/manage.cpython-312.pyc | Bin 6857 -> 6827 bytes __pycache__/postsqldb.cpython-312.pyc | Bin 91610 -> 91580 bytes __pycache__/process.cpython-312.pyc | Bin 16498 -> 16468 bytes __pycache__/receipts_API.cpython-312.pyc | Bin 28210 -> 28180 bytes __pycache__/shopping_list_API.cpython-312.pyc | Bin 12758 -> 12728 bytes __pycache__/user_api.cpython-312.pyc | Bin 7845 -> 7815 bytes __pycache__/webpush.cpython-312.pyc | Bin 2967 -> 2937 bytes __pycache__/workshop_api.cpython-312.pyc | Bin 20549 -> 20519 bytes .../__pycache__/__init__.cpython-312.pyc | Bin 167 -> 141 bytes .../__pycache__/postsqldb.cpython-312.pyc | Bin 94447 -> 94417 bytes .../__pycache__/__init__.cpython-312.pyc | Bin 177 -> 147 bytes .../database_items.cpython-312.pyc | Bin 40469 -> 40439 bytes .../__pycache__/items_API.cpython-312.pyc | Bin 36455 -> 36425 bytes .../items_processes.cpython-312.pyc | Bin 6816 -> 6786 bytes .../__pycache__/__init__.cpython-312.pyc | Bin 175 -> 149 bytes .../database_recipes.cpython-312.pyc | Bin 14360 -> 14330 bytes .../__pycache__/recipes_api.cpython-312.pyc | Bin 16402 -> 16372 bytes process.py | 4 +- 28 files changed, 55 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8c5c3bb..05cb92a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,56 @@ sites static/css/uikit-rtl.css static/css/uikit-rtl.min.css static/css/uikit.css -static/css/uikit.min.css \ No newline at end of file +static/css/uikit.min.css +__pycache__/api_admin.cpython-312.pyc +__pycache__/api_admin.cpython-313.pyc +__pycache__/api.cpython-312.pyc +__pycache__/api.cpython-313.pyc +__pycache__/config.cpython-312.pyc +__pycache__/config.cpython-313.pyc +__pycache__/database_admin.cpython-312.pyc +__pycache__/database_admin.cpython-313.pyc +__pycache__/database.cpython-312.pyc +__pycache__/database.cpython-313.pyc +__pycache__/external_API.cpython-312.pyc +__pycache__/external_API.cpython-313.pyc +__pycache__/group_api.cpython-312.pyc +__pycache__/group_api.cpython-313.pyc +__pycache__/main.cpython-312.pyc +__pycache__/main.cpython-313.pyc +__pycache__/manage.cpython-312.pyc +__pycache__/manage.cpython-313.pyc +__pycache__/MyDataclasses.cpython-312.pyc +__pycache__/MyDataclasses.cpython-313.pyc +__pycache__/postsqldb.cpython-312.pyc +__pycache__/postsqldb.cpython-313.pyc +__pycache__/process.cpython-312.pyc +__pycache__/process.cpython-313.pyc +__pycache__/receipts_API.cpython-312.pyc +__pycache__/receipts_API.cpython-313.pyc +__pycache__/shopping_list_API.cpython-312.pyc +__pycache__/shopping_list_API.cpython-313.pyc +__pycache__/user_api.cpython-312.pyc +__pycache__/user_api.cpython-313.pyc +__pycache__/webpush.cpython-312.pyc +__pycache__/webpush.cpython-313.pyc +__pycache__/workshop_api.cpython-312.pyc +__pycache__/workshop_api.cpython-313.pyc +application/recipes/__pycache__/__init__.cpython-312.pyc +application/recipes/__pycache__/__init__.cpython-313.pyc +application/recipes/__pycache__/database_recipes.cpython-312.pyc +application/recipes/__pycache__/database_recipes.cpython-313.pyc +application/recipes/__pycache__/recipes_api.cpython-312.pyc +application/recipes/__pycache__/recipes_api.cpython-313.pyc +application/__pycache__/__init__.cpython-312.pyc +application/__pycache__/__init__.cpython-313.pyc +application/__pycache__/postsqldb.cpython-312.pyc +application/__pycache__/postsqldb.cpython-313.pyc +application/items/__pycache__/__init__.cpython-312.pyc +application/items/__pycache__/__init__.cpython-313.pyc +application/items/__pycache__/database_items.cpython-312.pyc +application/items/__pycache__/database_items.cpython-313.pyc +application/items/__pycache__/items_API.cpython-312.pyc +application/items/__pycache__/items_API.cpython-313.pyc +application/items/__pycache__/items_processes.cpython-312.pyc +application/items/__pycache__/items_processes.cpython-313.pyc diff --git a/__pycache__/MyDataclasses.cpython-312.pyc b/__pycache__/MyDataclasses.cpython-312.pyc index 1ac8066f7ab562dccf8dba7279f10deba35e244c..9d53e3e249d4e162a06c8d594b75702020c29b82 100644 GIT binary patch delta 49 zcmey?$#|oak^3|+FBbz4OuK2gkz0&KR5jHqCOJPPHKrgjucW9_x1=aBIeT*m%OVE= Dgns7T#{atT3nc;TToe&k)OBOjAfAn03)UxUH||9 diff --git a/__pycache__/api.cpython-312.pyc b/__pycache__/api.cpython-312.pyc index 668ac56d1ec1781f2295ae9f96d77b938aa89b90..a8822b30aed38d98ef54fc5bab24af46e903014d 100644 GIT binary patch delta 50 zcmaE}nep6aMxN8Wyj%=GAb!^{V7l#JrNCO5Kv8#N_PFmsq4i E0iab8n0C`}BexHmsA8&BOmcooYD__5UP)1b8ICh&4 gF|VYkGNvHExFo$OwYV@xx1h2lBR_9*4x5M*02Edm^Z)<= diff --git a/__pycache__/config.cpython-312.pyc b/__pycache__/config.cpython-312.pyc index 7cae4092b76aeb831e9409b9f64779f806375fc4..d4c757cd376f8f999480d4b19555ee051d921c0c 100644 GIT binary patch delta 48 zcmX>ny+NAiG%qg~0}xERX_&E*hlfd2F4Za~IX@*erXVq|q^MH2q$n{td$TuFGdBQP Cr4JSW delta 78 zcmdlWeNLL^G%qg~0}$N(7MH$}hlk17#?>muFSVj1IVZm~CB`{FB{eCrIJFokRvwU; fS5j0NQ;=U=l3tWrT$rOs7T#{atT3nc;TToe&k)PMB%DP>ZmGOrs09PLzfB*mh diff --git a/__pycache__/database_admin.cpython-312.pyc b/__pycache__/database_admin.cpython-312.pyc index 0b0b2278fa25070222dc8f2cf106604bf3e1e9ec..da566f87408c0f3ee1fc10a4492d77a22b87a6b0 100644 GIT binary patch delta 47 zcmdnPJ&&9FG%qg~0}xERX}FPl0<)-Es#Q#KeoAUgL1JD>QKfE4QDSoT=5x&N7y(YN B5840# delta 77 zcmbQoy@#9oG%qg~0}#00WZTF+f!Ww4)hfm>wW1_BC%-f$#yLMFH7T(;wHPQ?9*~$< eQdAjJkY8MqUX)r~n4?=zS(1^Tw|N8eJ4OJ;cN@b1 diff --git a/__pycache__/external_API.cpython-312.pyc b/__pycache__/external_API.cpython-312.pyc index 98e1ac37e2a3ebff31e7b364150eb8628a8910bb..2727c780d3e98cabe41f00a3f6bab6e87b5d0541 100644 GIT binary patch delta 47 zcmbQ@{LP8`G%qg~0}xERX}FO)nq5>S)hZ@AKP5G$ATh6`s8YA2C^0#E^Gx>Nk^p1) B5IO(= delta 77 zcmez7G{u?wG%qg~0}zB=W8TOe&2H?JY8B&`T2YdmlV6$=n_C}27G%qg~0}yO#ev!VBCx_YC-qk9`FSVj1IVZm~CB`{FB{eCrIJFokRvwU; fS5j0NQ;=U=l3tWrT$rOmuFSVj1IVZm~CB`{FB{eCrIJFokRvwU; fS5j0NQ;=U=l3tWrT$rOiNnB@GF)R=ie;?!cGSb0EV kUP)19OhJBeNqSLgabb>bL1jrseqQri=Iw8p8P6vI0J#+(IsgCw diff --git a/__pycache__/process.cpython-312.pyc b/__pycache__/process.cpython-312.pyc index a5ac356d5cebadcb8d80385d3de07e0c72c4ce51..405412a73d202f119cef9fa0bdbc711a67ac1801 100644 GIT binary patch delta 83 zcmey=z<8yBk@qw&FBbz4q}?;jP~OP9lvz|h)hZ@AKP5G$ATh6`s8YA2C^0#E^Hb&; mQ%1kdNtVYM+2yVa>R%MppKM@l%dT);$mpVw(dH8Ce=GohQXC}! delta 113 zcmcc8!1$?wk@qw&FBbz4Oj|0HA-$1zDYLO{s#T0%YDGzMPJU@hjB|cUYEoixYB5l( zJRmWzq^L5cAiuaIy(qP~Fh{qbvLquvZ}V~H8dJv5%`TS58QG<-3u<2!)SfJ4ZOblm PT}bbuklyAn>whc&zxpTd diff --git a/__pycache__/receipts_API.cpython-312.pyc b/__pycache__/receipts_API.cpython-312.pyc index eff152328572c360162ab701e1012f3930ca81f6..2ed9a4feb196a19d4c7b68c1518b9a31a4712919 100644 GIT binary patch delta 49 zcmdmVhjGdsM()$Ryj%=GFzu${M(!dGQI%AynB@GF)R=kJOdo9 diff --git a/__pycache__/user_api.cpython-312.pyc b/__pycache__/user_api.cpython-312.pyc index 6e65e3db24881df2f7dea0232efdde6089563006..64c3ee8568f4173afb5e6a1e3aec337cbe7db141 100644 GIT binary patch delta 47 zcmZ2#+iuH!nwOW00SKnuG~CF2fmu``)hZ@AKP5G$ATh6`s8YA2C^0#EGat)zDF9m$ B4^037 delta 77 zcmZp-U24mHnwOW00SJT_ux{kOz-(-nY8B&`T2YdmlV6$=QKfE4QDSoT=9`TBI00M^ B5DEYQ delta 77 zcmewzW2aQB7{AntlH{EH(v%qI{FKzB#NyOqpjdf8 gVqQs6WlTYSaY=enYH?wXZb4;9MtJsMw delta 82 zcmeBWT+YaSnwOW00SH7pIVW-(Tf3!N#rUOGlqBcmm!`xx=clA5B^IX^1I5Y%67x!m jDq{-ri%ZgrQi}_7bPFm=GV=3cij#{n3rdP7#_It998es? diff --git a/application/__pycache__/postsqldb.cpython-312.pyc b/application/__pycache__/postsqldb.cpython-312.pyc index 7b040b41e607fc1619fbf9c1a34cd37049f97137..ef5768f91b35073382fec68fc6e2851bdc282f08 100644 GIT binary patch delta 53 zcmaF=koDq2R_@chyj%=GFzu${Ms9T$QQcIlnB@GF)R=*o?B delta 83 zcmcckkoEmTR_@chyj%=GAjc`Rkz1X`*gMrK#xJ#^BsnL)G$qD4KP5FOu{gCDC{`Yj km{(F%8B>s7T#{atT3nc;TToe&k)PM>&a&N|g|RCK0Epxr1poj5 diff --git a/application/items/__pycache__/__init__.cpython-312.pyc b/application/items/__pycache__/__init__.cpython-312.pyc index 9e439974b790f8d932921ce4bc400a0b2388228a..82922eb98c68cb910095c9d0a983ae274764d01b 100644 GIT binary patch delta 44 ycmdnUIGK_AG%qg~0}xERX*iMFSkx%hDkeEUB{ilXF|VYkQn#ciF*$o;p#uOFs16GN delta 74 zcmbQtxRH_jG%qg~0}wn&<(tTDY#fkk72}s$QIedKUz!r*oS%}Klvtcv3=}I5NX#oK bs*EYfFD^+hN-ZwT(JiPf$;i)}80-K5Z!H=l diff --git a/application/items/__pycache__/database_items.cpython-312.pyc b/application/items/__pycache__/database_items.cpython-312.pyc index d25c6ccb2c611fbea9f2d30598ef0626c94a82c9..0f710a640fc0b0df6f43f6692d11800cd09a4847 100644 GIT binary patch delta 49 zcmbQbhw1xnChpU`yj%=GFzu${Ms5~1QHxZonB@GF)R=;M1& delta 79 zcmeyqn`!DEChpU`yj%=GP`p5BBR311aagKVj9+R+NpenpX-bT9eoAUmVsUCQP^>&4 gF|VYkGNvHExFo$OwYV@xx1h2lBR_Am3ftxB045(hw1qoChpU`yj%=GP`6ZQBliamE&2mnen B4!HmT delta 77 zcmZoNU0}+6nwOW00SMMC5!%S@$YC6wY8B&`T2YdmlV6$=W)hZ@AKP5G$ATh6`s8YA2C^0#Ea~0D(Qvh;u B5Gw!x delta 77 zcmeyBKcj&AG%qg~0}$lS;@!w?!(<$lY8B&`T2YdmlV6$=WJ>^j Ch!A!F delta 78 zcmexTKdFI{`!p{v7XuLR%;(+6UC3q}nrao}ms(MhoReRg662holA4rQoLUSND-TG_ fD=DgsDabD_NiRw*F3iy_s4U6I&)YnaE!h$P{52c% diff --git a/process.py b/process.py index 9424803..2eee402 100644 --- a/process.py +++ b/process.py @@ -227,7 +227,7 @@ def postTransaction(conn, site_name, user_id, data: dict): transaction_time = datetime.datetime.now() - cost_layer = postsqldb.CostLayerPayload( + cost_layer = MyDataclasses.CostLayerPayload( aquisition_date=transaction_time, quantity=float(data['quantity']), cost=float(data['cost']), @@ -235,7 +235,7 @@ def postTransaction(conn, site_name, user_id, data: dict): vendor=int(data['vendor']), expires=data['expires'] ) - transaction = postsqldb.TransactionPayload( + transaction = MyDataclasses.TransactionPayload( timestamp=transaction_time, logistics_info_id=int(data['logistics_info_id']), barcode=data['barcode'],