Dev to main sync #1841

prakashchoudhary07 · 2024-01-08T20:11:10Z

Date: 09-1-24

Developer Name: @prakashchoudhary07

PR's going in

(Developer)s Name

Is Under Feature Flag

Yes
No

Database changes

Yes
No

Breaking changes (If your feature is breaking/missing something please mention pending tickets)

Yes
No

Is Development Tested?

Yes
No

Is it tested in staging?

Yes
No

Add relevant Screenshot below ( e.g test coverage etc. )

#1841 (comment)

* doc: added doc for user status flow diagram * flow diagram updated

* fix: add condition to skip discordId check * fix: add superuser check * test: add test for super user check * fix: remove unused code

test/integration/authorizeUsersAndService.test.ts

+ return res.json({ message: "pong" });
+ };
+
+ router.get("/for-super-user", authorization([ROLES.SUPERUSER], [Services.CRON_JOB_HANDLER]), pongHandler);


test/integration/authorizeUsersAndService.test.ts

+
+ describe("Service Authorization", function () {
+ it("should return unauthorized for invalid authorization header format", async function () {
+ req.headers.authorization = "InvalidHeader";


test/integration/authorizeUsersAndService.test.ts

+ });
+
+ it("should return unauthorized for invalid JWT token", async function () {
+ req.headers.authorization = "Bearer invalid_token";


satyam73 · 2024-01-08T20:17:17Z

Staging proof of #1839

get request to get invite for user

post request if user invite is already present

post request for invitation code

Main to dev sync

routes/answers.ts

+router.post("/", answerValidators.createAnswer, answers.createAnswer);
+router.patch(
+ "/:answerId",
+ authenticate,


* API for applications * authorizeown or super user middleware in get request * validator changes * config changes * log for update application * test for get application API * completed get application tests * application API test completed * changed according to the discord link generate api changes * few changes based on new requirement and few changes after self review * controller message changed * removed unwanted code and updated types for controller methods * fix for failing tests * removed console log * made changes suggested * logger string change * fix issues in comments, logger error, and types * fix for logtype import issue * application import fix * updated validator according to model change and removed unwanted imports * fix for faling build * filtering based on status * updated getAllApplication tests * removed only from tests * added new route to get application by id * validation for status sent in payload * logic change for sending all user applications * made userId optional * completed suggested changes on PR * created at field in applications * tests for application details API * updated test for updating applications * pagination for applications API * logic change for pending application for user * completed model tests for application * removed .only from applications model tests * updated integration test * change in application get API test with status * removed only from tests * added try catch * script for updating applications * application model test for batch update * integration test for batch update API * unit test for model for batch updating applications * fix failing unit test * removed console logs --------- Co-authored-by: Prakash Choudhary <[email protected]> Co-authored-by: Sunny Sahsi <[email protected]> Co-authored-by: Vikhyat Bhatnagar <[email protected]>

routes/applications.ts

@@ -24,5 +24,6 @@
 applicationValidator.validateApplicationUpdateData,
 applications.updateApplication
 );
+router.patch("/batch/update", authenticate, authorizeRoles([SUPERUSER]), applications.batchUpdateApplications);


satyam73 · 2024-01-10T08:52:51Z

Staging working proof of #1742

Get request with status query param initial connection with data: null

Get request with questionId and status query param initial connection with data: null

Post API /answers

Get api triiger when post api triggers

Unauthorized if user is not super user or member

Succesful patch request when member is true

Succesful patch request when super_user is true

status query with APPROVED value (get request) triggers when there is any update happens with PATCH request /answers

) * added types and middleware for ooo status request * added test and fixtures data ooo request * added more test and fix middleware ooo get request * refactor test and data * Update test/unit/middlewares/request.test.ts * remove unused import * added more validation to validate create ooo request * refactor middleware and fix test * fix error and improve test coverage * change processedBy to lastUpdatedBy

Ajeyakrishna-k · 2024-01-15T16:01:23Z

My changes Look good 👍. Can't verify as its only a middleware

Co-authored-by: Satyam Bajpai <[email protected]>

routes/users.js

+// WARNING!! - One time Script/Route to do migration
+router.post(
+ "/migrations",
+ authenticate,


joyguptaa · 2024-01-19T12:55:41Z

Date: 22-Jan-2023

Developer Name: @ardourApeX

PR's going in

Feat/GitHub duplication #1818

(Developer)s Name

@ardourApeX

Is Under the Feature Flag

Yes
No

Database changes

Yes
No

Breaking changes (If your feature is breaking/missing something please mention pending tickets)

Yes
No

Is Development Tested?

Yes
No

Is it tested in staging?

Yes
No

Add relevant Screenshot below ( e.g test coverage etc. )

`github_user_id` being added after login

Screen.Recording.2024-01-18.at.10.08.46.PM.mov

Status before triggering the API

Screen.Recording.2024-01-18.at.11.54.03.PM.mov

API Response

Screen.Recording.2024-01-18.at.11.59.14.PM.mov

Status after executing the API

* chore : added middleware for invite API and type package for sinon * test: added test for middaleware with data * refactor: change field reason to purpose * feat: added new api for discord invites * refactor: change file and added inviteLink to type * fix import * added config for external service authintication * test: fix failing test * change field name uniqueUserId to userId * refactor: fix error message * refactor: using existing model or collection for storing invite data in db * fix test and used global custom respone type * refactor: create seprate middleware for authinticate external service

routes/invites.ts

+import { createInviteLink,getInviteLink } from "../controllers/invites";
+import authinticateServiceRequest from "../middlewares/authinticateServiceRequest";
+
+router.post("/",authinticateServiceRequest, createInviteValidator, createInviteLink);


routes/invites.ts

+import authinticateServiceRequest from "../middlewares/authinticateServiceRequest";
+
+router.post("/",authinticateServiceRequest, createInviteValidator, createInviteLink);
+router.get("/:userId" ,authinticateServiceRequest, getInviteLink);


sahsisunny · 2024-01-19T20:18:11Z

FEAT: New Discord invite API for external service #1852

Ajeyakrishna-k and others added 3 commits January 8, 2024 12:27

Adds middleware to authorise users and services (#1826)

d108888

DOC: Add Detailed Flow Diagram for User Status Implementation (#1823)

7370153

* doc: added doc for user status flow diagram * flow diagram updated

Add condition to skip discordId check (#1839)

208feca

* fix: add condition to skip discordId check * fix: add superuser check * test: add test for super user check * fix: remove unused code

github-advanced-security bot found potential problems Jan 8, 2024

View reviewed changes

prakashchoudhary07 and others added 2 commits January 9, 2024 01:53

Merge pull request #1842 from Real-Dev-Squad/main

a4b785c

Main to dev sync

Feat/answers api (#1742)

3da9236

github-advanced-security bot found potential problems Jan 9, 2024

View reviewed changes

Ajeyakrishna-k and others added 2 commits January 12, 2024 05:17

chore: Delete .github/pull_request_template.md (#1844)

fd897d9

satyam73 previously approved these changes Jan 15, 2024

View reviewed changes

fix: undefined status query param issue in answer api (#1850)

dce007b

iamitprakash dismissed satyam73’s stale review via dce007b January 16, 2024 18:43

prakashchoudhary07 and others added 2 commits January 17, 2024 23:53

feat: add eol to lf for all js, ts and json files (#1824)

b95db94

Co-authored-by: Satyam Bajpai <[email protected]>

Feat/GitHub duplication (#1818)

535545c

github-advanced-security bot found potential problems Jan 18, 2024

View reviewed changes

github-advanced-security bot found potential problems Jan 19, 2024

View reviewed changes

sahsisunny approved these changes Jan 19, 2024

View reviewed changes

iamitprakash merged commit 1deeedb into main Jan 19, 2024
4 of 5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev to main sync #1841

Dev to main sync #1841

prakashchoudhary07 commented Jan 8, 2024 •

edited by sahsisunny

Loading

satyam73 commented Jan 8, 2024

satyam73 commented Jan 10, 2024

Ajeyakrishna-k commented Jan 15, 2024 •

edited

Loading

joyguptaa commented Jan 19, 2024

sahsisunny commented Jan 19, 2024 •

edited

Loading

Dev to main sync #1841

Dev to main sync #1841

Conversation

prakashchoudhary07 commented Jan 8, 2024 • edited by sahsisunny Loading

Add relevant Screenshot below ( e.g test coverage etc. )

satyam73 commented Jan 8, 2024

satyam73 commented Jan 10, 2024

Staging working proof of #1742

Ajeyakrishna-k commented Jan 15, 2024 • edited Loading

joyguptaa commented Jan 19, 2024

Add relevant Screenshot below ( e.g test coverage etc. )

github_user_id being added after login

Status before triggering the API

API Response

Status after executing the API

sahsisunny commented Jan 19, 2024 • edited Loading

prakashchoudhary07 commented Jan 8, 2024 •

edited by sahsisunny

Loading

Ajeyakrishna-k commented Jan 15, 2024 •

edited

Loading

`github_user_id` being added after login

sahsisunny commented Jan 19, 2024 •

edited

Loading