Merge branch 'master' of http://git.choozmo.com:3000/choozmo/NFTBoard into master

api/main.py

@@ -43,7 +43,7 @@ class ContactUs(BaseModel):
     coop_ad: Optional[bool] = 0
     coop_acting: Optional[bool] = 0
     coop_marketing: Optional[bool] = 0
-    work_address: str
+    work_address: Optional[str] = ''
 
 
 @app.get("/showdata/{limit}")
@@ -82,25 +82,45 @@ async def add_contact_us_client_info(req: ContactUs):
     table = db['ContactUs']
     time_stamp = datetime.fromtimestamp(time.time()).strftime("%Y-%m-%d %H:%M:%S")
 
-    statement = 'SELECT COUNT(1) FROM ContactUs WHERE email = "'+ req.email +'"'
-    if first(db.query(statement))['COUNT(1)'] == 0:
-        table.insert(
-            {
-                'country_code':req.country_code,
-                'username': req.username,
-                'email': req.email,
-                'phone': req.phone,
-                'coop_dif': req.coop_dif,
-                'coop_ad': req.coop_ad,
-                'coop_acting': req.coop_acting,
-                'coop_marketing': req.coop_marketing,
-                'work_address': req.work_address,
-                'timestamp': time_stamp
-            }
-        )
-        code = 0
-        # 更新sheet
-        make_contact_us_df()
+    # 會根據email做判斷，此處先comment給測試使用。
+    # statement = 'SELECT COUNT(1) FROM ContactUs WHERE email = "'+ req.email +'"'
+    # if first(db.query(statement))['COUNT(1)'] == 0:
+    #     table.insert(
+    #         {
+    #             'country_code':req.country_code,
+    #             'username': req.username,
+    #             'email': req.email,
+    #             'phone': req.phone,
+    #             'coop_dif': req.coop_dif,
+    #             'coop_ad': req.coop_ad,
+    #             'coop_acting': req.coop_acting,
+    #             'coop_marketing': req.coop_marketing,
+    #             'work_address': req.work_address,
+    #             'timestamp': time_stamp
+    #         }
+    #     )
+    #     code = 0
+    #     # 更新sheet
+    #     make_contact_us_df()
+
+    table.insert(
+        {
+            'country_code':req.country_code,
+            'username': req.username,
+            'email': req.email,
+            'phone': req.phone,
+            'coop_dif': req.coop_dif,
+            'coop_ad': req.coop_ad,
+            'coop_acting': req.coop_acting,
+            'coop_marketing': req.coop_marketing,
+            'work_address': req.work_address,
+            'timestamp': time_stamp
+        }
+    )
+    code = 0
+    # 更新sheet
+    make_contact_us_df()
+
     return {'msg':code}#0 means succss added, 1 means email is duplicated
 
 
@@ -137,7 +157,7 @@ def make_contact_us_df():
         
         df = df.append({'id':  row['id'], '國家區域': row['country_code'], '姓名': row['username'], '聯絡Email': row['email'], '聯絡手機': row['phone'],  '合作方式_異業合作': row['coop_dif'], '合作方式_廣告刊登': row['coop_ad'], '合作方式_代理發行':  row['coop_acting'], '合作方式_知識產權行銷': row['coop_marketing'], '作品連結': row['work_address'], '申請時間': row['timestamp']}, ignore_index=True)
     df = df[['id', '國家區域', '姓名', '聯絡Email', '聯絡手機', '合作方式_異業合作', '合作方式_廣告刊登', '合作方式_代理發行', '合作方式_知識產權行銷', '作品連結', '申請時間']]
-    print(df)
+    # print(df)
     save_sheet(df, '聯絡NFTBoard (回應)', 'Sheet1',  json_name='cred.json')