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

Endpoint "ListMeals" #314

Closed
wants to merge 5 commits into from
Closed

Endpoint "ListMeals" #314

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a855aea
fixes: eat-api call and dish database check
elli-hae Feb 28, 2024
c2f8359
fix: fix listDishes endpoint and change to listMeals
elli-hae Feb 28, 2024
27ed47d
change cutoff values in ListMeals conditions
elli-hae Feb 29, 2024
e29c29c
Merge branch 'main' into endpoint_listMeals
CommanderStorm Mar 1, 2024
8e1a4f4
Apply suggestions from code review
CommanderStorm Mar 11, 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
879 changes: 439 additions & 440 deletions server/api/tumdev/campus_backend.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions server/api/tumdev/campus_backend.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions server/api/tumdev/campus_backend.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ service Campus {
};
}

rpc ListDishes(ListDishesRequest) returns (ListDishesReply) {
rpc ListMeals(ListMealsRequest) returns (ListMealsReply) {
option (google.api.http) = {
get: "/dish/allDishes",
response_body: "dish"
get: "/meal/allMeals",
CommanderStorm marked this conversation as resolved.
Show resolved Hide resolved
response_body: "meal"
};
}

Expand Down Expand Up @@ -385,7 +385,7 @@ message Canteen {
double latitude = 4;
}

message ListDishesRequest {
message ListMealsRequest {
string canteen_id = 1;
// >=2022 until the current year
int32 year = 2;
Expand All @@ -395,8 +395,8 @@ message ListDishesRequest {
int32 day = 4;
}

message ListDishesReply {
repeated string dish = 1;
message ListMealsReply {
repeated string meal = 1;
}

message ListResponsiblePersonRequest {}
Expand Down
118 changes: 59 additions & 59 deletions server/api/tumdev/campus_backend.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,63 +315,6 @@
]
}
},
"/dish/allDishes": {
"get": {
"operationId": "Campus_ListDishes",
"responses": {
"200": {
"description": "",
"schema": {
"type": "array",
"items": {
"type": "string"
}
}
},
"default": {
"description": "An unexpected error response.",
"schema": {
"$ref": "#/definitions/rpcStatus"
}
}
},
"parameters": [
{
"name": "canteenId",
"in": "query",
"required": false,
"type": "string"
},
{
"name": "year",
"description": "\u003e=2022 until the current year",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "week",
"description": "range 1 - 53",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "day",
"description": "range 0 (Monday) - 4 (Friday)",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
}
],
"tags": [
"Campus"
]
}
},
"/dish/rating/allDishTags": {
"get": {
"operationId": "Campus_ListNameTags",
Expand Down Expand Up @@ -577,6 +520,63 @@
]
}
},
"/meal/allMeals": {
"get": {
"operationId": "Campus_ListMeals",
"responses": {
"200": {
"description": "",
"schema": {
"type": "array",
"items": {
"type": "string"
}
}
},
"default": {
"description": "An unexpected error response.",
"schema": {
"$ref": "#/definitions/rpcStatus"
}
}
},
"parameters": [
{
"name": "canteenId",
"in": "query",
"required": false,
"type": "string"
},
{
"name": "year",
"description": "\u003e=2022 until the current year",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "week",
"description": "range 1 - 53",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "day",
"description": "range 0 (Monday) - 4 (Friday)",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
}
],
"tags": [
"Campus"
]
}
},
"/members/{lrzId}": {
"get": {
"operationId": "Campus_GetMember",
Expand Down Expand Up @@ -1324,10 +1324,10 @@
}
}
},
"apiListDishesReply": {
"apiListMealsReply": {
"type": "object",
"properties": {
"dish": {
"meal": {
"type": "array",
"items": {
"type": "string"
Expand Down
Loading
Loading