Merge pull request #84 from osamhack2021/api수정및오타수정

B-1Go · web-flow · commit 09cdd61d98be · 2021-10-18T18:36:30.000+09:00
unit brr 수정
diff --git a/App(BE)/main/api/unit.py b/App(BE)/main/api/unit.py
@@ -224,235 +224,4 @@ def Unit_books_list_ret(Unit_name, isbn, user_id):
         else :
             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
             resultJson = json.dumps(jsl, ensure_ascii=False)
-            return Response(resultJson,mimetype="application/json",status=201)
-
-
-#-------------------------------------------------------------------------------------------------------------------------------------------------
-# #Unit blueprint
-# from flask import Blueprint, json, Response
-# from main.models import database
-
-# unit_page=Blueprint('unit',__name__)
-
-# @unit_page.route('/',methods=['GET'])
-# def unit_name():
-#     u = []
-#     for i in range(0,len(database.Unit.objects())):
-#         u.append(database.Unit.objects[i].name)
-#     jsl = {'Unit_name': u }
-#     resultJson = json.dumps(jsl, ensure_ascii=False)
-#     return Response(resultJson,mimetype="application/json",status=200)
-
-# @unit_page.route('/<Unit_name>&<page>', methods=['GET'])
-# def Unit_books_list(Unit_name, page):
-#     page = int(page)
-#     if page <= 0:
-#         page = 1
-#     p1 = (page-1)*18
-#     p2 = page*18
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         if (len(database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list'])/18)+1 == page:
-#             p1 = page*18
-#             p2 = page*18+len(database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list'])%18
-#         if (len(database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list'])/18)+1 < page:
-#             p1 = 0
-#             p2 = 0
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list'][p1:p2]:
-#             q.append(i.to_json())
-#         result = {'name': '{}'.format(Unit_name), 'books_list': q}
-#         resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-
-# @unit_page.route('/best/Unit_name=<Unit_name>', methods=['GET'])
-# def Unit_books_best(Unit_name):
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{0}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list']:
-#             q.append(i.to_json())
-#         jsl = sorted(q, key=(lambda x: x['score']) , reverse=True)
-#         result = {'name': '{}'.format(Unit_name), 'books_list': jsl[0:10]}
-#         resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-
-# @unit_page.route('/new/Unit_name=<Unit_name>', methods=['GET'])
-# def Unit_books_new(Unit_name):
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{0}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list']:
-#             q.append(i.to_json())
-#         jsl = sorted(q, key=(lambda x: x['score']))
-#         result = {'name': '{}'.format(Unit_name), 'books_list': jsl[0:10]}
-#         resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-
-# @unit_page.route('/chk/Unit_name=<Unit_name>&isbn=<isbn>', methods=['GET'])
-# def Unit_books_list_chk_isbn(Unit_name, isbn):
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list']:
-#             if i['isbn'] == '{}'.format(isbn):
-#                 q.append({'title': i['title'],'isbn': i['isbn'],'isbn13': i['isbn13'],'state': i['state'],'user_id': i['user_id'],'score': i['score'],'link': i['link'],'author': i['author'],'pubDate': i['pubDate'],'description': i['description'],'creator': i['creator'],'cover': i['cover'],'categoryId': i['categoryId'],'categoryName': i['categoryName'],'publisher': i['publisher'],'customerReviewRank': i['customerReviewRank'],'_cls': 'Embook'})
-#         if q == []:
-#             result = {'Error': 'isbn를 다시 한번 확인해주세요.'}
-#             resultJson = json.dumps(result, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             result = {'name': '{}'.format(Unit_name), 'books_list': q}
-#             resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-
-# @unit_page.route('/chk/Unit_name=<Unit_name>&user_id=<user_id>', methods=['GET'])
-# def Unit_books_list_chk_user_id(Unit_name, user_id):
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list']:
-#             if i['user_id'] == '{}'.format(user_id):
-#                 q.append({'title': i['title'],'isbn': i['isbn'],'isbn13': i['isbn13'],'state': i['state'],'user_id': i['user_id'],'score': i['score'],'link': i['link'],'author': i['author'],'pubDate': i['pubDate'],'description': i['description'],'creator': i['creator'],'cover': i['cover'],'categoryId': i['categoryId'],'categoryName': i['categoryName'],'publisher': i['publisher'],'customerReviewRank': i['customerReviewRank'],'_cls': 'Embook'})
-#         if q == []:
-#             result = {'Error': '해당 사용자는 대여중인 도서가 없습니다. 또는 user_id를 다시 한번 확인해주세요.'}
-#             resultJson = json.dumps(result, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             result = {'name': '{}'.format(Unit_name), 'books_list': q}
-#             resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-
-# @unit_page.route('/brr/Unit_name=<Unit_name>&isbn=<isbn>&user_id=<user_id>', methods=['POST'])
-# def Unit_books_list_brr(Unit_name, isbn, user_id):
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list']:
-#             if i['isbn'] == '{}'.format(isbn):
-#                 if i['state'] == 0:
-#                     q = {'title': i['title'],'isbn': i['isbn'],'isbn13': i['isbn13'],'state': 1,'user_id': '{}'.format(user_id),'score': i['score'] + 1,'link': i['link'],'author': i['author'],'pubDate': i['pubDate'],'description': i['description'],'creator': i['creator'],'cover': i['cover'],'categoryId': i['categoryId'],'categoryName': i['categoryName'],'publisher': i['publisher'],'customerReviewRank': i['customerReviewRank'],'_cls': 'Embook'}
-#                 else :
-#                     result = {'Error': '대여된 책입니다.'}
-#                     resultJson = json.dumps(result, ensure_ascii=False)
-#                     return Response(resultJson,mimetype="application/json",status=201)
-#         if q == []:
-#             result = {'Error': 'Unit_name, isbn, user_id를 다시 한번 확인해주세요.'}
-#             resultJson = json.dumps(result, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             database.client.API_test.unit.update({'name':'{}'.format(Unit_name)}, {'$pull': {'books_list': {'isbn':'{}'.format(isbn)}}})
-#             database.client.API_test.unit.update({'name':'{}'.format(Unit_name)}, {'$push': {'books_list': q}})
-#         result = {'name': '{}'.format(Unit_name), 'books_list': q}
-#         resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-
-
-# @unit_page.route('/ret/Unit_name=<Unit_name>&isbn=<isbn>&user_id=<user_id>', methods=['POST'])
-# def Unit_books_list_ret(Unit_name, isbn, user_id):
-#     c = 0
-#     for i in range(0,len(database.Unit.objects())):
-#         if database.Unit.objects[i].name == '{}'.format(Unit_name):
-#             c += 1
-#     if c == 1 :
-#         q = []
-#         for i in database.Unit.objects(name='{}'.format(Unit_name))[0]['books_list']:
-#             if i['isbn'] == '{}'.format(isbn):
-#                 if i['user_id'] == '{}'.format(user_id):
-#                     if i['state'] == 1:
-#                         q = {'title': i['title'],'isbn': i['isbn'],'isbn13': i['isbn13'],'state': 0,'user_id': '','score': i['score'],'link': i['link'],'author': i['author'],'pubDate': i['pubDate'],'description': i['description'],'creator': i['creator'],'cover': i['cover'],'categoryId': i['categoryId'],'categoryName': i['categoryName'],'publisher': i['publisher'],'customerReviewRank': i['customerReviewRank'],'_cls': 'Embook'}
-#                     else :
-#                         result = {'Error': '반납된 책입니다.'}
-#                         resultJson = json.dumps(result, ensure_ascii=False)
-#                         return Response(resultJson,mimetype="application/json",status=201)
-#         if q == []:
-#             result = {'Error': 'Unit_name, isbn, user_id를 다시 한번 확인해주세요.'}
-#             resultJson = json.dumps(result, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             database.client.API_test.unit.update({'name':'{}'.format(Unit_name)}, {'$pull': {'books_list': {'isbn':'{}'.format(isbn)}}})
-#             database.client.API_test.unit.update({'name':'{}'.format(Unit_name)}, {'$push': {'books_list': q}})
-#         result = {'name': '{}'.format(Unit_name), 'books_list': q}
-#         resultJson = json.dumps(result, ensure_ascii=False)
-#         return Response(resultJson,mimetype="application/json",status=200)
-#     else :
-#         if c == 0 :
-#             jsl = {'Error': '부대가 없거나 올바른 부대를 입력해주세요.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
-#         else :
-#             jsl = {'Error': '동일한 부대 데이터가 2개이상 존재합니다.'}
-#             resultJson = json.dumps(jsl, ensure_ascii=False)
-#             return Response(resultJson,mimetype="application/json",status=201)
+            return Response(resultJson,mimetype="application/json",status=201)
diff --git a/App(BE)/main/models/database.py b/App(BE)/main/models/database.py
@@ -1,7 +1,6 @@
-import pymongo
 from pymongo import MongoClient
 from flask_mongoengine import MongoEngine
-from mongoengine import StringField,ListField,EmailField,IntField,ImageField,DateField
+from mongoengine import StringField,ListField,EmailField,IntField,DateField
 from ..app import app
 database_name = "API_test"
 uri  = "mongodb+srv://DevLib_Backend1:OSAMHackathonDevLibBackend1@cluster0.5ublg.mongodb.net/{}?retryWrites=true&w=majority".format(database_name) # 몽고db커넥트url 넣으면 되요
@@ -91,51 +90,6 @@ def to_json(self):
     "board_number":self.board_number,
     "tag":self.tag
     }
-class Unit(db.Document):
-  # objectid(고유번호) = auto_create or insert
-  name = StringField()
-  books_list = ListField()
-  def to_json(self):
-    return {
-    "name":self.name,
-    "books_list":self.books_list,
-    }
-class Embook(db.EmbeddedDocument):
-  title = StringField()
-  isbn = StringField()
-  isbn13 = StringField()
-  link = StringField()
-  author = StringField()
-  pubDate = StringField() # publication_date
-  description = StringField()
-  creator = StringField()
-  cover = StringField()
-  categoryId = IntField()
-  categoryName = StringField() # tag
-  publisher = StringField()
-  customerReviewRank = IntField()
-  state = IntField()
-  user_id = StringField()
-  score = IntField()
-  def to_json(self):
-    return {
-    "title":self.title,
-    "isbn":self.isbn,
-    "isbn13":self.isbn13,
-    "link": self.link,
-    "author": self.author,
-    "pubDate": self.pubDate,
-    "description": self.description,
-    "creator": self.creator,
-    "cover": self.cover,
-    "categoryId": self.categoryId,
-    "categoryName": self.categoryName,
-    "publisher": self.publisher,
-    "customerReviewRank": self.customerReviewRank,
-    "state":self.state,
-    "user_id":self.user_id,
-    "score":self.score,
-    }
 class Searchlog(db.Document):
   # objectid(고유번호) = auto_create or insert
   user_id = StringField()
@@ -146,13 +100,13 @@ def to_json(self):
         "log": self.log,
     }
 class Unittest(db.Document):
-  name = db.StringField()
-  title = db.StringField()
-  isbn = db.StringField()
-  isbn13 = db.StringField()
-  state = db.IntField()
-  user_id = db.StringField()
-  score = db.IntField()
+  name = StringField()
+  title = StringField()
+  isbn = StringField()
+  isbn13 = StringField()
+  state = IntField()
+  user_id = StringField()
+  score = IntField()
   def to_json(self):
     return {
     "name":self.name,
