addd main

api/main.py

@@ -26,30 +26,7 @@ app.add_middleware(
 )
 db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/hhh?charset=utf8mb4')
 
-class deco_request(BaseModel):
-    id: int
-    name: str
-    email: str
-    phone: str
-    
-class deco_request_detail(BaseModel):
-    id: int
-    name: str
-    email: str
-    phone: str
-    #detail
-    loc: str
-    h_class: str
-    type: str
-    budget: str
-    size: float
-    bed_num: int
-    liv_num: int
-    bath_num: int
-    style: str
-    prefer_date: str
-    time_stamp: str
-    gender: str
+
 
 class client_info(BaseModel):
     name:str
@@ -61,46 +38,18 @@ class client_info(BaseModel):
     where_learn:str
     why_sign:str
     
-@app.get("/deco_request")
-async def get_req():
-    request_table = db['deco_request']
-    statement = 'SELECT * FROM deco_request'
-    reqs = []
-    for req in db.query(statement):
-        reqs.append({'name':req['name'],'email':req['email'],'phone':req['phone'],'loc':req['loc']
-    ,'h_class':req['h_class'],'type':req['type'],'budget':req['budget'],'size':req['size'],'bed_num':req['bed_num']
-    ,'liv_num':req['liv_num'],'bath_num':req['bath_num'],'style':req['style'],'prefer_date':req['prefer_date'],'gender':req.gender})
-    return reqs
 
-@app.post("/deco_request")
-async def create_req(req:deco_request):
-    request_table = db['deco_request']
-    time_stamp = datetime.fromtimestamp(time.time())
-    time_stamp = time_stamp.strftime("%Y-%m-%d %H:%M:%S")
- 
-    pk = request_table.insert({'name':req.name,'email':req.email,'phone':req.phone,'time_stamp':time_stamp})
-    req.id = pk
-    return req
 
 @app.post("/add_client_info")
 async def add_client_info(ci:client_info):
-    request_table = db['client_info']
-    time_stamp = datetime.fromtimestamp(time.time())
-    time_stamp = time_stamp.strftime("%Y-%m-%d %H:%M:%S")
- 
-    pk = request_table.insert({'name':ci.name,'organization':ci.organization,'position':ci.position,'phone':ci.phone,'email':ci.email
-    ,'cert_last5':ci.cert_last5,'where_learn':ci.where_learn,'why_sign':ci.why_sign,'time_stamp':time_stamp})
     
-    return pk
-@app.post("/deco_request_detail")
-async def create_req_detail(req:deco_request_detail):
     
-    statement = 'SELECT * FROM deco_request WHERE email="'+req.email+'"'
+    statement = 'SELECT * FROM client_info WHERE email="'+ci.email+'"'
     email_cnt = 0
     for row in db.query(statement):
         email_cnt = email_cnt + 1
     
-    statement = 'SELECT * FROM deco_request WHERE phone="'+req.phone+'"'
+    statement = 'SELECT * FROM client_info WHERE phone="'+ci.phone+'"'
     phone_cnt = 0
     for row in db.query(statement):
         phone_cnt = phone_cnt + 1
@@ -115,17 +64,20 @@ async def create_req_detail(req:deco_request_detail):
         return_code = 3
     
     if return_code ==0 :
-        request_table = db['deco_request']
+        request_table = db['client_info']
         time_stamp = datetime.fromtimestamp(time.time())
         time_stamp = time_stamp.strftime("%Y-%m-%d %H:%M:%S")
-        req.time_stamp = time_stamp
-        pk = request_table.insert({'name':req.name,'email':req.email,'phone':req.phone,'loc':req.loc
-        ,'h_class':req.h_class,'type':req.type,'budget':req.budget,'size':req.size,'bed_num':req.bed_num
-        ,'liv_num':req.liv_num,'bath_num':req.bath_num,'style':req.style,'prefer_date':req.prefer_date,'time_stamp':req.time_stamp,'gender':req.gender})
-        req.id = pk
+ 
+        pk = request_table.insert({'name':ci.name,'organization':ci.organization,'position':ci.position,'phone':ci.phone,'email':ci.email
+            ,'cert_last5':ci.cert_last5,'where_learn':ci.where_learn,'why_sign':ci.why_sign,'time_stamp':time_stamp})
+        
         return return_code
     else :
         return return_code
+
+
+    return return_code
+