From 83ecf65abf310995b7d583ec3aa0f2b6e6d238fe Mon Sep 17 00:00:00 2001 From: Macbook Date: Sat, 20 Dec 2025 23:22:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B8=20=D0=BD=D0=B0=20=D0=B8=D0=BD=D1=81?= =?UTF-8?q?=D1=82=D1=80=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/toolbox.cpython-313.pyc | Bin 4869 -> 4924 bytes .../__pycache__/toolkit.cpython-313.pyc | Bin 13792 -> 15125 bytes api/routers/toolkit.py | 18 ++ api/static/js/index.js | 147 +++++++++++++ db/__pycache__/initialize.cpython-313.pyc | Bin 11319 -> 13778 bytes .../__pycache__/actions.cpython-313.pyc | Bin 26557 -> 26563 bytes .../__pycache__/toolkit.cpython-313.pyc | Bin 16824 -> 18932 bytes db/handlers/toolkit.py | 27 ++- db/initialize.py | 197 +++++++++++++----- .../__pycache__/toolkit.cpython-313.pyc | Bin 2721 -> 2732 bytes db/schemas/toolkit.py | 12 +- 11 files changed, 336 insertions(+), 65 deletions(-) diff --git a/api/routers/__pycache__/toolbox.cpython-313.pyc b/api/routers/__pycache__/toolbox.cpython-313.pyc index 4b966de4f50c74067d2ec774fe522766af15a142..b604a3713d621dfcf8f8222501a78bb203386e6f 100644 GIT binary patch delta 297 zcmZow+oQ(&nU|M~0SI3GbI3fhk@p=pn1z%9&rlh3*`vn1}Q)Vrckam zBLhPU69a>9B?Ch!TQI*aF9Sm!n{NXH12=;LP$ZgnvOb@*xIidlFq1k^Pbi}bL$F{d z8y`ck5Ku0WPgGLam=!210+Z!n@Cz_!PGi&*o!rkC&3B6@wWuh+$TzjPI59nS@+-dS zjO>$}_?1~%vQsOICokbo;j#dlYX-!{ev^d+ZV7x4V&IWlAii8?q0C~rtK9mNKMNEH z3o#zHXLJ={JHjC5D#Un1%G_0Ga+%;98IazU44;7{Ly;7axW!?Uo1apelWJGwJXufZ JGK&*X5CGswLN)*Z delta 236 zcmdm^)~d$)nU|M~0SI0lvCUk*k@p=pW8daK+-{7Fg_E6mk7$H)Xn;Wd%{|$ZPui6~lrfk|9jG>xQH3E`Ae4=dAy_b)8>}59 z%4*68VFSg5j9G!Ig<+~W82p^gnbR0GMJBK0i=HgRKb?_n@+yAi$(Q+)xy*pNK)Bd- zvV*`a_U}RrJi;C3leGj3gjpF6+cUZ{vmIgJbY*2c!fWozI(e<&97eOrUP4lgj+0Y` KF0(iQwE_UFU@r0i diff --git a/api/routers/__pycache__/toolkit.cpython-313.pyc b/api/routers/__pycache__/toolkit.cpython-313.pyc index 324d490ff4855456199254c1381b9c197f776b75..db09add1286cbd5fcd6361e719bfd0dcca0b0aee 100644 GIT binary patch delta 1364 zcmZ8gZA@EL7(VCT-rLd({cdkRfZMWu(6y{Bf{blQu-#CZu+bqpj01sA#-Q72Q5K^R z{IO=4f#&GIm?-hb!Vf<%HzqStV}yT3(^?D@iQ&iom?-H)6O;MFa|-CfxjD~y&hx(K zIUjlN*67Xdn5&m(^I|_NTsHnEgZ4TkYVI;u376VbV}F?uVk;7PrUs z%}m^32meJR8euErRoQLFBh?3%IiDB1_cM2$N*I^o&XSSK4)8JNR>`6^?k5)J!v`$f z7X$vFyvBTAA*e!w$+5BF@$_E-Y_mCxU**0a-)Ffm^E0{S{B-V4eilodg-I|N>W?$9 z8b_o$TrWBCHvy-*5$>MA39vfYiglJU{IOJlt1T^L-i?nsU7WjzZDes?6!C;pa=JjD zX8+JiFyI1UobTHgK(`Jrdreb4{QtfZh?A5yz6ZMZSOO+M3oC&Hbb%h2Vw@nwNWi_P zHL(fkS9PK&F-0N;vIjr`3Wo@62z&QEH$0g}L8AD}kd{V06uboRR*0V}CuBoCFf

