Переглянути джерело

seperate simple and detail request

ming 3 роки тому
батько
коміт
2f080b7ff6
1 змінених файлів з 29 додано та 6 видалено
  1. 29 6
      api/main.py

+ 29 - 6
api/main.py

@@ -1,4 +1,6 @@
 from enum import Enum
+import time
+from datetime import datetime
 from typing import Optional
 from pydantic import BaseModel
 from fastapi import FastAPI, Query, UploadFile, File
@@ -27,6 +29,12 @@ class deco_request(BaseModel):
     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
@@ -38,24 +46,39 @@ class deco_request(BaseModel):
     bath_num: int
     style: str
     prefer_date: str
+    time_stamp: str
+    gender: str
     
 @app.get("/deco_request")
-async def get_tags():
+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})
+        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_tags(req: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("/deco_request_detail")
+async def create_req_detail(req:deco_request_detail):
     request_table = db['deco_request']
+    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})
+    ,'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
     return req