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.

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

Dev #9

Merged
merged 5 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 0 additions & 13 deletions .github/workflows/tests.yml

This file was deleted.

2 changes: 2 additions & 0 deletions expiration/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { OrderCreatedListener } from "./events/listeners/order-created-listener"

//mongodb
const start = async () => {
console.log("Starting up expiration service...");

try {
if (!process.env.NATS_CLIENT_ID) {
throw new HttpException(500, "NATS_CLIENT_ID must be defined");
Expand Down
2 changes: 2 additions & 0 deletions orders/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { PaymentsSuccessListener } from "./events/listeners/payment-success-list

//mongodb
const start = async () => {
console.log("Starting up orders service...");

try {
if (!process.env.JWT_SECRET || !process.env.MONGO_URI) {
throw new HttpException(500, "env must be defined");
Expand Down
2 changes: 1 addition & 1 deletion orders/src/test/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ beforeAll(async () => {
process.env.JWT_SECRET = "test";
process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";

const mongo = await MongoMemoryServer.create();
mongo = await MongoMemoryServer.create();
const mongoUri = mongo.getUri();

await mongoose.connect(mongoUri, {});
Expand Down
1 change: 1 addition & 0 deletions payments/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { OrderCancelledListener } from "./events/listeners/order-cancelled-liste
import { OrderCreatedListener } from "./events/listeners/order-created-listener";

const start = async () => {
console.log("Starting up payments service...");
try {
if (!process.env.JWT_SECRET || !process.env.MONGO_URI) {
throw new HttpException(500, "env must be defined");
Expand Down
2 changes: 1 addition & 1 deletion payments/src/test/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ beforeAll(async () => {
process.env.JWT_SECRET = "test";
process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";

const mongo = await MongoMemoryServer.create();
mongo = await MongoMemoryServer.create();
const mongoUri = mongo.getUri();

await mongoose.connect(mongoUri, {});
Expand Down
1 change: 1 addition & 0 deletions tickets/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { OrderCancelledListener } from "./events/listeners/order-cancelled-liste

//mongodb
const start = async () => {
console.log("Starting up tickets service...");
try {
if (!process.env.JWT_SECRET || !process.env.MONGO_URI) {
throw new HttpException(500, "env must be defined");
Expand Down
28 changes: 18 additions & 10 deletions tickets/src/routes/find-tickets.route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,27 @@ router.get("/api/tickets/userticket", privateRoute, async (req, res) => {
});

router.get("/api/tickets/:id", privateRoute, async (req, res) => {
const ticket = await ticketModel.findById(req.params.id);
if (!ticket) {
return res.status(404).send({
message: "Ticket not found",
try {
const ticket = await ticketModel.findById(req.params.id);
if (!ticket) {
return res.status(404).send({
message: "Ticket not found",
data: null,
error: true,
});
} else {
return res.status(200).send({
message: "Ticket found",
data: ticket,
error: false,
});
}
} catch (err) {
return res.status(500).send({
message: err.message || "Internal Server Error",
data: null,
error: true,
});
} else {
return res.status(200).send({
message: "Ticket found",
data: ticket,
error: false,
});
}
});

Expand Down
4 changes: 2 additions & 2 deletions tickets/src/test/find-ticket.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ it("must be signed in to find a ticket", async () => {
});

it("must return an error if the ticket is not found", async () => {
request(app)
await request(app)
.get(`/api/tickets/647abea0ed015d62155716b8`)
.set("Cookie", mockSignIn(true))
.send({})
.expect(404);
});

it("must return a error id id is invalid", async () => {
request(app)
await request(app)
.get(`/api/tickets/sdsdsd`)
.set("Cookie", mockSignIn(true))
.send({})
Expand Down
2 changes: 1 addition & 1 deletion tickets/src/test/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ beforeAll(async () => {
process.env.JWT_SECRET = "test";
process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";

const mongo = await MongoMemoryServer.create();
mongo = await MongoMemoryServer.create();
const mongoUri = mongo.getUri();

await mongoose.connect(mongoUri, {});
Expand Down
Loading