q&E)~`eoU8Sc`a#!xTmzdcZO!x(MMmJPn<~w$a6`yh+SXLjy~$kr zd`GrpkuR8hYpU8!lenOKUwB7YJXNp;)~%tuHMA@gtS1VlmQ2}QgKa*L4J;%I2G6>| zpEvlI>I#OV8Re$lG}k-dm+f1$6wFh#>*iqI99(*~V1BfqZ_4nSqGw$U{~(5!ZC|$+ z#MA5g(?m2%WLIM(qbjO^&YIEQ7l7eu`1d`*v;*MoVason&z+ssX0%&cF{6D@R1*C` zktgXlwg05zWi9K|111^Cj! zbNH94dTxwlVA)(9WML9N?(%V0iEvvUcirJ2!aiTG;{_sYCPuAw7@q6-xI2~0$A zxTYR|>l<|qP>og_dXYju0YCpxouzSa?Qw33$g(_No9E5bgdQyQG=41xMHJvI3r82gcQT%IgA<;KZ%PEuKqVNsc2*5dRP;H!fBiH=T>knVK*$s%*Y&&c-MY3ap|85CQUi5y+!OAh#8Plmf&1 ZuZ0BHR3MWPh>Q13mbcuwnahfs5dc)Yc{>0A diff --git a/api/routers/toolkit.py b/api/routers/toolkit.py index 95fe0e3..c37001d 100644 --- a/api/routers/toolkit.py +++ b/api/routers/toolkit.py @@ -82,6 +82,24 @@ async def toolkit_request( return response +@router.post("/comment", summary="Добавление комментария") +async def add_comment(reqData: dict = Depends(requestDict)): + logger.info(f"Добавление комментария") + response = {"status": "error"} + try: + logger.info(f"Добавление комментария") + logger.info(reqData.get("body")) + toolkitId = int(reqData.get("body").get("toolkitId")) + comment = reqData.get("body").get("commentText") + userId = int(reqData.get("body").get("userId")) + result = await ToolkitHandler.addComment(toolkitId, userId, comment) + response = handleResult(result, response) + except Exception as e: + logger.error(e) + finally: + return response + + @router.post("/fill_prepare", summary="Подготовка заполнения ящика") async def fill_toolbox(): logger.info(f"Подготовка заполнения ящика") diff --git a/api/static/js/index.js b/api/static/js/index.js index 3f51fe6..803ce47 100644 --- a/api/static/js/index.js +++ b/api/static/js/index.js @@ -3823,6 +3823,7 @@ async function getToolkitStocks(toolkitId) { return resp.data; } +// Функция показа модального окна с деталями инструмента // Функция показа модального окна с деталями инструмента async function showToolkitDetailsModal(toolkitId) { const modalId = 'toolkitDetailsModal'; @@ -3920,6 +3921,36 @@ async function showToolkitDetailsModal(toolkitId) { let toolkitStocksData = null; let isStocksLoading = false; + // Форматирование даты комментария + let commentDateInfo = ''; + if (toolkitData.comment_at) { + const commentDate = new Date(toolkitData.comment_at); + commentDateInfo = ` +
+ + Последнее изменение: ${commentDate.toLocaleDateString('ru-RU')} ${commentDate.toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit' })} +
+ `; + } else { + commentDateInfo = ` +
+ + Комментарии еще не оставляли +
+ `; + } + + // Информация о пользователе, оставившем комментарий + let commentUserInfo = ''; + if (toolkitData.comment_user_data && toolkitData.comment_user_data.username) { + commentUserInfo = ` +
+ + Автор: ${toolkitData.comment_user_data.username} +
+ `; + } + modal.innerHTML = `
@@ -3993,6 +4024,27 @@ async function showToolkitDetailsModal(toolkitId) { ` : ''}
+ + +
+
Комментарий
+
+ ${commentDateInfo} + ${commentUserInfo} +
+
+ +
+
+
+ Комментарий будет сохранен для этого инструмента +
+ +
+
@@ -4100,6 +4152,101 @@ async function showToolkitDetailsModal(toolkitId) { const bsModal = new bootstrap.Modal(modal); bsModal.show(); + // Элементы для работы с комментарием + const commentTextarea = modal.querySelector('#toolkitComment'); + const saveCommentBtn = modal.querySelector('#saveCommentBtn'); + const originalComment = toolkitData.comment_text || ''; + + // Проверка изменения комментария + const checkCommentChanged = () => { + const currentComment = commentTextarea.value.trim(); + const isChanged = currentComment !== originalComment; + saveCommentBtn.disabled = !isChanged || currentComment === ''; + }; + + // Слушатель изменений в текстовом поле + commentTextarea.addEventListener('input', checkCommentChanged); + + // Обработчик сохранения комментария + saveCommentBtn.addEventListener('click', async () => { + const commentText = commentTextarea.value.trim(); + + if (!commentText) { + showInfo('Комментарий не может быть пустым', 'warning'); + return; + } + + try { + // Блокируем кнопку на время отправки + saveCommentBtn.disabled = true; + saveCommentBtn.innerHTML = 'Сохранение...'; + + // Отправляем комментарий на сервер + const response = await apiRequest('/toolkit/comment', { + toolkitId: toolkitData.id, + userId: userData.id, + commentText: commentText + }, 'POST'); + + if (response.status === 'ok') { + // Обновляем информацию о комментарии без перезагрузки страницы + const now = new Date(); + + // Обновляем информацию о дате + const dateInfoDiv = modal.querySelector('.border-top .text-muted.small:first-child'); + if (dateInfoDiv) { + dateInfoDiv.innerHTML = ` + + Последнее изменение: ${now.toLocaleDateString('ru-RU')} ${now.toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit' })} + `; + } + + // Обновляем информацию о пользователе + const userInfoDiv = modal.querySelector('.border-top .text-muted.small:nth-child(2)'); + if (userInfoDiv) { + userInfoDiv.innerHTML = ` + + Автор: ${userData.username || 'Текущий пользователь'} + `; + } else if (userData.username) { + // Если элемента с информацией о пользователе не было, создаем его + const commentInfoDiv = modal.querySelector('.border-top .mb-2'); + if (commentInfoDiv) { + const newUserInfo = document.createElement('div'); + newUserInfo.className = 'text-muted small'; + newUserInfo.innerHTML = ` + + Автор: ${userData.username} + `; + commentInfoDiv.appendChild(newUserInfo); + } + } + + // Обновляем оригинальный комментарий для дальнейших проверок + toolkitData.comment_text = commentText; + toolkitData.comment_at = now.toISOString(); + toolkitData.comment_user_data = { username: userData.username }; + + // Показываем успешное сообщение + showInfo('Комментарий успешно сохранен', 'success'); + + // Кнопка становится неактивной, так как изменения сохранены + saveCommentBtn.innerHTML = 'Сохранено'; + setTimeout(() => { + saveCommentBtn.innerHTML = 'Сохранить'; + checkCommentChanged(); + }, 1500); + } else { + throw new Error(response.message || 'Ошибка сохранения комментария'); + } + } catch (error) { + console.error('Ошибка при сохранении комментария:', error); + showInfo(error.message || 'Произошла ошибка при сохранении комментария', 'danger'); + saveCommentBtn.disabled = false; + saveCommentBtn.innerHTML = 'Сохранить'; + } + }); + // Функция для загрузки данных об остатках const loadToolkitStocks = async () => { if (isStocksLoading) return; diff --git a/db/__pycache__/initialize.cpython-313.pyc b/db/__pycache__/initialize.cpython-313.pyc index 0a60a5634f543a2b489581c619a06a0b3824edb2..e3e3afdbb304b37b85e3e72254fb6622f9c403be 100644 GIT binary patch literal 13778 zcmd5@YgAj;l|EOxdVnrMNJ6~fg25mjBF30t@FQ5@@UZ0up*)HkRUknW%fh`9ZcL`F zYd0Cvq&3b;mhH|=?DVlh*6LbA+Gau~Pn)E1`s>Qj5xL9hc+I4p=|2pfb1{D2DLD|m=ER8D%RQ+l}-LDZeG|moa`?G{BN~;F4`*i|GY4t!(zh2N&S~HN_ zZx9TW)(+(L8wDe!vj$B4X2DG9?1B7#i(sL&ZlIvQP$;A{H&E1HEEMykkW>+8PBC%n zw<+Wr3nk;ZR>Pk$Vr3-lfg@r6M9>qkDkP0R7&_t`4NGj;_e2;HOrwI&6ZW}1p<}^O zw=X#E5Bels7sh&M1O({plxN5@67apsNE)x-695_TMID$JANL7B8M{VDeWB1k-%($n z*Aw&xXsXT?@(IbPerRGMFf#E(G9}jzg^y1N$C62u>5xC1Ov!PECq@s2x<;`Xp;5Vw za;S<$)-C|?A~{F|#z_Q)lM$3PFhl}-P<2p!P=jpv9@ILOweag?4{BN!PE|2^oE5U1 zW~cgKwo`L3yOninG3{|i&^fapu5e~k9?q#NCPI#rgHVs1E#x}&5E`7h5at0d$}>=2 zqch)`NAntEvP@2sU>;XkEt09*6ZVXFLcYGBKMdXIpYjQRHbRXYQm*d_e<XX6PYX{A)gl4wXT0 zoP4S+xmH@Yq%B%*+A_^Pr&}&8J)d(fXPW&{&KfWfNi{YhjQS*v;B)xC-Mwct(Gl=b z1Mf+A*IHm!Y$7~#VmTRRAca0IGMMPZcp4$wV&9?55?_Hc(S1qIL6pDl*%pg4q>phj zk3nsYGA}9}Dvkt|E~YN_)$@;S)3*q2Uk>t7*t-iQ^M^e+e(}IEE@oBcZbz z=BT`ewS*(_{`P{F7*p`10<;QG9R8ik3Npr2lHua`2x^F@l#rk*rQaaF{(%{wN%or$ zR#i~dr5a<#h%6CmGFEwul@hOury6F-U$>Uh+QySH_$QZpuX2pBYNs~s_xOW++(PjQ zZSFxE&4YD#Y{Ki9?1NT`=Of3(dGVddN%1%0eB^}qy7*S)Iq@CwUGa6ECeDd(LE<~W z^g1uj^O5hvr#FCkE}nK;e8Fb3O+JFs{sEbO1w4@X1hBjYndc);{5W#L#)~f}q`fY_&4b9-LG-(nX%1MP!D3N*6H0%X*7PZ;@w>F}H^jNf(;)v8 zN`DHnz6}M5vHI-1UF+r`542)V{B`6wwDJw{pT#*o)~I(P&qkiYGP_X1Su6=l0cL0m zW{Q=G1<68w1XhnuA6?$3tgK zL$R+x4c`^twB`zGsFiHban4Gr5g(vJL5H;F+a4hZ7)8o*dxeQ3ZciW}6}V#6LdVdNiI7h+xkn%KjUI|Y9XEwO66+6+O-P)ZLeUT~9QH_A zJx`4KD1Mc)d~wpM7I4J~l^9fEz1Y!-U{K;>HIT(Iz7Vzqpa?tyq6R5DF;9I`c_yHd z{LTY^=sy`k{!EUO6_(Fxyjt8e>y6rWM{K(ni|?E6es17eLCKjXPd^zgsEZWTMGNYe z3hHOQe=rqZH5Z?8Jns-U1((bd%f;pAZRc!@#r08hy=bn7c(k}JQrxy!+#WTzi{^Hk z(i|ynp3@}L%*8izNMQp=U1=u<^Qk9KJ-KWtK6B{wp{T_gu~-)^4N*fw#L%#!B!-d| zE7@Eht=So=**WiBtg%Nc>@(b-3N|Hb^4%r#_coS%LrwAu&gh=kiKPQehJ8>#)KVL< z)XuVtmZqqoNi;P5$yA&WGO}bI%~aXX3>I04d&%(4n@x9K?bYqTyQ(Jn4U)MX{;%pV z-a+yjR~rc5&0N=#{Ou6r*(i0>DvO3r5ew@7a^oIiC|VNp_ z{buFwIHo^W`@0+s(q<*3OKQOvo)m&y@l^ zCafDTuL(Q=@DG#;iw;&QrA+i3*F8{X3Yz;W-Xwy;87_7BI@M4-17w^PD3DCPqDh&@Le4tmwP1;Q$^dKd+s& zE>^WhtGXjq-Ah$_1s;+ele-~Ayc0Q*1{}a(r$HYu<4*x3;>EX-6->O0oG8fHJ6VrH zUW%LmQ-6|%aco3^Pnw{}vmHZ|J;;xc?OhovP~4J=wC)T>bnsSA(h8G7YRv^4Apw0c zNg48mg%YIHv3(BqkndPXh8HTIAWR5C4RRwM1MaY3Rms*K92poQ!S}6602to*E{XoI zKNL#tnh0BfD+FFWNt%5D`#`F_!;$Jm0SgewhToi3wA{Yqy_`35J~8ZFQ!2LWZxY2; z{SsHP#5Ld0l8UMe)vq+Y+!U>9i&V8mt2!f9or_gF7t41|ANZ50>MEES!G@Vk1=lN~ z(9dsF#VlSCSiDn?A3DUck)_cwas08xQNK9yxL9&%i3?mc6;kt8^koPq*$KwJi}^vm zT}93@b|w3ht^y#zoI&cvmabfgEHDa)EGQYIRoV7V z68gI?p}#@fLW%32+bzHh`yuGJ<9b~83?iCa_n1iU%b=eWDZW&OJ(Gm?>;`{GG03eG z0@2&&?*tCd<}}TlS=)nk$Ru44c3^9YCD?y3O;%;p6@SKZ)y@cRsMM zD}dnt7+*JX?1(26;=2OA!z2Dtt78&3uf(5%j*Gc{;8RVaD}avVKcP#w&Id$|I9Y+2 z(%ryRg%&x9%1S_AN2tbtYNwpggb+@snG^-aqG^b!E3a>4a$IPDOp?a;gl}{*>=O`e zSd}R%OC{?$G(vGlM5x6q4Vg8PydfWRW#XOVg$$wJK!92a^ud|V)16UMb;ML1HEmup zZJw=OE-E`;cCIX1)VfsEI-~l`TpKmt3;&l3%g$$?%U;^NJ-WFsvbk@uu(_=&kR4(7{u&imeb{LRPb4~nJzONIgTJ_4r$KkuBK zT->y6(b5(*v|TZ@T{n^9Z8wz!iZgA#V%mJ&O!Dr%nJ>p7Ni=Q#GV~Bs{6s~!k$IW1 zx2S)r1nL)iw%Xg33x$lmRl886MY>W4=?jgFy^URHQX}2UV0s&abi2AcSF^B->1Mcv z-5k&#=roX?rjfFsoRjdbO@XnN5#|4pMq&ohrmTCMiZoQ3w$F)35wz1D#Bak1&6Np@ zB1&{A)3Fk)YxK9*J;RB;UMGt=oT{W&xy||pt#`-k``fU#-SC#dtNW|hxOytL8@2~h zaGWD;oNz7tuRxn{FGvvDG3bCG1)B*wATBj$Tw3uhi;ZCHC`#Ie0S|$!F@8pY)LW5L zxb2e;lt5!laovLlzQzxA?b+AES50MA@%ApKy{o&&s!35L2;r!%kTDIKV*w|Ul}#!L zii?E(kQ!nkK-@xiD+I7OL@K*&O9agI0tB~K3)OY6?0EiPMX!fhT}Sr~$<9 z>mC=AvTR7IQwdw>Bol18U5;@Ai>4f24LUS*ioyx2+3oRq-EovUIuV#W91KZCX{m5j z<@1jR-H3#(isaM?p=%qT4vj!de8%aJvSapr;0mF4gEL}TZ;a||BYND>(Kki4O`^7m zrZq|*ZR zl^#l9OcQyK2`RRa5L!O)4kq%P42tzD_Jd`{s)Q6lrW!(-8Y5PPL+A$%nDnUoBprI- zu{8o93dcfHLR`wGcu023ae4Fnaal=Hb>ES3Rb*Iq8#VtkAS~1Z!RN=x)rOY2?TZaN zqYZtLhQ7=7OARjY_%<1(2G<4qS@jD8kp|Z)CVa6KTj~gDH;h z>h9+42ll!4JNT)b;biO^yu{e7I*KrbE^M62ANCy%31}xIO|0RxN2FZnhr>tw0bi^? zGMW)hQddw5B4v9=;{7M7WqFd)>kSCQ*iIM|=sA4ulY4In%dNZ9-g^pVT!!Fts$42- zUMYLIELyoOQn@W!*%_(q{Flm|5w2{y|E%g-#isM$Irp6#3PqlAP08|Lc-Uh7bpHxR zO8E0lf8R8tUN#jWioH<3Xlex9xuPZon=W)*Xj~yobJcRyX4#{jJGxl4ORU_zqGa;B z7}&|pGv9zs-2!x$FO3@o(JpB8NLv^P)9efC0;>BY z&=Zex|F^pDex`S8O#5-S)PCF@Xg?(^M>eq>;gA`&@em->#|4{kxHRM11L8`Iw<=(< zf)T*Q8dQOnRAkbUu)MFvbZ7==dN82}<+3mgszK{zaGD1*IKLV5Yi^N0Q(0QH4lcNn z6U=(}#e_bG72srtIE2kE(CS;+V760D;~G~sq(UwTvs@Yovt3#Ubz5~o9h7TMwj)l} z#Rw17-=%YMnYj?uH^FQP>V^}C{DWv>*FE3@Vqj1V2h zlP&tVbn(%Q|AMo>4%O`cgFLqPGyB_;RsoK}i(^We9YYjjp%%iBZXrIibOV(Bt{G_V+-CwDwQe|z_^)G?w5SmcX^@%;#o=8>C`;RYG zJwTy9T!@1^W?=zNx54?3DP&16_{LysGQJ%kDaQ`ECB{8fmMv@3WSC|M_>G^bVQ@Hy z2D|zkL;O_v29CW427CJMcklx}kMMOw^l zK_|<*x_D`83_D*^0wR`j6GIZF06-YU!eBX*5NhIN=O@gX3*|N4)ol3*ihG*5wQY+g zZCgpj`JLx>UNt-b=%5r`DvN%4?{y<7sa(^kOZ2PRK+WvAp&|LjXRE}rmPql|MRV)2 z*&-IyM$C0navSP+9Kw*89VM5p)D?&?EsI_ zGq0SRobP$x`hLmfuFK<>9}z1aS~5JG*(Tp;A_dmfGO)?3EcD?Qt6J!Z>pQ4r#(n&g zU2IPSb5XbQ?m?$y4fFNK>#XDU4_DyAhp4i*v+Bd|* zz6Bz2xEXxx2wa$T-~Spcj56ZE!LWz{{zU9&UCX^$BjTZ_G0p2un(jFdpCZ zr0M~eX#6Iq3^l)r!Z&4Hlj%VBL(KX(1hCNwIIrY%$xP1K2hJWn|KzzRqZKWYik7!K z-r6Bnw7`CaSl%b<`=^!Ha`R7p@6`8}x!jq1pK(mvuj%rlIzEE`8!_>bvqz&9t&xh> zXhnOZqFpTCE}A+bTnBLG8mF^m)eo0j;8JdIJZ%=CTXGWKwQ86nGSY*qqL3gznPv`H z^Mt|U$uLTwPo@Kms?^Jx>uhz(p+sT>F)oY1rSJG0+-T*86SM2C%S_<8yUv+FVt1W0 zfeY_CXQDf9F%AjW6pptM*We|-)9@aJ7rNJRAG|ei;GICBaNrI23`Q*}IRpB`E!#N8 z;)yT)avbZB4_$9_BP->E7O#QrfWpKV;8f!sxF+{39%H0k@PbQm8?K1W$4+P=PvqIj zRuu43;u;rRG~1YiUMhp@b*ab0;EGbijVBlaj=a!<0a{f7hf~1w76FGxz)PX@OjfV~ z72l-7m65hdh5Ama&bZ2xcdO`Su-{|W-$H=C@x8%L%@rto= z(P)cuHj%Ss;;D!l>#rE=7mbZku2JL~KZC^!AirYl73{A|fx4K>*eltK21>)>#wPY+ z6Vh;r$X>%<%BJ*Y#$L-_szn-)VXf=}Ta0u$3S6jQkglZRCK}ezu$G2a8a7mQ=O{nO zQ35|GV)QoTZD@peR>j`ER%Wj?AMe@Y@fF;&&vv^HPk1L`d%+D??%dy+^aNsGa^3DR z0A=9-K;Ynn+b!=;qa~Ht0Q`x9(2XQ;d4j=-Fum{@0StEV6{@YPT9eAQT3@5GtvtwNt4y<|8w7r?^LmwW)_aq{&k6?AQqa0M ztfg>;;n)!{7y|8_?9jIY9{J>wdN*{VU$P`qZSW^IHu{G){s{p!x`6vJQeFy&eCv^( zAxh;b=`jl&vcc`i@VMZEPXg+A;kzh7H5v8?Vpk}P-Vxhl@*m)YY##bYIdo-9hSU#} zV87`ymrSY2vA@rtYhSXYei@bjPRH*HQJt_c8~nu%RTSx8Jo4Y{$l8MrVGBnPl@$Ya^D|G;UCGCPf6XU#P%s^p<&Za O^#e-AxJodjV*dxJWJ+BC delta 5232 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 list[dict]: query = select(Toolkit).where(Toolkit.id.in_(toolkitIds)) @@ -211,6 +217,25 @@ class ToolkitHandler: ) return {"status": "ok"} if result else {"errorMessage": "Инструмент не удален"} + async def addComment(toolkitId: int, user_id: int, comment: str): + logger.info(f"Добавление комментария к инструменту {toolkitId}...") + logger.info(f"Комментарий: {comment}") + logger.info(f"Пользователь: {user_id}") + query = select(Toolkit).where(Toolkit.id == toolkitId) + toolkit = await CRUD.read(query) + if not toolkit: + logger.error("Инструмент не найден") + return {"errorMessage": "Инструмент не найден"} + try: + await toolkit.edit( + comment_text=comment, comment_user_id=user_id, comment_at=datetime.now() + ) + except Exception as e: + logger.error(f"Ошибка добавления комментария: {str(e)}") + return {"errorMessage": f"Ошибка добавления комментария: {str(e)}"} + logger.info(f"Комментарий к инструменту {toolkit.title} успешно добавлен") + return {"status": "ok"} + async def initialize(): from .categories import CategoryHandler diff --git a/db/initialize.py b/db/initialize.py index 929a6af..eb56a8d 100644 --- a/db/initialize.py +++ b/db/initialize.py @@ -1,3 +1,12 @@ +from typing import Optional + +from sqlalchemy import inspect, text +from sqlalchemy.ext.asyncio import create_async_engine, AsyncEngine +from sqlalchemy.schema import CreateTable +from sqlalchemy.dialects.postgresql import dialect as pg_dialect + +from utils import logger + from db.handlers.access import AccessLevelHandler from db.handlers.user import UserHandler from db.handlers.toolbox import ToolboxHandler @@ -5,12 +14,6 @@ from db.handlers.categories import CategoryHandler from db.handlers.toolkit import ToolkitHandler from db.handlers.actions import StocksActions -from typing import Optional -from sqlalchemy import inspect, text -from sqlalchemy.ext.asyncio import create_async_engine, AsyncEngine -from sqlalchemy.schema import CreateTable -from utils import logger - class DatabaseInitializer: existing_tables: Optional[list[str]] = None @@ -22,6 +25,10 @@ class DatabaseInitializer: self.engine: Optional[AsyncEngine] = None self.metadata = Base.metadata + # ========================================================== + # PUBLIC + # ========================================================== + async def initialize(self, force: bool = False, reNewDB: bool = False): """Main database initialization method""" try: @@ -29,32 +36,39 @@ class DatabaseInitializer: async with self.engine.begin() as conn: if force: - logger.info("Принудительное удаление и создание баз...") + logger.warning("Принудительное удаление и создание БД...") await self._drop_all() await self._create_tables_directly() await self._initialize_data(reNewDB) - elif not await self._check_tables_exist(conn): - logger.info("Не все необходимые таблицы существуют. Создаем...") + return + + tables_exist = await self._check_tables_exist(conn) + + if not tables_exist: + logger.warning("Не все таблицы существуют. Создаем недостающие...") await self._create_tables_directly() - # Проверяем после создания - async with self.engine.begin() as conn: - if not await self._check_tables_exist(conn): - raise RuntimeError("Не все необходимые таблицы существуют!") + # 🔥 СИНХРОНИЗАЦИЯ СХЕМЫ + logger.info("Синхронизация схемы БД...") + await self._sync_schema(conn) - if reNewDB: - logger.info("Принудительная загрузка данных...") - await self._initialize_data(reNewDB) - else: - logger.info("Все необходимые таблицы существуют. Пропускаем...") + if reNewDB: + logger.warning("Принудительная загрузка данных...") + await self._initialize_data(reNewDB) + + logger.info("Инициализация БД завершена успешно") except Exception as e: - logger.error(f"Инициализация базы завершилась ошибкой: {str(e)}") + logger.exception("Инициализация базы завершилась ошибкой") raise finally: if self.engine: await self.engine.dispose() + # ========================================================== + # CHECK + # ========================================================== + async def _check_tables_exist(self, conn) -> bool: """Check if all tables from metadata exist""" try: @@ -70,12 +84,8 @@ class DatabaseInitializer: missing_tables = required_tables - set(DatabaseInitializer.existing_tables) if missing_tables: - logger.warning("Существующие таблицы:") - logger.info(DatabaseInitializer.existing_tables) - logger.warning("Необходимые таблицы:") - logger.info(required_tables) logger.warning("Отсутствующие таблицы:") - logger.info(missing_tables) + logger.warning(missing_tables) return False return True @@ -83,62 +93,135 @@ class DatabaseInitializer: logger.warning(f"Проверка таблиц завершилась ошибкой: {str(e)}") return False + # ========================================================== + # CREATE / DROP + # ========================================================== + async def _create_tables_directly(self): """Create tables directly using SQLAlchemy (bypass Alembic)""" async with self.engine.begin() as conn: - # Создаем все таблицы из метаданных for table in self.metadata.sorted_tables: - try: - if ( - DatabaseInitializer.existing_tables - and table.name in DatabaseInitializer.existing_tables - ): - logger.debug( - f"Таблица {table.name} уже существует. Пропускаем..." - ) - continue - create_stmt = CreateTable(table) - logger.info(f"Создаем таблицу: {table.name}") - await conn.execute(create_stmt) - except Exception as e: - logger.error(f"Ошибка создания таблицы: {str(e)}") - logger.warning("Все таблицы успешно созданы") + if ( + DatabaseInitializer.existing_tables + and table.name in DatabaseInitializer.existing_tables + ): + logger.debug(f"Таблица {table.name} уже существует") + continue + + logger.info(f"Создаем таблицу: {table.name}") + await conn.execute(CreateTable(table)) async def _drop_all(self): """Drop all tables""" async with self.engine.begin() as conn: - # Получаем список всех таблиц existing_tables = await conn.run_sync( lambda sync_conn: inspect(sync_conn).get_table_names() ) for table in existing_tables: - drop_stmt = text( - f'DROP TABLE "{table}" CASCADE' - ) # Кавычки на случай спец. символов - logger.info(f"Удаляем таблицу: {table}") - await conn.execute(drop_stmt) + logger.warning(f"Удаляем таблицу: {table}") + await conn.execute(text(f'DROP TABLE "{table}" CASCADE')) - logger.warning("Все таблицы успешно удалены") + # ========================================================== + # SCHEMA SYNC + # ========================================================== + + async def _sync_schema(self, conn): + await self._add_missing_columns(conn) + await self._add_missing_foreign_keys(conn) + + async def _add_missing_columns(self, conn): + for table_name, table in self.metadata.tables.items(): + + db_columns = await conn.run_sync( + lambda sync_conn: { + col["name"] for col in inspect(sync_conn).get_columns(table_name) + } + ) + + for column in table.columns: + if column.name in db_columns: + continue + + ddl = ( + f"ALTER TABLE {table_name} " + f"ADD COLUMN {self._compile_column(column)}" + ) + + logger.warning(f"[ADD COLUMN] {table_name}.{column.name}") + await conn.execute(text(ddl)) + + async def _add_missing_foreign_keys(self, conn): + for table_name, table in self.metadata.tables.items(): + + db_fks = await conn.run_sync( + lambda sync_conn: inspect(sync_conn).get_foreign_keys(table_name) + ) + + db_fk_pairs = { + ( + tuple(fk["constrained_columns"]), + fk["referred_table"], + ) + for fk in db_fks + } + + for fk in table.foreign_keys: + col = fk.parent.name + ref_table = fk.column.table.name + ref_col = fk.column.name + + key = ((col,), ref_table) + if key in db_fk_pairs: + continue + + constraint_name = f"fk_{table_name}_{col}" + + ddl = f""" + ALTER TABLE {table_name} + ADD CONSTRAINT {constraint_name} + FOREIGN KEY ({col}) + REFERENCES {ref_table}({ref_col}) + """ + + if fk.ondelete: + ddl += f" ON DELETE {fk.ondelete}" + + logger.warning(f"[ADD FK] {table_name}.{col} → {ref_table}.{ref_col}") + await conn.execute(text(ddl)) + + # ========================================================== + # HELPERS + # ========================================================== + + def _compile_column(self, column) -> str: + """Compile SQLAlchemy Column to SQL""" + ddl = f"{column.name} {column.type.compile(dialect=pg_dialect())}" + + if not column.nullable: + ddl += " NULL" # безопасно, NOT NULL позже вручную + + if column.server_default is not None: + ddl += f" DEFAULT {column.server_default.arg}" + + return ddl + + # ========================================================== + # DATA INIT + # ========================================================== async def _initialize_data(self, waiting: bool = False): - """Initialize required data""" - try: logger.info("Инициализация данных...") - logger.warning("Инициализация Прав доступа...") + await AccessLevelHandler.initialize() - logger.warning("Инициализация Пользователей...") await UserHandler.initialize() - logger.warning("Инициализация Туллбоксов...") await ToolboxHandler.initialize() - logger.warning("Инициализация Категорий...") await CategoryHandler.initialize() - logger.warning("Инициализация Инструментов...") await ToolkitHandler.initialize() - logger.warning("Инициализация Складов...") await StocksActions.initialize() + logger.info("Данные успешно инициализированы") - except Exception as e: - logger.error(f"Инициализация данных завершилась ошибкой: {str(e)}") + except Exception: + logger.exception("Ошибка инициализации данных") raise diff --git a/db/schemas/__pycache__/toolkit.cpython-313.pyc b/db/schemas/__pycache__/toolkit.cpython-313.pyc index d8a885e90d364c73f39344d654dd9d290e6d940c..da0a15452054d94c720d0a8c12a9c053576c7e01 100644 GIT binary patch delta 752 zcmZ1|x<-`uGcPX}0}z~LanJPJ$g9D~xMZ>!V_rS05R!L zF{~Uw>m*{Ng3Km6G6}1KjFN#U0f|8zg-pU!^7C3U7s(=2f^_qPbjzWNflZVT=96M5 zQV8Y;l8V6sKvF4K5J)Nq3l*uP3u}r@-pf?U?N-H6TAW%`te2UxxQ&^SQDJgBOG$(b z&~{CxTdbuenK{L`*h=zUGLuVIG8V}L#fw3qrck5|B#ShG#4Wy%{QR8k%o06_G8K>- zK_Jnp%lp;2up|`kTqKPGw%{i@c+ohAS5w^V};2@L4yXb$qAg%jB1njaJH*xz|1W|weS{)O>TZl aX-=wLQPAXcE^U4#M%#{*uM9v6>?#1^nXeWA delta 814 zcmah_&1(}u9NpPuKhkFNy@~eAB*x;}*!Ez>l;}aLSV8<)@gRX^-5t`^bvMjT4k?8e z5h`9h%*CsC5(M$$!IL+yf|q3!{2PjR6r9;cP@!}VZ|41eZ{C~vz0qIl+7C^e5ZKz? z=z8<-w37flCTBsgU1$pCq?t7}GiRpEd`CjXp41e2*%iR$f`Cd1mswZth^YJzt0YVv z_wK-|25m6w^Ivn?)TUIpAWUlR`6xTF)M;m@|u00-8Q%me^J| z%M2T4g<;dw(eZxOsFCmD=q6P!*%&4oaeB-m)Ky9)tJ;^R}!T1{aDAj;L zV(G(rl9EO_)}``r;IiMK0w<#98e$TL5^s?e>-&*34P6h@?42<5A9{F^vo`rEUj!{O zr`!M?5-3+ID9dd$XFMN^S=;2ja#=z$YmfzX_1Yk diff --git a/db/schemas/toolkit.py b/db/schemas/toolkit.py index 7e29222..b6ab954 100644 --- a/db/schemas/toolkit.py +++ b/db/schemas/toolkit.py @@ -14,18 +14,16 @@ class Toolkit(Base): description = Column(Text, nullable=True) specifications = Column(JSONB, default={}) category_id = Column(Integer, ForeignKey("categories.id", ondelete="CASCADE")) - category_data = relationship( - "Category", - cascade="all, delete-orphan", - lazy="joined", - uselist=False, - single_parent=True, - ) image = Column(JSONB) quantity_min = Column(Integer, nullable=True) quantity_min_extra = Column(Integer, nullable=True) external_link = Column(String, nullable=True) hidden = Column(Boolean, default=False) + comment_text = Column(Text, nullable=True) + comment_user_id = Column( + Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True + ) + comment_at = Column(DateTime, nullable=True) created_at = Column(DateTime, default=datetime.now) updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now) refilled_at = Column(DateTime, default=datetime.now)