DmitrMakeev commited on
Commit
d20ecb3
·
verified ·
1 Parent(s): 40ed1ff

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +10 -5
app.py CHANGED
@@ -50,7 +50,7 @@ status = "active"
50
  app = Flask(__name__, template_folder="./")
51
  app.config['DEBUG'] = True
52
  UPLOAD_FOLDER = 'static'
53
-
54
  if not os.path.exists(UPLOAD_FOLDER):
55
  os.makedirs(UPLOAD_FOLDER)
56
 
@@ -776,9 +776,11 @@ def update_or_insert_user(db_name, user_data, mapping_template):
776
  cursor = conn.cursor()
777
 
778
  email = user_data.get('email')
 
779
 
780
  cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
781
  user = cursor.fetchone()
 
782
 
783
  transformed_data = {}
784
  for json_key, db_column in mapping_template.items():
@@ -787,6 +789,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
787
  transformed_data[db_column] = "-1" if value else "0"
788
  else:
789
  transformed_data[db_column] = str(value)
 
790
 
791
  required_fields = [
792
  "vk_id", "chat_id", "ws_st", "ws_stop", "web_st", "fin_prog",
@@ -798,17 +801,20 @@ def update_or_insert_user(db_name, user_data, mapping_template):
798
  for field in required_fields:
799
  if field not in transformed_data:
800
  transformed_data[field] = ""
 
801
 
802
  if 'phone' in user_data:
803
  phone = user_data['phone']
804
  if phone.startswith('+'):
805
  phone = phone[1:]
806
  transformed_data['phone'] = phone
 
807
 
808
  web_st_value = 0
809
  if user:
810
  web_st_value = int(user[0]) if user[0] else 0
811
  web_st_value += 1
 
812
 
813
  update_query = "UPDATE contacts SET "
814
  update_values = []
@@ -817,6 +823,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
817
  update_values.append(value)
818
  update_query += "web_st = ? WHERE email = ?"
819
  update_values.extend([web_st_value, email])
 
820
  cursor.execute(update_query, update_values)
821
 
822
  if cursor.rowcount == 0:
@@ -824,10 +831,12 @@ def update_or_insert_user(db_name, user_data, mapping_template):
824
  placeholders = ', '.join('?' for _ in transformed_data) + ", ?"
825
  insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
826
  insert_values = list(transformed_data.values()) + [web_st_value]
 
827
  cursor.execute(insert_query, insert_values)
828
 
829
  conn.commit()
830
  conn.close()
 
831
 
832
  @app.route('/send_get_request', methods=['GET'])
833
  def send_get_request():
@@ -876,10 +885,6 @@ def send_get_request():
876
 
877
 
878
 
879
-
880
-
881
-
882
-
883
  @app.route('/biz_v', methods=['GET'])
884
  def biz_v():
885
  api_sys_control = request.args.get('api_sys')
 
50
  app = Flask(__name__, template_folder="./")
51
  app.config['DEBUG'] = True
52
  UPLOAD_FOLDER = 'static'
53
+ logging.basicConfig(level=logging.DEBUG)
54
  if not os.path.exists(UPLOAD_FOLDER):
55
  os.makedirs(UPLOAD_FOLDER)
56
 
 
776
  cursor = conn.cursor()
777
 
778
  email = user_data.get('email')
779
+ logging.debug(f"Processing user with email: {email}")
780
 
781
  cursor.execute("SELECT web_st FROM contacts WHERE email = ?", (email,))
782
  user = cursor.fetchone()
783
+ logging.debug(f"User found: {user}")
784
 
785
  transformed_data = {}
786
  for json_key, db_column in mapping_template.items():
 
789
  transformed_data[db_column] = "-1" if value else "0"
790
  else:
791
  transformed_data[db_column] = str(value)
792
+ logging.debug(f"Transformed data: {transformed_data}")
793
 
794
  required_fields = [
795
  "vk_id", "chat_id", "ws_st", "ws_stop", "web_st", "fin_prog",
 
801
  for field in required_fields:
802
  if field not in transformed_data:
803
  transformed_data[field] = ""
804
+ logging.debug(f"Transformed data after adding required fields: {transformed_data}")
805
 
806
  if 'phone' in user_data:
807
  phone = user_data['phone']
808
  if phone.startswith('+'):
809
  phone = phone[1:]
810
  transformed_data['phone'] = phone
811
+ logging.debug(f"Transformed data after phone processing: {transformed_data}")
812
 
813
  web_st_value = 0
814
  if user:
815
  web_st_value = int(user[0]) if user[0] else 0
816
  web_st_value += 1
817
+ logging.debug(f"Calculated web_st_value: {web_st_value}")
818
 
819
  update_query = "UPDATE contacts SET "
820
  update_values = []
 
823
  update_values.append(value)
824
  update_query += "web_st = ? WHERE email = ?"
825
  update_values.extend([web_st_value, email])
826
+ logging.debug(f"Update query: {update_query} with values: {update_values}")
827
  cursor.execute(update_query, update_values)
828
 
829
  if cursor.rowcount == 0:
 
831
  placeholders = ', '.join('?' for _ in transformed_data) + ", ?"
832
  insert_query = f"INSERT INTO contacts ({columns}) VALUES ({placeholders})"
833
  insert_values = list(transformed_data.values()) + [web_st_value]
834
+ logging.debug(f"Insert query: {insert_query} with values: {insert_values}")
835
  cursor.execute(insert_query, insert_values)
836
 
837
  conn.commit()
838
  conn.close()
839
+ logging.debug(f"User with email {email} processed successfully")
840
 
841
  @app.route('/send_get_request', methods=['GET'])
842
  def send_get_request():
 
885
 
886
 
887
 
 
 
 
 
888
  @app.route('/biz_v', methods=['GET'])
889
  def biz_v():
890
  api_sys_control = request.args.get('api_sys')