Merge branch 'mongoose' of https://github.com/austenstone/github-value into mongoose

Author: MattG57

backend/src/controllers/adoption.controller.ts

@@ -4,27 +4,26 @@ import adoptionService from '../services/adoption.service.js';
 
 class AdoptionController {
   async getAdoptions(req: Request, res: Response): Promise<void> {
-    const {  enterprise, daysInactive, org, team, precision, since, until, seats } = req.query as { [key: string]: string | undefined };;
+    const { enterprise, org, team, since, until, seats } = req.query as { [key: string]: string | undefined };;
     try {
       const dateFilter = {
         ...(since && { $gte: new Date(since) }),
         ...(until && { $lte: new Date(until) })
       };
-      
-      const query = { 
+
+      const query = {
         filter: {
-        ...enterprise ? {enterprise: 'enterprise'} : undefined,
-        ...org ? { org } : undefined,
-        ...team ? { team } : undefined,
-        ...precision ? { precision } : undefined,
-        ...(Object.keys(dateFilter).length && { date: dateFilter }),
-      },
-      projection: {
-        ...seats === '1' ? {} : { seats: 0 },
-        _id: 0,
-        __v: 0,
+          ...enterprise ? { enterprise: 'enterprise' } : undefined,
+          ...org ? { org } : undefined,
+          ...team ? { team } : undefined,
+          ...(Object.keys(dateFilter).length && { date: dateFilter }),
+        },
+        projection: {
+          ...seats === '1' ? {} : { seats: 0 },
+          _id: 0,
+          __v: 0,
+        }
       }
-    }
       const adoptions = await adoptionService.getAllAdoptions2(query);
       res.status(200).json(adoptions);
     } catch (error) {

backend/src/database.ts

@@ -43,7 +43,7 @@ class Database {
     } catch (error) {
       logger.debug(error);
       if (error instanceof Error) {
-        logger.error(error.message);
+        logger.error(`Database connection error: ${error.message}`);
       }
       throw error;
     }
@@ -100,8 +100,6 @@ class Database {
       total_pr_summaries_created: Number
     });
 
-
-
     // Editor Schema 🖥️
     const EditorSchema = new mongoose.Schema({
       name: String,

backend/src/services/adoption.service.ts

@@ -7,9 +7,9 @@ type AdoptionType = any;
 
 export interface GetAdoptionsParams {
   enterprise?: string;
-  daysInactive?: number;
   org?: string;
-  team
+  team?: string;
+  daysInactive?: number;
   precision?: string;
   since?: string;
   until?: string;
@@ -95,7 +95,7 @@ export class AdoptionService {
 
     try {
       return await adoptionModel.find(params.filter, params.projection)
-        .sort({ date: -1 });
+        .sort({ date: 1 });
     } catch (error) {
       logger.error('Error fetching all adoptions:', error);
       throw error;

backend/src/services/query.service.ts

@@ -8,7 +8,6 @@ import mongoose from 'mongoose';
 import metricsService from './metrics.service.js';
 import teamsService from './teams.service.js';
 import adoptionService from './adoption.service.js';
-import { time } from 'console';
 
 const DEFAULT_CRON_EXPRESSION = '0 * * * *';
 class QueryService {
@@ -44,7 +43,7 @@ class QueryService {
     this.cronJob.stop();
   }
 
-  private async task() { //enterprise level
+  private async task() {
     const queryAt = new Date();
     const tasks = [];
     for await (const { octokit, installation } of this.app.eachInstallation.iterator()) {

frontend/src/app/highcharts.theme.ts

@@ -80,14 +80,12 @@ const theme: Highcharts.Options = {
         states: {
           hover: {
             fill: 'var(--mdc-filled-button-container-color)',
-            brightness: 1.08,
             style: {
               color: 'var(--mdc-filled-button-label-text-color)'
             }
           },
           select: {
             fill: 'var(--mdc-filled-button-container-color)',
-            brightness: 0.95
           }
         },
         paddingLeft: 24,