DmitrMakeev commited on
Commit
2f6e1c8
·
verified ·
1 Parent(s): 36809b2

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -10
app.py CHANGED
@@ -2076,17 +2076,19 @@ def from_allow():
2076
  msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
2077
  data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
2078
 
 
 
 
 
2079
  if result:
2080
- cursor.execute("""
2081
- UPDATE contacts
2082
- SET pr5 = ?, data_on = ?
2083
- WHERE email = ? OR phone = ?
2084
- """, (pr5_json, data_on, email, phone))
2085
  else:
2086
- cursor.execute("""
2087
- INSERT INTO contacts (name, email, phone, pr5, data_on)
2088
- VALUES (?, ?, ?, ?, ?)
2089
- """, (name, email, phone, pr5_json, data_on))
2090
 
2091
  conn.commit()
2092
  replace_null_with_empty_string(conn)
@@ -2115,7 +2117,6 @@ def from_allow():
2115
 
2116
 
2117
 
2118
-
2119
  @app.route('/gc_in', methods=['GET'])
2120
  def add_data_gc_in():
2121
  global current_curator_index
 
2076
  msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
2077
  data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
2078
 
2079
+ # Обновление или вставка данных в таблицу contacts
2080
+ columns_to_update = ['name', 'phone', 'email', 'pr5', 'data_on']
2081
+ values_to_update = [name, phone, email, pr5_json, data_on]
2082
+
2083
  if result:
2084
+ # Обновляем только те поля, которые переданы в запросе
2085
+ set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
2086
+ query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ?"
2087
+ cursor.execute(query, values_to_update + [email, phone])
 
2088
  else:
2089
+ # Вставляем новые данные
2090
+ query = f"INSERT INTO contacts ({', '.join(columns_to_update)}) VALUES ({', '.join(['?' for _ in columns_to_update])})"
2091
+ cursor.execute(query, values_to_update)
 
2092
 
2093
  conn.commit()
2094
  replace_null_with_empty_string(conn)
 
2117
 
2118
 
2119
 
 
2120
  @app.route('/gc_in', methods=['GET'])
2121
  def add_data_gc_in():
2122
  global current_curator_index