Skip to content

Commit da35fad

Browse files
refactor: update import/export syntax and improve error handling in various files
1 parent 1db8048 commit da35fad

File tree

13 files changed

+56
-33
lines changed

13 files changed

+56
-33
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,6 @@ dist
124124

125125
# Local config file
126126
config/local.js
127+
config/local.cjs
127128

128-
package-lock.json
129+
package-lock.json

app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ app.use(function (err, req, res, next) {
2828
if (isMulterError(err)) {
2929
return multerErrorHandling(err, req, res, next);
3030
}
31-
logger.error(err);
31+
console.error(err); // TODO: add logger here
3232
return res.boom.boomify(err, {
3333
statusCode: err.statusCode,
3434
});

controllers/events.js

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import logger from "../utils/logger.js";
22
import { GET_ALL_EVENTS_LIMIT_MIN, UNWANTED_PROPERTIES_FROM_100MS, EVENT_ROLES } from "../constants/events.js";
33
import { INTERNAL_SERVER_ERROR } from "../constants/errorMessages.js";
44
import { EventTokenService, EventAPIService } from "../services/index.js";
5-
import { createEvent as createEventQuery, getEventCodes } from "../models/events.js";
5+
import { createEvent as createEventQuery, getEventCodes as getEventCodesQuery } from "../models/events.js";
66
import { removeUnwantedProperties } from "../utils/events.js";
77
import crypto from "crypto";
88
import { addLog } from "../models/logs.js";
@@ -97,7 +97,7 @@ const joinEvent = async (req, res) => {
9797

9898
try {
9999
if (role === EVENT_ROLES.MAVEN) {
100-
const eventCodes = await getEventCodes({ id: roomId });
100+
const eventCodes = await getEventCodesQuery({ id: roomId });
101101
const allEventCodesArray = eventCodes.map((eventCode) => {
102102
return eventCode.code;
103103
});
@@ -344,6 +344,35 @@ const generateEventCode = async (req, res) => {
344344
}
345345
};
346346

347+
/**
348+
* Gets event codes for particular event
349+
*
350+
* @async
351+
* @function
352+
* @param {Object} req - The Express request object.
353+
* @param {Object} res - The Express response object.
354+
* @returns {Promise<Object>} The JSON response with a success message if the event codes are fetched succesfully
355+
* @throws {Object} The JSON response with an error message if an error occurred while getting the event codes data
356+
*/
357+
const getEventCodes = async (req, res) => {
358+
const { id } = req.params;
359+
360+
try {
361+
const eventCodes = await getEventCodesQuery({ id });
362+
363+
return res.status(200).json({
364+
message: "Event codes is successfully fetched for the event!",
365+
data: eventCodes,
366+
});
367+
} catch (error) {
368+
logger.error({ error });
369+
return res.status(500).json({
370+
error: error.code,
371+
message: "Something went wrong while getting the event codes!",
372+
});
373+
}
374+
};
375+
347376
export default {
348377
createEvent,
349378
getAllEvents,
@@ -352,6 +381,7 @@ export default {
352381
updateEvent,
353382
endActiveEvent,
354383
addPeerToEvent,
384+
getEventCodes,
355385
kickoutPeer,
356386
generateEventCode,
357387
};

middlewares/taskRequests.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,4 @@ async function validateUser(req, res, next) {
3434
}
3535
}
3636

37-
export default {
38-
validateUser,
39-
};
37+
export { validateUser };

middlewares/validators/members.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ const validateGetMembers = async (req, res, next) => {
1515
}
1616
};
1717

18-
export default {
19-
validateGetMembers,
20-
};
18+
export { validateGetMembers };

middlewares/validators/recruiter.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,4 @@ const validateRecruiter = async (req, res, next) => {
2222
}
2323
};
2424

25-
export default {
26-
validateRecruiter,
27-
};
25+
export { validateRecruiter };

middlewares/validators/stocks.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ const createStock = async (req, res, next) => {
1717
}
1818
};
1919

20-
export default {
21-
createStock,
22-
};
20+
export { createStock };

routes/applications.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import express from "express";
44
import { ROLES } from "../constants/roles.js";
55
import authenticate from "../middlewares/authenticate.js";
66
import { authorizeRoles } from "../middlewares/authorizeRoles.js";
7-
import * as applications from "../controllers/applications.js";
7+
import { getAllOrUserApplication, addNewApplication, updateApplicationStatus } from "../controllers/applications.js";
88
import { authorizeOwnOrSuperUser } from "../middlewares/authorizeOwnOrSuperUser.js";
9-
import * as applicationValidator from "../middlewares/validators/application.js";
9+
import applicationValidator from "../middlewares/validators/application.js";
1010

1111
const router = express.Router();
1212

@@ -15,16 +15,16 @@ router.get(
1515
authenticate,
1616
authorizeOwnOrSuperUser,
1717
applicationValidator.validateApplicationQueryParam,
18-
applications.getAllOrUserApplication
18+
getAllOrUserApplication
1919
);
20-
router.get("/:applicationId", authenticate, authorizeRoles([ROLES.SUPERUSER]), applications.getApplicationById);
21-
router.post("/", authenticate, applicationValidator.validateApplicationData, applications.addApplication);
20+
// router.get("/:applicationId", authenticate, authorizeRoles([ROLES.SUPERUSER]), getApplicationById);
21+
router.post("/", authenticate, applicationValidator.validateApplicationData, addNewApplication);
2222
router.patch(
2323
"/:applicationId",
2424
authenticate,
2525
authorizeRoles([ROLES.SUPERUSER]),
2626
applicationValidator.validateApplicationUpdateData,
27-
applications.updateApplication
27+
updateApplicationStatus
2828
);
2929

3030
export default router;

routes/fcmToken.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import { fcmTokenValidator } from "../middlewares/validators/fcmToken.js";
55

66
const router = express.Router();
77

8-
router.post("/", authenticate, fcmTokenValidator.validateFcmToken, fcmTokenController);
8+
router.post("/", authenticate, fcmTokenValidator, fcmTokenController);
99

1010
export default router;

routes/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ appRoutes.use("/challenges", challenges);
5555
appRoutes.use("/contributions", contributions);
5656
appRoutes.use("/healthcheck", healthCheck);
5757
appRoutes.use("/logs", logs);
58-
// appRoutes.use("/members", members);
58+
appRoutes.use("/members", members);
5959
appRoutes.use("/pullrequests", pullRequests);
6060
appRoutes.use("/questions", questions);
61-
// appRoutes.use("/stocks", stocks);
61+
appRoutes.use("/stocks", stocks);
6262
appRoutes.use("/tasks", tasks);
63-
// appRoutes.use("/taskRequests", taskRequests);
63+
appRoutes.use("/taskRequests", taskRequests);
6464
appRoutes.use("/trade", trading);
6565
appRoutes.use("/users/status", userStatus);
6666
appRoutes.use("/users", users);
@@ -72,14 +72,14 @@ appRoutes.use("/levels", levels);
7272
appRoutes.use("/items", items);
7373
appRoutes.use("/cache", cloudflareCache);
7474
appRoutes.use("/external-accounts", externalAccounts);
75-
// appRoutes.use("/events", events);
75+
appRoutes.use("/events", events);
7676
appRoutes.use("/discord-actions", discordActions);
7777
appRoutes.use("/issues", issues);
7878
appRoutes.use("/progresses", progresses);
7979
appRoutes.use("/monitor", monitor);
8080
appRoutes.use("/staging", staging);
81-
// appRoutes.use("/applications", applications);
82-
// appRoutes.use("/v1/fcm-tokens", fcmToken);
81+
appRoutes.use("/applications", applications);
82+
appRoutes.use("/v1/fcm-tokens", fcmToken);
8383
appRoutes.use("/v1/notifications", notify);
8484
appRoutes.use("/goals", goals);
8585
appRoutes.use("/invites", invites);

0 commit comments

Comments
 (0)