get_event 指定場次、group_id移動到name

app/api/classes.py

@@ -36,7 +36,6 @@ async def insert_school(
     location_name: str = Form(default=''),
     Lng: str = Form(default=''),
     Lat: str = Form(default=''),
-    group_id : int = Form(default=1),
     address : str = Form(default='')
 ):
     try:
@@ -44,7 +43,6 @@ async def insert_school(
             name=location_name,
             longitude=Lng,
             latitude=Lat,
-            group_id = group_id,
             address = address
         )
         
@@ -59,7 +57,8 @@ async def insert_class_name(
     category: str = Form(default=''),
     introduction: str = Form(default=''),
     organizer: str = Form(default=''),
-    cover_img_file:UploadFile = File(default='')
+    cover_img_file:UploadFile = File(default=''),
+    group_id : int = Form(default=1)
 ):    
     try:
         cover_img = ''
@@ -78,7 +77,8 @@ async def insert_class_name(
             category=category,
             introduction=introduction,
             organizer=organizer,
-            cover_img=cover_img
+            cover_img=cover_img,
+            group_id=group_id
         )
         update_location_time(location_id= location_id)
         return {"msg": "success", "code": 200, "new_class_name_id": new_class_name.id}
@@ -163,7 +163,6 @@ async def update_school(
     location_name: str = Form(default=''),
     Lng: str = Form(default=''),
     Lat: str = Form(default=''),
-    group_id : int = Form(default=1),
     address : str = Form(default='')
 ):
     try:
@@ -178,9 +177,6 @@ async def update_school(
         if  Lat.strip() != '':
             school.latitude =  Lat
 
-        if group_id != 1 :
-            school.group_id = group_id
-
         if  address.strip() != '':
             school.address =  address
 
@@ -199,7 +195,8 @@ async def update_class_name(
     category: str = Form(default=''),
     introduction: str = Form(default=''),
     organizer: str = Form(default=''),
-    cover_img_file:UploadFile = File(default='')
+    cover_img_file:UploadFile = File(default=''),
+    group_id : int = Form(default=1)
 ):
     try:
         class_name = await Class_name.get(id=class_name_id)
@@ -219,6 +216,9 @@ async def update_class_name(
         if organizer.strip() != '':
             class_name.organizer = organizer
 
+        if group_id != 1 :
+            class_name.group_id = group_id
+
         if cover_img_file != '':
             contents = await cover_img_file.read()
 
@@ -420,7 +420,6 @@ async def get_school(
                 "location_name": school_obj.name,
                 "Lng": school_obj.longitude,
                 "Lat": school_obj.latitude,
-                "group_id": school_obj.group_id,
                 "address": school_obj.address,
                 "update_time":school_obj.update_time
             }
@@ -479,6 +478,7 @@ async def get_class_name(
                 "category": class_name_obj.category,
                 "introduction": class_name_obj.introduction,
                 "organizer": class_name_obj.organizer,
+                "group_id": class_name_obj.group_id,
                 "cover_img": class_name_obj.cover_img
             }
             classes_name.append(class_data)

app/models/models.py

@@ -17,7 +17,6 @@ class Schools(Model):
     name = fields.CharField(max_length=45, description="學校名稱")
     longitude = fields.CharField(max_length=100, description="經度")
     latitude = fields.CharField(max_length=100, description="緯度")
-    group_id = fields.IntField(description="學群")
     address = fields.CharField(max_length=128,description="地址")
     update_time = fields.DatetimeField(description="更新時間")
 
@@ -33,6 +32,7 @@ class Class_name(Model):
     introduction = fields.TextField(description="簡介")
     organizer = fields.CharField(max_length=45, description="主辦單位")
     cover_img = fields.CharField(max_length=255, description="封面圖片")
+    group_id = fields.IntField(description="學群")
 
 
 class Class_list(Model):