Skip to content

Refactor if/else statements to use guard clauses for improved readability #206

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

Merged
thehabes merged 8 commits into from
Apr 2, 2026
Merged

Refactor if/else statements to use guard clauses for improved readability #206

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa5ba18
Initial plan
Copilot Aug 18, 2025
eb962d8
Refactor route files to use guard clauses instead of if/else
Copilot Aug 18, 2025
8a8ef3a
Refactor app.js maintenance mode check to use guard clause
Copilot Aug 18, 2025
49a9492
Merge main into this branch to deploy to dev for testing.
thehabes Aug 18, 2025
ffb875b
Merge branch 'main' into copilot/fix-173
cubap Apr 2, 2026
ba758da
Update package-lock.json
cubap Apr 2, 2026
e9532c3
Invert patch override check in POST routes
cubap Apr 2, 2026
a38cce6
no diff
thehabes Apr 2, 2026
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
5 changes: 2 additions & 3 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,9 @@ app.use(express.static(path.join(__dirname, 'public')))
app.all('*', (req, res, next) => {
if(process.env.DOWN === "true"){
res.status(503).json({"message":"RERUM v1 is down for updates or maintenance at this time. We apologize for the inconvenience. Try again later."})
return
}
else{
next() //pass on to the next app.use
}
next() //pass on to the next app.use
Comment on lines 72 to +77
Copy link

Copilot AI Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The maintenance-mode guard is registered on app.all('*_', ...), but '*_' is not a catch-all route in Express (the usual catch-all is '*' or '/*'). As written, this handler likely won’t run for most requests, so DOWN=true may not actually block traffic. Consider changing the route to a real catch-all (and keep the early return after res.status(503).json(...)).

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member

@thehabes thehabes Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You wrong. new express who dis

})

app.use('/', indexRouter)
Expand Down
7 changes: 3 additions & 4 deletions routes/patchSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ import rest from '../rest.js'
router.route('/')
.patch(auth.checkJwt, controller.patchSet)
.post(auth.checkJwt, (req, res, next) => {
if (rest.checkPatchOverrideSupport(req, res)) {
controller.patchSet(req, res, next)
}
else {
if (!rest.checkPatchOverrideSupport(req, res)) {
res.statusMessage = 'Improper request method for updating, please use PATCH to add new keys to this object.'
res.status(405)
next(res)
return
}
controller.patchSet(req, res, next)
})
.all((req, res, next) => {
res.statusMessage = 'Improper request method for updating, please use PATCH to add new keys to this object.'
Expand Down
7 changes: 3 additions & 4 deletions routes/patchUnset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ import rest from '../rest.js'
router.route('/')
.patch(auth.checkJwt, controller.patchUnset)
.post(auth.checkJwt, (req, res, next) => {
if (rest.checkPatchOverrideSupport(req, res)) {
controller.patchUnset(req, res, next)
}
else {
if (!rest.checkPatchOverrideSupport(req, res)) {
res.statusMessage = 'Improper request method for updating, please use PATCH to remove keys from this object.'
res.status(405)
next(res)
return
}
controller.patchUnset(req, res, next)
})
.all((req, res, next) => {
res.statusMessage = 'Improper request method for updating, please use PATCH to remove keys from this object.'
Expand Down
7 changes: 3 additions & 4 deletions routes/patchUpdate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ import auth from '../auth/index.js'
router.route('/')
.patch(auth.checkJwt, controller.patchUpdate)
.post(auth.checkJwt, (req, res, next) => {
if (rest.checkPatchOverrideSupport(req, res)) {
controller.patchUpdate(req, res, next)
}
else {
if (!rest.checkPatchOverrideSupport(req, res)) {
res.statusMessage = 'Improper request method for updating, please use PATCH to alter the existing keys this object.'
res.status(405)
next(res)
return
}
controller.patchUpdate(req, res, next)
})
.all((req, res, next) => {
res.statusMessage = 'Improper request method for updating, please use PATCH to alter existing keys on this object.'
Expand Down