From 308b7199635b152bc667d87bc30c3dfea555b6b6 Mon Sep 17 00:00:00 2001
From: ada-dmitry <ada.dmitry@gmail.com>
Date: Sun, 28 Apr 2024 13:37:53 +0300
Subject: [PATCH] 0.2

---
 __pycache__/dbtable.cpython-311.pyc           | Bin 7791 -> 6975 bytes
 dbtable.py                                    |   9 ------
 main.py                                       |   4 +--
 tables/__pycache__/cath_table.cpython-311.pyc | Bin 1792 -> 2370 bytes
 tables/__pycache__/dish_table.cpython-311.pyc | Bin 1911 -> 1929 bytes
 tables/cath_table.py                          |  27 ++++++++++++------
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/__pycache__/dbtable.cpython-311.pyc b/__pycache__/dbtable.cpython-311.pyc
index 2cfa8586ad0acbac24b98eadd3a5665f03c9b67a..8f798779d06151b84349b0fed65ac2cec26042ce 100644
GIT binary patch
delta 391
zcmaEFv)_zwIWI340}wc>>ZQeVP2@{sOqf`jz{(iRpvk}Sfg|_k`+U)ij9Qbe1!@^f
zHt!T*WRl6VP-Z9*18IVQEFL(Ece0SMDkI<ILQav%ADH+iM+v(z@=snUY&H3Ta2cB+
zP+hU!<QS3b63m<$H+cB_y}P_;Fkj@6xxyoJ0gNUmiF)#jx-c*tVK8zrWj<oU=wiBg
zmuNR5qvK>ZaWzKA&AH;28QFq>CKUxwc9U#p^qG84Qj0AFB;YvtpQH+-=VoQ8(~OLP
zliy1l19d6OC<z3DWWzxOFObj_oE$0>B<cj>`-6xu5D^6;VkaMzQDnS7`LRsD94jmT
q2L?F7#|PrV35Ch?W%C)6CiBZF+6OT*%6(wKPJRT7f59OOb`Ai_8eN(I

