diff --git a/.DS_Store b/.DS_Store index f7138c0..887aab2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/BankingServer/.DS_Store b/BankingServer/.DS_Store index 58ac9e3..ad6c2d4 100644 Binary files a/BankingServer/.DS_Store and b/BankingServer/.DS_Store differ diff --git a/BankingServer/BankingServer/.DS_Store b/BankingServer/BankingServer/.DS_Store index a5fd301..bd70e28 100644 Binary files a/BankingServer/BankingServer/.DS_Store and b/BankingServer/BankingServer/.DS_Store differ diff --git a/BankingServer/BankingServer/resnetModel/best_resnet34_weights(911).pth b/BankingServer/BankingServer/resnetModel/best_resnet34_weights(911_v2).pth similarity index 84% rename from BankingServer/BankingServer/resnetModel/best_resnet34_weights(911).pth rename to BankingServer/BankingServer/resnetModel/best_resnet34_weights(911_v2).pth index 4826e1f..ef9c8e8 100644 Binary files a/BankingServer/BankingServer/resnetModel/best_resnet34_weights(911).pth and b/BankingServer/BankingServer/resnetModel/best_resnet34_weights(911_v2).pth differ diff --git a/BankingServer/BankingServer/urls.py b/BankingServer/BankingServer/urls.py index 89c98ce..80b0e69 100644 --- a/BankingServer/BankingServer/urls.py +++ b/BankingServer/BankingServer/urls.py @@ -52,7 +52,7 @@ path('admin/', admin.site.urls), path('', include(router.urls)), path('process_audio/', views.process_audio, name='process_audio'), - path('get_bank/', views.get_bank, name='get_bank'), + path('post_bank/', views.post_bank, name='post_bank'), path('accounts/', include('accounts.urls', namespace='accounts')), path('money/', include('money.urls', namespace='money')), ] diff --git a/BankingServer/BankingServer/views.py b/BankingServer/BankingServer/views.py index 36fe5be..9f35a9c 100644 --- a/BankingServer/BankingServer/views.py +++ b/BankingServer/BankingServer/views.py @@ -18,30 +18,43 @@ import ssl ssl._create_default_https_context = ssl._create_unverified_context -def get_bank(request): - if request.method == 'GET': +@csrf_exempt +def post_bank(request): + if request.method == 'POST': # 클라이언트로부터 문자열 받기 - user_input = request.GET.get('voiceBank') #"궁민은행"으로 입력받으면 - - # 비교 대상 문자열 목록 - candidates = ["국민은행", "농협은행", "신한은행", "우리은행", "하나은행"] - #"궁민은행"과 제일 비슷한 값을 찾음 - - # 가장 가까운 문자열 찾기 - min_distance = float('inf') # 최소 거리 초기화 - closest_candidate = None - - for candidate in candidates: - distance = textdistance.levenshtein(user_input, candidate) - if distance < min_distance: - min_distance = distance - closest_candidate = candidate - - # 결과 리턴 - response_data = { - "closest_bank": closest_candidate, - } - return JsonResponse(response_data) + try: + request_data = json.loads(request.body.decode('utf-8')) + user_input = request_data.get('voice_bank') + except json.JSONDecodeError as e: + # JSON 디코딩 오류 처리 + return JsonResponse({"error": "Invalid JSON format"}, status=400) + + print("client:", user_input) + + if user_input is not None: + # 비교 대상 문자열 목록 + candidates = ["국민은행", "신한은행", "우리은행", "하나은행", "농협은행", "기업은행", "토스뱅크", "카카오뱅크"] + # "궁민은행"과 제일 비슷한 값을 찾음 + + # 가장 가까운 문자열 찾기 + min_distance = float('inf') # 최소 거리 초기화 + closest_candidate = None + + for candidate in candidates: + distance = textdistance.levenshtein(user_input, candidate) + if distance < min_distance: + min_distance = distance + closest_candidate = candidate + + print("return", closest_candidate) + # 결과 리턴 + response_data = { + "closest_bank": closest_candidate, + } + return JsonResponse(response_data) + else: + # 'user_input'이 None인 경우 처리 + return JsonResponse({"error": "User input is missing."}, status=400) # POST 응답 처리 @@ -83,7 +96,7 @@ def load_resnet_model(): nn.Dropout(p=0.5), nn.Linear(512, 10) ) - resnet.load_state_dict(torch.load('BankingServer/resnetModel/best_resnet34_weights(911).pth')) + resnet.load_state_dict(torch.load('BankingServer/resnetModel/best_resnet34_weights(911_v2).pth')) resnet.eval() model_loaded = True diff --git a/BankingServer/combined.wav b/BankingServer/combined.wav deleted file mode 100644 index a9e3dbf..0000000 Binary files a/BankingServer/combined.wav and /dev/null differ diff --git a/BankingServer/money/.DS_Store b/BankingServer/money/.DS_Store index 9654c8c..61a4e9b 100644 Binary files a/BankingServer/money/.DS_Store and b/BankingServer/money/.DS_Store differ diff --git a/BankingServer/money/views.py b/BankingServer/money/views.py index 77022d3..5ec4c6d 100644 --- a/BankingServer/money/views.py +++ b/BankingServer/money/views.py @@ -35,8 +35,8 @@ def post(self, request): if serializer.is_valid(): # # account_bank_to와 account_no_to 값을 추출 - # account_bank_to = request.data.get('account_bank_to') - # account_no_to = request.data.get('account_no_to') + account_bank_to = request.data.get('account_bank_to') + account_no_to = request.data.get('account_no_to') # 이체 정보 저장 transfer_instance = serializer.save() @@ -59,7 +59,8 @@ def post(self, request): if money.balance < amount: # 잔액 부족 예외 처리 - return Response({"error": "잔액 부족"}, status=status.HTTP_400_BAD_REQUEST) + print("잔액부족") + return Response({"return_msg": "잔액 부족"}, status=status.HTTP_400_BAD_REQUEST) money.balance -= amount money.save() @@ -67,9 +68,10 @@ def post(self, request): # response_data = { # "user_id": user_id # Money 모델의 user_id 값을 클라이언트로 전달 # } - - return Response(serializer.data, status=status.HTTP_201_CREATED) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + print("송금완료:", money, amount, account_bank_to, account_no_to) + return_msg = "송금완료" + return Response({"return_msg": return_msg}, status=status.HTTP_201_CREATED) + return Response({"return_msg": "송금 실패"}, status=status.HTTP_400_BAD_REQUEST) class BalanceCheckView(APIView): diff --git a/BankingServer/my_audio_file.aac b/BankingServer/my_audio_file.aac deleted file mode 100644 index 8f90a54..0000000 Binary files a/BankingServer/my_audio_file.aac and /dev/null differ diff --git a/BankingServer/my_audio_file.wav b/BankingServer/my_audio_file.wav deleted file mode 100644 index d670d70..0000000 Binary files a/BankingServer/my_audio_file.wav and /dev/null differ diff --git a/BankingServer/static/.DS_Store b/BankingServer/static/.DS_Store new file mode 100644 index 0000000..5bd961d Binary files /dev/null and b/BankingServer/static/.DS_Store differ diff --git a/BankingServer/static/images/.DS_Store b/BankingServer/static/images/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/BankingServer/static/images/.DS_Store differ diff --git a/BankingServer/static/images/test.jpg b/BankingServer/static/images/test.jpg deleted file mode 100644 index d563a16..0000000 Binary files a/BankingServer/static/images/test.jpg and /dev/null differ