Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

完成admin_order_service部分 #5

Closed
wants to merge 4 commits into from
Closed

完成admin_order_service部分 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd0c4b2
完成admin_order_service部分
Mo9L1 May 25, 2024
0d387ca
Merge branch 'Lincyaw:master' into master
Mo9L1 May 29, 2024
cf8b4c6
travel部分初版（未Dubug）
Mo9L1 May 29, 2024
11ce753
Merge remote-tracking branch 'origin/master'
Mo9L1 May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions service/admin_order_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
from typing import List
import requests
from service.common import *
from dataclasses import dataclass, asdict


def get_all_orders(client: requests.Session,host: str):
"""
GET
/api/v1/adminorderservice/adminorder
"""
url = "/api/v1/adminorderservice/adminorder"
response = client.request(url=host + url, method='GET',
headers={"Accept": "*/*"})
return response.json()

def add_order(client: requests.Session,order:dict,host: str):
"""
POST
/api/v1/adminorderservice/adminorder
"""
url = "/api/v1/adminorderservice/adminorder"
response = client.request(url=host + url, method='POST',
headers={"Accept": "*/*"},json=order)
return response.json()

def update_order(client: requests.Session,order:dict,host: str):
url = "/api/v1/adminorderservice/adminorder"
response = client.request(url=host + url, method='PUT',json=order)
return response.json()

def delete_order(client: requests.Session,orderId:str,trainNumber:str,host: str):
url = f"/api/v1/adminorderservice/adminorder/{orderId}/{trainNumber}"
response=client.request(url=host+url, method='DELETE')
return response.json()

def get_welcome(client: requests.Session,host: str):
url = "/api/v1/adminorderservice/welcome"
response=client.request(url=host+url, method='GET',
headers={"Accept": "*/*"})
return response.text
148 changes: 148 additions & 0 deletions service/admin_order_service_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
import requests
import uuid

from service.admin_order_service import *
from dataclasses import dataclass, asdict
from service.auth_service import users_login

BASE_URL = "http://10.10.10.220:31948"

headers = {
'Proxy-Connection': 'keep-alive',
'Accept': 'application/json',
'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36',
'Content-Type': 'application/json',
'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
'Connection': 'keep-alive',
}

@dataclass
class DtoLoginUser(DataclassInstance):
password: str
username: str
verificationCode: str

def test_get_all_orders():
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
result = get_all_orders(client, BASE_URL)
print(result['data'])
assert result['msg'] == 'Get the orders successfully!'

def test_add_order():
client = requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})

newOrder = {
"accountId": str(uuid.uuid4()),
"boughtDate": "string",
"coachNumber": 0,
"contactsDocumentNumber": "string",
"contactsName": "string",
"differenceMoney": "string",
"documentType": 0,
"from": "beijing",
"id": str(uuid.uuid4()),
"price": "string",
"seatClass": 0,
"seatNumber": "string",
"status": 0,
"to": "shanghai",
"trainNumber": "string",
"travelDate": "string",
"travelTime": "string"
}
ret = add_order(client,newOrder,BASE_URL)
assert ret['msg'] == 'Success'

def test_update_order():
client = requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
newOrder = {
"boughtDate": "string",
"coachNumber": 0,
"contactsDocumentNumber": "string",
"contactsName": "string",
"differenceMoney": "string",
"documentType": 0,
"from": "string",
"id": '3ddae130-38c1-4e8e-abee-11d83f87561f',
"price": "string",
"seatClass": 0,
"seatNumber": "string",
"status": 0,
"to": "string",
"trainNumber": "string",
"travelDate": "string",
"travelTime": "string"
}
ret = update_order(client,newOrder,BASE_URL)
assert ret['msg'] == 'Success'

def test_delete_order():
orderID='e1cfc963-4324-47ee-9846-f0362df2861d'
trainNumber='G1237'
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
ret = delete_order(client,orderID,trainNumber,BASE_URL)
assert ret['msg'] == 'Delete Order Success'

def test_get_welcome():
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
ret = get_welcome(client,BASE_URL)
assert ret == 'Welcome to [Admin Order Service] !'

def test_whole_chain():
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})

newOrderId = str(uuid.uuid4())

