Merge pull request #142 from HackRU/unregistered-teammates-bug

Unregistered teammates bug

Author: avsomers25

src/functions/teams/create/handler.ts

@@ -74,6 +74,18 @@ const teamsCreate: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (ev
       };
     }
 
+    // Check if auth user has valid registration status for team creation
+    const validStatesForTeamCreation = ['registered', 'confirmation', 'coming'];
+    if (!validStatesForTeamCreation.includes(authUser.registration_status)) {
+      return {
+        statusCode: 400,
+        body: JSON.stringify({
+          statusCode: 400,
+          message: `User must be in 'registered', 'confirmation', or 'coming' state to create a team. Current state: ${authUser.registration_status}`,
+        }),
+      };
+    }
+
     // Check if user already leads a team
     if (authUser.team_info?.role === 'leader') {
       return {
@@ -112,11 +124,14 @@ const teamsCreate: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (ev
 
     const invalidEmails = [];
     const emailsAlreadyInTeams = [];
+    const emailsWithInvalidStatus = [];
 
     for (const email of memberEmails) {
       const user = await users.findOne({ email: email });
       if (!user) invalidEmails.push(email);
       else if (user.confirmed_team === true) emailsAlreadyInTeams.push(email);
+      else if (!validStatesForTeamCreation.includes(user.registration_status))
+        emailsWithInvalidStatus.push({ email, status: user.registration_status });
     }
 
     // Return errors if any validation failed
@@ -142,6 +157,18 @@ const teamsCreate: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (ev
       };
     }
 
+    if (emailsWithInvalidStatus.length > 0) {
+      return {
+        statusCode: 400,
+        body: JSON.stringify({
+          statusCode: 400,
+          message: 'Some users have invalid registration status for team creation',
+          invalid_status_users: emailsWithInvalidStatus,
+          required_status: validStatesForTeamCreation,
+        }),
+      };
+    }
+
     // Validate team size (leader + members <= 4)
     if (memberEmails.length > 3) {
       return {

tests/teams-create.test.ts

@@ -24,7 +24,7 @@ const mockTeamsCollection = {
 const mockDbInstance = {
   connect: jest.fn(),
   getClient: jest.fn(() => mockClient),
-  getCollection: jest.fn((name: string) => {
+  getCollection: jest.fn((name) => {
     if (name === 'users') return mockUsersCollection;
     if (name === 'teams') return mockTeamsCollection;
     return null;
@@ -78,12 +78,14 @@ describe('Teams Create Handler', () => {
     email: 'leader@test.com',
     confirmed_team: false,
     team_info: null,
+    registration_status: 'registered',
   };
 
   const mockMemberUser = {
     email: 'member1@test.com',
     confirmed_team: false,
     team_info: null,
+    registration_status: 'registered',
   };
 
   it('should successfully create team and send invitations', async () => {
@@ -381,4 +383,101 @@ describe('Teams Create Handler', () => {
       expect.objectContaining({ session: mockSession })
     );
   });
+
+  it('should return 400 when leader has unregistered status', async () => {
+    const unregisteredLeader = {
+      ...mockLeaderUser,
+      registration_status: 'unregistered',
+    };
+    mockUsersCollection.findOne.mockResolvedValue(unregisteredLeader);
+
+    const mockEvent = createEvent(mockEventData, '/teams/create', 'POST');
+    const result = await main(mockEvent, mockContext);
+
+    expect(result.statusCode).toBe(400);
+    const body = JSON.parse(result.body);
+    expect(body.message).toBe(
+      "User must be in 'registered', 'confirmation', or 'coming' state to create a team. Current state: unregistered"
+    );
+  });
+
+  it('should return 400 when leader has rejected status', async () => {
+    const rejectedLeader = {
+      ...mockLeaderUser,
+      registration_status: 'rejected',
+    };
+    mockUsersCollection.findOne.mockResolvedValue(rejectedLeader);
+
+    const mockEvent = createEvent(mockEventData, '/teams/create', 'POST');
+    const result = await main(mockEvent, mockContext);
+
+    expect(result.statusCode).toBe(400);
+    const body = JSON.parse(result.body);
+    expect(body.message).toBe(
+      "User must be in 'registered', 'confirmation', or 'coming' state to create a team. Current state: rejected"
+    );
+  });
+
+  it('should return 400 when some members have invalid registration status', async () => {
+    const unregisteredMember = {
+      ...mockMemberUser,
+      email: 'member1@test.com',
+      registration_status: 'unregistered',
+    };
+
+    const waitlistMember = {
+      ...mockMemberUser,
+      email: 'member2@test.com',
+      registration_status: 'waitlist',
+    };
+
+    mockUsersCollection.findOne
+      .mockResolvedValueOnce(mockLeaderUser) // Auth user lookup
+      .mockResolvedValueOnce(unregisteredMember) // member1@test.com lookup
+      .mockResolvedValueOnce(waitlistMember); // member2@test.com lookup
+
+    const mockEvent = createEvent(mockEventData, '/teams/create', 'POST');
+    const result = await main(mockEvent, mockContext);
+
+    expect(result.statusCode).toBe(400);
+    const body = JSON.parse(result.body);
+    expect(body.message).toBe('Some users have invalid registration status for team creation');
+    expect(body.invalid_status_users).toEqual([
+      { email: 'member1@test.com', status: 'unregistered' },
+      { email: 'member2@test.com', status: 'waitlist' },
+    ]);
+    expect(body.required_status).toEqual(['registered', 'confirmation', 'coming']);
+  });
+
+  it('should successfully create team when all users have valid registration statuses', async () => {
+    const confirmationLeader = {
+      ...mockLeaderUser,
+      registration_status: 'confirmation',
+    };
+
+    const comingMember = {
+      ...mockMemberUser,
+      email: 'member1@test.com',
+      registration_status: 'coming',
+    };
+
+    const registeredMember = {
+      ...mockMemberUser,
+      email: 'member2@test.com',
+      registration_status: 'registered',
+    };
+
+    mockUsersCollection.findOne
+      .mockResolvedValueOnce(confirmationLeader) // Auth user lookup
+      .mockResolvedValueOnce(comingMember) // member1@test.com lookup
+      .mockResolvedValueOnce(registeredMember); // member2@test.com lookup
+
+    const mockEvent = createEvent(mockEventData, '/teams/create', 'POST');
+    const result = await main(mockEvent, mockContext);
+
+    expect(result.statusCode).toBe(200);
+    const body = JSON.parse(result.body);
+    expect(body.message).toBe('Team created successfully');
+    expect(body.team_id).toBeDefined();
+  });
 });