fixed api/seats/id query to work consistently

Author: MattG57

backend/src/controllers/seats.controller.ts

@@ -14,21 +14,20 @@ class SeatsController {
 
   async getSeat(req: Request, res: Response): Promise<void> {
     const { id } = req.params;
-    const idNumber = Number(id);
-    const { since, until } = req.query as { [key: string]: string | undefined };
+    const { since, until, org } = req.query as { [key: string]: string | undefined };
 
     try {
       // Create params object with all query parameters
-      const params = { since, until };
+      const params = { since, until, org };
+      
+      // Use our new unified getSeat method that handles both ID and login
+      // Pass the ID directly without conversion - the service will handle it
+      const seat = await SeatsService.getSeat(id, params);
 
-      // Call appropriate service method with ID and params
-      const seat = isNaN(idNumber) 
-        ? await SeatsService.getAssigneeByLogin(id, params) 
-        : await SeatsService.getAssignee(idNumber, params);
-        
       res.status(200).json(seat);
     } catch (error) {
-      res.status(500).json(error);
+      console.error(`Error in getSeat controller for id=${id}:`, error);
+      res.status(500).json({ error: error.message || 'Failed to retrieve seat data' });
     }
   }
 

backend/src/database.ts

@@ -194,6 +194,10 @@ class Database {
     }, {
       timestamps: true,
     });
+    // Add to Member schema
+    memberSchema.index({ login: 1 }); // Standalone index for login lookups
+    memberSchema.index({ id: 1 });    // Standalone index for id lookups
+    memberSchema.index({ org: 1 });   // Standalone index for org lookups
     memberSchema.index({ org: 1, login: 1, id: 1 }, { unique: true });
     memberSchema.index({ seat: 1 });
     memberSchema.index({ updatedAt: -1 });
@@ -237,6 +241,11 @@ class Database {
 
     seatsSchema.index({ org: 1, queryAt: 1, last_activity_at: -1 });
     seatsSchema.index({ org: 1, team: 1, queryAt: 1, assignee_id: 1 }, { unique: true });
+    // Add to Seats schema (if not already present)
+    seatsSchema.index({ assignee_login: 1 });
+    seatsSchema.index({ assignee_id: 1 }); 
+    seatsSchema.index({ org: 1 });
+    
     mongoose.model('Seats', seatsSchema);
 
     const adoptionSchema = new Schema({

backend/src/services/seats.service.ts

@@ -126,6 +126,116 @@ class SeatsService {
       });
   }
 
+  /**
+   * Improved method to find seat information by either ID or login
+   * @param identifier Either a numeric ID or string login
+   * @param params Optional parameters for filtering (since, until, org)
+   */
+  async getSeat(identifier: string | number, params: { since?: string; until?: string; org?: string } = {}) {
+    const Seats = mongoose.model('Seats');
+    const Member = mongoose.model('Member');
+    
+    try {
+      //console.log('========== SEAT LOOKUP START ==========');
+      //console.log(`Looking up seat for identifier: ${identifier}, params:`, JSON.stringify(params));
+      
+      // Force console output to appear immediately
+      process.stdout.write(''); 
+      
+      // Determine if identifier is numeric
+      const isNumeric = !isNaN(Number(identifier)) && String(Number(identifier)) === String(identifier);
+      let numericId: number | null = null;
+      
+      // If it's a login, look up the ID first
+      if (!isNumeric) {
+      //  console.log(`Looking up member by login: ${identifier}`);
+        
+        try {
+          // Find the member by login - exact match
+          const member = await Member.findOne({ login: identifier }).lean();
+       //   console.log(`Exact login search result:`, member ? `Found ${member.login}` : 'Not found');
+          
+          if (!member) {
+            // Try case-insensitive search as a fallback
+         //   console.log(`Trying case-insensitive search for login: ${identifier}`);
+            const regex = new RegExp(`^${identifier.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')}$`, 'i');
+            const memberCaseInsensitive = await Member.findOne({ 
+              login: regex
+            }).lean();
+            
+            console.log(`Case-insensitive search result:`, memberCaseInsensitive ? `Found ${memberCaseInsensitive.login}` : 'Not found');
+            
+            if (!memberCaseInsensitive) {
+           //   console.log(`No member found with login: ${identifier}`);
+              return []; // Return empty array if no member found
+            }
+            
+            numericId = memberCaseInsensitive.id;
+           // console.log(`Found member ${memberCaseInsensitive.login} with id: ${numericId}`);
+          } else {
+            numericId = member.id;
+           // console.log(`Found member ${member.login} with id: ${numericId}`);
+          }
+        } catch (memberLookupError) {
+         // console.error(`Error during member lookup:`, memberLookupError);
+          return []; // Return empty array on error
+        }
+      } else {
+        numericId = Number(identifier);
+        //console.log(`Using numeric ID directly: ${numericId}`);
+      }
+      
+      // Build query
+      const query: Record<string, any> = { assignee_id: numericId };
+      
+      // Add filters
+      if (params.org) {
+        query.org = params.org;
+       // console.log(`Added org filter: ${params.org}`);
+      }
+      
+      if (params.since || params.until) {
+        query.createdAt = {};
+        if (params.since) {
+          query.createdAt.$gte = new Date(params.since);
+          console.log(`Added since filter: ${params.since}`);
+        }
+        if (params.until) {
+          query.createdAt.$lte = new Date(params.until);
+        //  console.log(`Added until filter: ${params.until}`);
+        }
+      }
+      
+     // console.log(`Final query:`, JSON.stringify(query));
+      
+      // Execute the query
+      //console.log(`Executing Seats.find() with query`);
+      const results = await Seats.find(query)
+        .sort({ createdAt: 1 })
+        .populate({
+          path: 'assignee',
+          model: Member,
+          select: 'login id avatar_url name url html_url'
+        })
+        .lean()
+        .exec(); // Explicitly call exec()
+      
+      //console.log(`Query complete. Found ${results?.length || 0} seat records`);
+      //console.log('========== SEAT LOOKUP END ==========');
+      
+      return results || [];
+      
+    } catch (error) {
+      console.error('========== SEAT LOOKUP ERROR ==========');
+      console.error(`Error retrieving seat data for ${identifier}:`, error);
+      console.error(`Stack trace:`, error.stack);
+      console.error('=======================================');
+      
+      // Return empty results rather than throwing error
+      return [];
+    }
+  }
+
   async insertSeats(org: string, queryAt: Date, data: SeatEntry[], team?: string) {
     const Members = mongoose.model('Member');
     const Seats = mongoose.model('Seats');