Skip to content

Feature/CPA / CM per etan #51

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

Open
HDProduction010 wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Feature/CPA / CM per etan #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b670ab6
create new logic to allow for CPA / CM per etan
HDProduction010 Feb 19, 2026
bc66eb5
Remove Comments and Remove file as requested in PR
HDProduction010 Feb 20, 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
3 changes: 2 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
npm-debug.log
npm-debug.log
.env
32 changes: 26 additions & 6 deletions controllers/ControllerController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ router.get("/staff", async (req, res) => {
lname: "asc",
fname: "asc",
}) /*.populate({
path: 'roles',
options: {
sort: {order: 'asc'}
}
})*/
path: 'roles',
Copy link
Contributor

@cdconn00 cdconn00 Feb 20, 2026

Choose a reason for hiding this comment

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

Can we just remove this commented out stuff?

options: {
sort: {order: 'asc'}
}
})*/
.lean();

if (!users) {
Expand Down Expand Up @@ -859,6 +859,7 @@ router.put(
})
.promise();


await User.findOneAndUpdate(
{ cid: req.params.cid },
{
Expand All @@ -872,6 +873,25 @@ router.put(
}
);

const updated = await User.findOneAndUpdate(
{ cid: req.params.cid },
{
fname,
lname,
email,
oi,
vis,
roleCodes: toApply.roles,
certCodes: toApply.certifications,
},
{ new: true }
).lean();

console.log("updated user found:", !!updated);
console.log("updated certCodes:", updated?.certCodes);
console.log("updated roleCodes:", updated?.roleCodes);


await req.app.dossier.create({
by: res.user.cid,
affected: req.params.cid,
Expand Down Expand Up @@ -1010,4 +1030,4 @@ const random = (str, len) => {
return ret;
};

export default router;
export default router;
4 changes: 3 additions & 1 deletion controllers/UserController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ router.post("/idsToken", getUser, async (req, res) => {
return res.json(res.stdRes);
});



// Endpoint to preform user login, uses oAuth middleware to retrieve an access token
router.post("/login", oAuth, async (req, res) => {
try {
Expand Down Expand Up @@ -440,4 +442,4 @@ router.put("/profile", getUser, async (req, res) => {
return res.json(res.stdRes);
});

export default router;
export default router;
33 changes: 17 additions & 16 deletions models/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,46 +56,47 @@ userSchema.plugin(softDelete, {

userSchema.plugin(mlv);

userSchema.virtual('isMem').get(function() {
userSchema.virtual('isMem').get(function () {
return !!this.member;
});

userSchema.virtual('isMgt').get(function() {
if(!this.roleCodes) return false;
userSchema.virtual('isMgt').get(function () {
if (!this.roleCodes) return false;
const search = ['atm', 'datm'];
return this.roleCodes.some(r => search.includes(r));
});

userSchema.virtual('isSenior').get(function() {
if(!this.roleCodes) return false;
userSchema.virtual('isSenior').get(function () {
if (!this.roleCodes) return false;
const search = ['atm', 'datm', 'ta'];
return this.roleCodes.some(r => search.includes(r));
});

userSchema.virtual('isStaff').get(function() {
if(!this.roleCodes) return false;
const search = ['atm', 'datm', 'ta', 'ec', 'wm', 'fe'];
userSchema.virtual('isStaff').get(function () {
if (!this.roleCodes) return false;
const search = ['atm', 'datm', 'ta', 'ec', 'wm', 'fe',];
return this.roleCodes.some(r => search.includes(r));
});

userSchema.virtual('isIns').get(function() {
if(!this.roleCodes) return false;
userSchema.virtual('isIns').get(function () {
if (!this.roleCodes) return false;
const search = ['atm', 'datm', 'ta', 'ins', 'mtr'];
return this.roleCodes.some(r => search.includes(r));
});

userSchema.virtual('ratingShort').get(function() {
userSchema.virtual('ratingShort').get(function () {
return zab.ratings[this.rating];
});

userSchema.virtual('ratingLong').get(function() {
userSchema.virtual('ratingLong').get(function () {
return zab.ratingsLong[this.rating];
});

userSchema.virtual('roles', {
ref: 'Role',
localField: 'roleCodes',
foreignField: 'code'
userSchema.virtual("roles", {
ref: "Role",
localField: "roleCodes",
foreignField: "code",
justOne: false,
});

userSchema.virtual('certifications', {
Expand Down
115 changes: 67 additions & 48 deletions seeds/certifications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,68 @@
[
{
"name": "KPHX GND",
"code": "kphxground",
"order": 4,
"class": "tier-one"
},
{
"name": "KPHX TWR",
"code": "kphxtower",
"order": 3,
"class": "tier-one"
},
{
"name": "P50",
"code": "p50",
"order": 2,
"class": "tier-one"
},
{
"name": "Enroute",
"code": "enroute",
"order": 1,
"class": "tier-one"
},
{
"name": "KABQ",
"code": "kabq",
"order": 1,
"class": "tier-two"
},
{
"name": "KFLG",
"code": "kflg",
"order": 2,
"class": "tier-two"
},
{
"name": "KLUF",
"code": "kluf",
"order": 3,
"class": "tier-two"
},
{
"name": "KSAF",
"code": "ksaf",
"order": 4,
"class": "tier-two"
}]
{
"name": "KPHX GND",
"code": "kphxground",
"order": 4,
"class": "tier-one"
},
{
"name": "KPHX TWR",
"code": "kphxtower",
"order": 3,
"class": "tier-one"
},
{
"name": "P50",
"code": "p50",
"order": 2,
"class": "tier-one"
},
{
"name": "Enroute",
"code": "enroute",
"order": 1,
"class": "tier-one"
},
{
"name": "KABQ",
"code": "kabq",
"order": 1,
"class": "tier-two"
},
{
"name": "KFLG",
"code": "kflg",
"order": 2,
"class": "tier-two"
},
{
"name": "KLUF",
"code": "kluf",
"order": 3,
"class": "tier-two"
},
{
"name": "KSAF",
"code": "ksaf",
"order": 4,
"class": "tier-two"
},
{
"name": "Local Data",
"code": "CPALocal",
"order": 1,
"class": "cpa"
},
{
"name": "Terminal Data",
"code": "CPATerminal",
"order": 2,
"class": "cpa"
},
{
"name": "Enroute Data",
"code": "CPAEnroute",
"order": 3,
"class": "cpa"
}
]
97 changes: 56 additions & 41 deletions seeds/roles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,56 @@
[{
"name": "Air Traffic Manager",
"code": "atm",
"order": 1,
"class": "senior"
},{
"name": "Deputy Air Traffic Manager",
"code": "datm",
"order": 2,
"class": "senior"
},{
"name": "Training Administrator",
"code": "ta",
"order": 3,
"class": "senior"
},{
"name": "Events Coordinator",
"code": "ec",
"order": 4,
"class": "junior"
},{
"name": "Webmaster",
"code": "wm",
"order": 5,
"class": "junior"
},{
"name": "Facilities Engineer",
"code": "fe",
"order": 6,
"class": "junior"
},{
"name": "Instructor",
"code": "ins",
"order": 7,
"class": "training"
},{
"name": "Mentor",
"code": "mtr",
"order": 8,
"class": "training"
}]
[
{
"name": "Air Traffic Manager",
"code": "atm",
"order": 1,
"class": "senior"
},
{
"name": "Deputy Air Traffic Manager",
"code": "datm",
"order": 2,
"class": "senior"
},
{
"name": "Training Administrator",
"code": "ta",
"order": 3,
"class": "senior"
},
{
"name": "Events Coordinator",
"code": "ec",
"order": 4,
"class": "junior"
},
{
"name": "Webmaster",
"code": "wm",
"order": 5,
"class": "junior"
},
{
"name": "Facilities Engineer",
"code": "fe",
"order": 6,
"class": "junior"
},
{
"name": "Instructor",
"code": "ins",
"order": 7,
"class": "training"
},
{
"name": "Mentor",
"code": "mtr",
"order": 8,
"class": "training"
},
{
"name": "Combined Monitor",
"code": "cm",
"order": 9,
"class": "training"
}
]