DmitrMakeev commited on
Commit
f45fa96
·
verified ·
1 Parent(s): bf7fd47

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +28 -31
app.py CHANGED
@@ -1427,7 +1427,7 @@ def gc_forms():
1427
 
1428
  # Глобальная переменная для управления верификацией
1429
  curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
1430
-
1431
 
1432
  mt_avp = {
1433
  'name': 'Name',
@@ -1465,7 +1465,6 @@ mapp_templates = {
1465
 
1466
  DATABASE_NAME3 = 'data_gc.db'
1467
 
1468
-
1469
  def verify_phone_number(phone_number):
1470
  if verifikation_start == "1":
1471
  full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
@@ -1479,46 +1478,44 @@ def verify_phone_number(phone_number):
1479
  response_body = response.json()
1480
  return response_body.get('existsWhatsapp', 'false')
1481
  else:
1482
- return "Error"
1483
  else:
1484
  return "false"
1485
 
1486
  def add_or_update_contact(contact_data):
1487
- conn = sqlite3.connect(DATABASE_NAME3)
1488
- cursor = conn.cursor()
1489
-
1490
- email = contact_data.get('email')
1491
- if not email:
1492
- logging.error(f"Missing email in contact data: {contact_data}")
1493
- return
1494
 
1495
- utc_now = datetime.utcnow()
1496
- msk_tz = pytz.timezone('Europe/Moscow')
1497
- msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
1498
- contact_data['data_t'] = msk_now.strftime('%Y-%m-%d %H:%M:%S')
1499
 
1500
- cursor.execute("SELECT id FROM contacts WHERE email = ?", (email,))
1501
- contact = cursor.fetchone()
 
 
1502
 
1503
- fields = [
1504
- 'name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog',
1505
- 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'shop_st', 'curator',
1506
- 'pr1', 'pr2', 'pr3', 'pr4', 'pr5', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t',
1507
- 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
1508
- ]
1509
 
 
 
 
 
 
 
1510
 
1511
- placeholders = ", ".join([f"{field} = ?" for field in fields])
1512
 
1513
- if contact:
1514
- update_query = f"UPDATE contacts SET {placeholders} WHERE id = ?"
1515
- cursor.execute(update_query, (*[contact_data.get(field, '') for field in fields], contact[0]))
1516
- else:
1517
- insert_query = f"INSERT INTO contacts ({', '.join(fields)}) VALUES ({', '.join(['?' for _ in fields])})"
1518
- cursor.execute(insert_query, tuple(contact_data.get(field, '') for field in fields))
1519
 
1520
- conn.commit()
1521
- conn.close()
1522
 
1523
  @app.route('/add_data_ver_cur', methods=['GET'])
1524
  def add_data_ver_cur():
 
1427
 
1428
  # Глобальная переменная для управления верификацией
1429
  curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
1430
+ current_curator_index = 0
1431
 
1432
  mt_avp = {
1433
  'name': 'Name',
 
1465
 
1466
  DATABASE_NAME3 = 'data_gc.db'
1467
 
 
1468
  def verify_phone_number(phone_number):
1469
  if verifikation_start == "1":
1470
  full_url_ver = f"{wa_url}{wa_ak}{ws_url_ver}{wa_api_key}"
 
1478
  response_body = response.json()
1479
  return response_body.get('existsWhatsapp', 'false')
1480
  else:
1481
+ return "false"
1482
  else:
1483
  return "false"
1484
 
1485
  def add_or_update_contact(contact_data):
1486
+ with sqlite3.connect(DATABASE_NAME3) as conn:
1487
+ cursor = conn.cursor()
 
 
 
 
 
1488
 
1489
+ email = contact_data.get('email')
1490
+ if not email:
1491
+ logging.error(f"Missing email in contact data: {contact_data}")
1492
+ return
1493
 
1494
+ utc_now = datetime.utcnow()
1495
+ msk_tz = pytz.timezone('Europe/Moscow')
1496
+ msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
1497
+ contact_data['data_t'] = msk_now.strftime('%Y-%m-%d %H:%M:%S')
1498
 
1499
+ cursor.execute("SELECT id FROM contacts WHERE email = ?", (email,))
1500
+ contact = cursor.fetchone()
 
 
 
 
1501
 
1502
+ fields = [
1503
+ 'name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog',
1504
+ 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'shop_st', 'curator',
1505
+ 'pr1', 'pr2', 'pr3', 'pr4', 'pr5', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t',
1506
+ 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
1507
+ ]
1508
 
1509
+ placeholders = ", ".join([f"{field} = ?" for field in fields])
1510
 
1511
+ if contact:
1512
+ update_query = f"UPDATE contacts SET {placeholders} WHERE id = ?"
1513
+ cursor.execute(update_query, (*[contact_data.get(field, '') for field in fields], contact[0]))
1514
+ else:
1515
+ insert_query = f"INSERT INTO contacts ({', '.join(fields)}) VALUES ({', '.join(['?' for _ in fields])})"
1516
+ cursor.execute(insert_query, tuple(contact_data.get(field, '') for field in fields))
1517
 
1518
+ conn.commit()
 
1519
 
1520
  @app.route('/add_data_ver_cur', methods=['GET'])
1521
  def add_data_ver_cur():