delta 794
zcmZ{gUr19?9LLYOclU0#`_Ijsn`3Ufnr+n@Gct2EwszMa(`agjLNwX-Fh;^OqoHUJ
zBo&DKUQ8m_Q$1Gep|>FFsRz9_aM**?d!<k>J$243A*dgR55M2{_dS1p=k?KVVd;q|
z?m;B_Jb~;>^MaJc*@f#@&GKzDT%X4M$frEth?-$j+>7(@r6I&IQ%stHZCkHMb`=Sx
zsbV0C9ac=TQY3Pkqugo2X=^vjPO)&S$p*7^vIC<jlw(Q17CFP8tYm~w2Jb<P(uiEk
z_Z5Y>c3vCM+==9cUU$*x9y+5XHTMQ8GAG)LOnbM_1g{hoA|f~AGZg3)8|-8%UkH<|
zaFSr0p6w=4Fw-WV&g3%_nW7XQ9Y~GlGl8AjPn{)#SyYvrixbN;OEY>)u+kFLrQjS}
zHJRsbE{2vnmpV&F*44<G8qw8gMUCpsu}X7Hmt(rACHA+k<3adgSeM(Mw(4>~Hw9qD
z9OYL{9<o4Yn#(~UfpG|Kh|~C4`G<%Za4R-!rt`Znx^_%O6HVknzavL~x)wPJEJ_=e
zsS$>i1Xkd&a-9AEd{id+E@B$jV5olmu%T{$RgmX<?)EIQy5Ot`&Q-x#6_oouBwZKO
zH9^&dwu;cUT3e8?oRvG`F7(zF(yZ(|3)ZaVN0xgSYv6C#htHKSHhjSRC2~Pw2>gwA
z@F2Ws^z)agpuy+HR-7ywZSOHRNE9FZv>xD6`8;VE?OtV=x<)AIBt8pt*^`b_v`$d;
zQ`9_HXqJMK-Gjfv8~gkrp7U;@T__wUZ=qdCGA(!Eg)zq%&cdd{6B)tSwT1r8?VA4m
JKi%3Be*tJE$$9_)

diff --git a/dbtable.py b/dbtable.py
index 1d08c37..62b955f 100644
--- a/dbtable.py
+++ b/dbtable.py
@@ -38,14 +38,6 @@ class DbTable:
         cur.execute(sql)
         self.dbconn.conn.commit()
         return
-    
-    def delete(self, val):
-        sql = "DELETE FROM " + self.table_name()
-        sql += " WHERE " + "".join(self.column_names_without_id())
-        sql += "=" + "'" + "".join(val) + "';"
-        cur = self.dbconn.conn.cursor()
-        cur.execute(sql)
-        self.dbconn.conn.commit()
 
     def drop(self):
         sql = "DROP TABLE IF EXISTS " + self.table_name()
@@ -66,7 +58,6 @@ class DbTable:
         cur = self.dbconn.conn.cursor()
         try:
             cur.execute(sql)
-            self.dbconn.conn.commit()
         except psycopg2.errors.UniqueViolation:
             self.dbconn.conn.rollback()
         return
diff --git a/main.py b/main.py
index 2a068b2..1cf95c4 100644
--- a/main.py
+++ b/main.py
@@ -138,11 +138,11 @@ class Main:
         if self.cath_id == -1:
             while True:
                 name = input("Укажите название категории для вывода блюд (0 - отмена):")
-                while len(name.strip()) == 0:
+                while len(name.strip()) == '':
                     name = input("Пустая строка. Повторите ввод! Укажите название категории для вывода блюд (0 - отмена):")
                 if name == "0":
                     return "1"
-                cath = CathTable().find_by_position(int(name))
+                cath = CathTable().find_by_name(name)
                 if not cath:
                     print("Введено неверное название!")
                 else:
diff --git a/tables/__pycache__/cath_table.cpython-311.pyc b/tables/__pycache__/cath_table.cpython-311.pyc
index d8e8f0f582a4976741398b63c7f87403a2c2533e..8b568cb244f0f470a02d19eecf7fc36e705c9a59 100644
GIT binary patch
delta 1028
zcmZvZK~EDw6vt<Gw%ZA9w@3+)w9uAXN~5Vn(H?*xVAX@70*Q$+Y0B<mTT2_aMZ#vG
z96TT)0kQ{?n6Tj>BwqB!jl@sTA)7#Y@*`m6q9<pT7DarS{qN-cXXd@U-=grfN!W3@
z8UTs?aBS))w=SfatLw9ohBx4uUE;?<)c$2V%Q89L1>>9q4Mu+gJ-P^QT_Sf>7Xb6D
z#!6?77ii2!27piGI}MfmBpX$I8$RzoZ!$mwSy(#>vRr*<*sU^Gp!+ccBtY8WM^)#Y
z#Dl~{B5-%?(Zhgh4?Mk}7)u1IKxGFaDjVsGB8Bt=s$8~^$yZy&LT+X{pUkJG<zjL+
zQ%V<RO393*?{e*BUMx&cXG&2{anKv^bt+ed#aBec8Kp?u2#`>m)Z`^OCzoWkaU@kr
zPoySua_ltINZg`9WDy(*zKzmWd9#fDJ*K}03q4El2sxJKHm+~QH{(X{VQBCmG>Ah(
zW@rd|yN6BhFm?}PG<^QtjraW@`msB*dl|c97{&CGEttfp%|vY#)OLiND-N<fME(Qh
z$0%r`V5Pnkfpj9WMCw83O1~dfBJb#=>ki1C;W60yq|rPpF&Z#nEzul=8kAU#u?Rv-
zIjR<QsIdk|PqqRLUVzFPw)(SW0?#(8y2lB;k%>S?s_|>C@e|2ZEl7cZK;#!gR$r7?
z5UHbhsraZ+u1Y(RDw>i@V!Du*>+CoRSP4?kP6#H8a_$_!GN?MIGI=REIcJqoTmEqT
zJKsiLD5i-}noTP&O`+pZ2p<SxEJREpvIM_1g$!w@uwB4iakDFqo8n9MBjm1lVxOC_
z=jI;7p1wU1dxkI?qK;$LvFup87sSYCB3}jhjs?)@S=E-cw+kx^71VAK8;v4;-`2}_
zlFCX{Kd}Xwq~5~!g?ZlAc?`~^(P`^A2LFowg1^mN(|7q`+|LmIqO94!)9lHAEUW%+
DT3-g~

delta 547
zcmX>k)WFBLoR^o20SH!z>!nFDPvpyBRGV0?&JxU^$+mGt78AD-BLl;9h7`sch6R%a
z*@Pz>FiY`N@iH*fGSx7pFfU*P3nns~al*t{CSPNYQAlB}VN7AG0veskxQvN`VKop#
z03$;U^8$9Tw*72EsqB7Le8H|huFfF}S_*DK{=N!TTnhd{F0MfePLT>#OgaixQVKqv
zzMdfph6?^}Zo#f03aT3UX=%l&C7Q*z*dVNzKvyzoaufj_!ElQuD?c;u7I#5WW^Q6p
zWqfvO<>WIgvZ5SmsU^u7`FW|DEJfTPb<BCCxs(5}NY)FaW#*;CCsoE5<QHd_Waj5p
zNjWE$WP~Ip<)rGN%LxLt7WV;(28IWGatlP3%P*3@sAzOW(dZ(dQ3vx44(^VciyYDr
zR!M(lSLF<m>ynz6BsDKeYG0AmzR0h0g<t0)hYnc91%B;|OdQ&iC$K7N&Cpojyh3rI
z`vpm$wC)uS-3uJLH~5A6Yr1MW>w4-gaL5+%0qynEWS{(&-GotjvO0$%W58rj4r?(E
n4pzAj4Cut<l^hO?nv-8~D4L5f0_8D@3G5$1qF=B`f$ahSmMWLf

diff --git a/tables/__pycache__/dish_table.cpython-311.pyc b/tables/__pycache__/dish_table.cpython-311.pyc
index da22a235976ec2cd80c716639129e99c3bfe5afe..f8401dadef764deaed383a4d1e086ac61f4bf616 100644
GIT binary patch
delta 78
zcmey)*U8VjoR^o20SG25>ZNVl$a|GhO*P2X%{9o?&)GFtAvv)mLnAXqQ^DU)!Nt|b
eHN;iH*)iDJ(ZzN0H^w>a(HEpaX!A^_dn^EAxEJdH

delta 60
zcmeC=|IWv|oR^o20SKxT_0pDX<h{x$A{^xE<{ISc=j<A+kepbOp^=%QIhliL4!h?C
MX%O1Hn&}=30P^|~_W%F@

diff --git a/tables/cath_table.py b/tables/cath_table.py
index 369e087..2b4e5b0 100644
--- a/tables/cath_table.py
+++ b/tables/cath_table.py
@@ -13,14 +13,25 @@ class CathTable(DbTable):
     def table_constraints(self):
         return ['CONSTRAINT "Name" UNIQUE (cath_name)']
     
-    
-    def find_by_position(self, num):
-        
-        sql = "SELECT * FROM " + self.table_name()
-        sql += " ORDER BY "
-        sql += ", ".join(self.primary_key())
-        sql += " LIMIT 1 OFFSET %(offset)s"
+    def delete(self, val):
+        sql = "DELETE FROM " + self.table_name()
+        sql += " WHERE " + "".join(self.column_names_without_id())
+        sql += "=" + "'" + "".join(val) + "';"
         cur = self.dbconn.conn.cursor()
-        cur.execute(sql, {"offset": num - 1})
+        cur.execute(sql)
+        self.dbconn.conn.commit()
+    
+    def find_by_name(self, name):
+        cur = self.dbconn.conn.cursor()
+        
+        sql_sel = "SELECT id FROM " + self.table_name()
+        sql_sel += " WHERE cath_name = " + "'" + name + "'" + ";"
+        cur.execute(sql_sel) 
+        # sql = "SELECT * FROM " + self.table_name()
+        # sql += " ORDER BY "
+        # sql += ", ".join(self.primary_key())
+        # sql += " LIMIT 1 OFFSET %(offset)s"
+        # cur.execute(sql, {"offset": num - 1})
+        # print(cur)
         return cur.fetchone()