[PR #4] [MERGED] Merge magic #4

New Issue

2026-09-04T00:22:25+02:00

Stone_Red commented

2026-09-04 00:22:25 +02:00

📋 Pull Request Information

Original PR: https://github.com/GithubOrgProjectPiza/server/pull/4
Author: @Stone-Red-Code
Created: 4/2/2022
Status: ✅ Merged
Merged: 4/2/2022
Merged by: @Stone-Red-Code

Base: dev ← Head: main

📝 Commits (10+)

da35fcf Add tests
12abcad Add more testing stuff
f3bf685 Add tests
d94e918 Add more testing stuff
cb62400 Add restaurant and organization controller
cf9b9ee Add restaurant and organization controller
389dc01 Merge remote-tracking branch 'origin/routes-implementation' into routes-implementation
5d621eb Add pizza and orders controller
673e6f9 Fix orders and pizzas controller
608710b Add routers

📊 Changes

17 files changed (+3669 additions, -8 deletions)

View changed files

📝 package-lock.json (+3210 -4)
📝 package.json (+4 -2)
📝 prisma/schema.prisma (+0 -1)
➕ src/controller/orders.controller.ts (+89 -0)
➕ src/controller/organisations.controller.ts (+87 -0)
➕ src/controller/pizzas.controller.ts (+98 -0)
➕ src/controller/restaurants.controller.ts (+87 -0)
📝 src/controller/testcontroller.controller.ts (+5 -0)
➕ src/datatypes.ts (+5 -0)
📝 src/index.ts (+13 -0)
📝 src/lib/prisma.lib.ts (+1 -1)
➕ src/routes/orders.route.ts (+11 -0)
➕ src/routes/organisations.route.ts (+16 -0)
➕ src/routes/pizzas.route.ts (+11 -0)
➕ src/routes/restaurants.route.ts (+11 -0)
📝 src/routes/testrouter.route.ts (+12 -0)
➕ src/statusCodes.ts (+9 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/GithubOrgProjectPiza/server/pull/4 **Author:** [@Stone-Red-Code](https://github.com/Stone-Red-Code) **Created:** 4/2/2022 **Status:** ✅ Merged **Merged:** 4/2/2022 **Merged by:** [@Stone-Red-Code](https://github.com/Stone-Red-Code) **Base:** `dev` ← **Head:** `main` --- ### 📝 Commits (10+) - [`da35fcf`](https://github.com/GithubOrgProjectPiza/server/commit/da35fcf424f569d956eef083a18dbb0167a7c6ab) Add tests - [`12abcad`](https://github.com/GithubOrgProjectPiza/server/commit/12abcad196b5b8e67d3b955c45cb2197b85b3107) Add more testing stuff - [`f3bf685`](https://github.com/GithubOrgProjectPiza/server/commit/f3bf6855e3fbe2622e8052ed0faacb1a9f03faaa) Add tests - [`d94e918`](https://github.com/GithubOrgProjectPiza/server/commit/d94e918533e0e7166d049bf50bc727d433ed9adc) Add more testing stuff - [`cb62400`](https://github.com/GithubOrgProjectPiza/server/commit/cb62400f390d22e0170d1a36271f932e4f229d47) Add restaurant and organization controller - [`cf9b9ee`](https://github.com/GithubOrgProjectPiza/server/commit/cf9b9eefbb8d0bf462f1ceb57d171c9b1975d3ef) Add restaurant and organization controller - [`389dc01`](https://github.com/GithubOrgProjectPiza/server/commit/389dc018eee1a2184bc20ba7ef0cb3e8ab43de1c) Merge remote-tracking branch 'origin/routes-implementation' into routes-implementation - [`5d621eb`](https://github.com/GithubOrgProjectPiza/server/commit/5d621eb99abbf16a93eb09aaefde07e029350df7) Add pizza and orders controller - [`673e6f9`](https://github.com/GithubOrgProjectPiza/server/commit/673e6f90daff8c873267676cd6b9cb461be8e180) Fix orders and pizzas controller - [`608710b`](https://github.com/GithubOrgProjectPiza/server/commit/608710be60c12bd2c9810c176701b66a8d48c174) Add routers ### 📊 Changes **17 files changed** (+3669 additions, -8 deletions) <details> <summary>View changed files</summary> 📝 `package-lock.json` (+3210 -4) 📝 `package.json` (+4 -2) 📝 `prisma/schema.prisma` (+0 -1) ➕ `src/controller/orders.controller.ts` (+89 -0) ➕ `src/controller/organisations.controller.ts` (+87 -0) ➕ `src/controller/pizzas.controller.ts` (+98 -0) ➕ `src/controller/restaurants.controller.ts` (+87 -0) 📝 `src/controller/testcontroller.controller.ts` (+5 -0) ➕ `src/datatypes.ts` (+5 -0) 📝 `src/index.ts` (+13 -0) 📝 `src/lib/prisma.lib.ts` (+1 -1) ➕ `src/routes/orders.route.ts` (+11 -0) ➕ `src/routes/organisations.route.ts` (+16 -0) ➕ `src/routes/pizzas.route.ts` (+11 -0) ➕ `src/routes/restaurants.route.ts` (+11 -0) 📝 `src/routes/testrouter.route.ts` (+12 -0) ➕ `src/statusCodes.ts` (+9 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

Stone_Red added the pull-request label 2026-09-04 00:22:25 +02:00

Stone_Red closed this issue

2026-09-04 00:22:25 +02:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: GithubOrgProjectPiza/server#4