newOrder = {
"accountId": str(uuid.uuid4()),
"boughtDate": "string",
"coachNumber": 0,
"contactsDocumentNumber": "string",
"contactsName": "string",
"differenceMoney": "string",
"documentType": 0,
"from": "string",
"id": newOrderId,
"price": "string",
"seatClass": 0,
"seatNumber": "string",
"status": 0,
"to": "string",
"trainNumber": "U23",
"travelDate": "string",
"travelTime": "string"
}

ret = get_welcome(client,BASE_URL)
assert ret == 'Welcome to [Admin Order Service] !'
ret = add_order(client,newOrder,BASE_URL)
assert ret['msg'] == 'Success'
ret = update_order(client,newOrder,BASE_URL)
assert ret['msg']=='Success'
ret = delete_order(client,newOrderId,'U23',BASE_URL)
assert ret['msg'] == 'Delete Order Success'
29 changes: 29 additions & 0 deletions service/admin_travel_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import requests

def get_all_travels(client: requests.Session,host: str):
url = "/api/v1/admintravelservice/admintravel"
response = client.request(url=host + url, method='GET',
headers={"Accept": "*/*"})
return response.json()

def add_travel(client: requests.Session,travel:dict,host: str):
url = "/api/v1/admintravelservice/admintravel"
response = client.request(url=host + url, method='POST',
headers={"Accept": "*/*"},json=travel)
return response.json()

def update_travel(client: requests.Session,travel:dict,host: str):
url = "/api/v1/admintravelservice/admintravel"
response = client.request(url=host + url, method='PUT',json=travel)
return response.json()

def delete_travel(client: requests.Session,tripId:str,host: str):
url = f"/api/v1/admintravelservice/admintravel/{tripId}"
response=client.request(url=host+url, method='DELETE')
return response.json()

def get_welcome(client: requests.Session,host: str):
url = "/api/v1/admintracelservice/welcome"
response=client.request(url=host+url, method='GET',
headers={"Accept": "*/*"})
return response.text
104 changes: 104 additions & 0 deletions service/admin_travel_service_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
import uuid

from service import DataclassInstance
from service.admin_travel_service import *
from dataclasses import dataclass
from service.auth_service import users_login

BASE_URL = "http://10.10.10.220:31948"

headers = {
'Proxy-Connection': 'keep-alive',
'Accept': 'application/json',
'X-Requested-With': 'XMLHttpRequest',
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36',
'Content-Type': 'application/json',
'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
'Connection': 'keep-alive',
}

@dataclass
class DtoLoginUser(DataclassInstance):
password: str
username: str
verificationCode: str

def test_get_all_travels():
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
result = get_all_travels(client, BASE_URL)
print(result['data'])
assert result['msg'] == 'Travel Service Admin Query All Travel Success'

def test_add_order():
client = requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})

newOrder = {
"endTime": "string",
"loginId": "string",
"routeId": "string",
"startStationName": "string",
"startTime": "string",
"stationsName": "string",
"terminalStationName": "string",
"trainTypeName": "string",
"tripId": "string"
}

ret = add_travel(client,newOrder,BASE_URL)
assert ret['msg'] == 'Success'

def test_update_travel():
client = requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
newTravel = {
"accountId": "4d2a46c7-71cb-4cf1-b5bb-b68406d9da6f",
"boughtDate": "string",
"coachNumber": 0,
"contactsDocumentNumber": "string",
"contactsName": "string",
"differenceMoney": "string",
"documentType": 0,
"from": "string",
"id": '76f5c408-0b16-48a4-9eb5-38693c7cd823',
"price": "string",
"seatClass": 0,
"seatNumber": "string",
"status": 0,
"to": "string",
"trainNumber": "string",
"travelDate": "string",
"travelTime": "string"
}
ret = update_travel(client,newTravel,BASE_URL)
assert ret['msg'] == 'Success'

def test_delete_travel():
travelId='76f5c408-0b16-48a4-9eb5-38693c7cd823'
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
ret = delete_travel(client,travelId,BASE_URL)
print(ret)
assert ret['msg'] == 'Delete Order Success'

def test_get_welcome():
client=requests.Session()
basic_auth_dto=DtoLoginUser(username='admin',
password='222222', verificationCode="123")
token=users_login(client, basic_auth_dto, headers, BASE_URL)
client.headers.update({'Authorization': f'Bearer {token}'})
ret = get_welcome(client,BASE_URL)
assert ret == 'Welcome to [Admin Order Service] !'