Merge pull request #48 from oslabs-beta/react3

React3

Author: JO901

.env

@@ -1,5 +1,3 @@
-# import dotenv from 'dotenv';
-
 # dotenv.config(); //
 # Server Configuration
 PORT=3000
@@ -11,7 +9,6 @@ AWS_SECRET_ACCESS_KEY="GLV3QVs/loqagUxg/TMob5T+VnbWEoonPJX0ZxiF"
 AWS_SESSION_TOKEN_KEY="IQoJb3JpZ2luX2VjEGEaCXVzLWVhc3QtMSJHMEUCIQDA07XhxdfJSlGiBkb01mEphUQuvbN9Bw3BaBfHNSYPcAIgNk0kLlkLnFRxc41W8WLZqC7x65qH7DzNRY+mrB0NcWUq6wIIehAAGgw5MTM1MjQ5NDA2MTIiDHmtFygbJdLUbngQRSrIAh0p76fbXskc8Mpj294yowBG33InJvLc1CetdDpwVev/AM3ZtJgPFjQUjTuFdmd7mQFe/n8PvotL9Wh/+YbFjTfni8HDN9Y30B+M32baG0xbUka0NXd//bFMOCMLEpmCH5WbAFwlHlpGXxva1mOQOXXzbweQ51WCaou+GZpxL3a+sIxLHwF4dex7CBkLzyTYpBh7W1kBlXOPC+oxP9356BpZKaXBC3g3zYV6Ws80pizmZqEoVjQlmCQyLLLLQSV8GnpxIoV8o2xlTbZfx9MKyDIEJkOiEe3uH95si2ZSbQghZ/9WwWkY7lxmE75m4k+eNGDdOfUApYXJA1S4diBoxhsTwjBHJ+cWIGYPwyHCPNsdx25mmv3PO9lstESEV/7bRL4v9+v1PL7WGdfC06XcDtFYlFszoJ7Osn7scYVOV751BJRm3dlsPnYwo+uYvQY6pwGZpA4DQi35uSBzl2AaohInC3MO4+ikBqEBEAKlDgp2iquYFr8DeWFPDjfl25N7Hu0VQimL6ljLgTgy5mZ6AmyNLTQL051u3yiw3DopGHQT2hF8cEltINwirXOfaNEBrhXRrbcKENTGe5xfcIgDZf2IygEzBxGkSoEZo0rhaoNFWDBKQDvM1gzakDrHI4GI2+OgJVo2r8MIyQj37rXbrlw8Ke7fh/AIpw=="
 AWS_REGION="us-east-1"
 
-
 VITE_COGNITO_USER_POOL_ID='us-east-1_p9EHXxO94'
 VITE_COGNITO_CLIENT_ID='1b5155v1t176k3afcj6ms964l8'
 COGNITO_USER_POOL_ID='us-east-1_p9EHXxO94'

.gitignore

@@ -11,11 +11,12 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+,env
 dist
 dist-ssr
 *.local
 
-# Editor directories and files
+# Editor directories and fil-es
 .vscode/*
 !.vscode/extensions.json
 .idea
@@ -25,3 +26,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+# Aws 
+backend/.aws/*

Dockerfile-preview

@@ -3,17 +3,12 @@ FROM node:23.6.0
 
 # Set the working directory.
 WORKDIR /server
-
-
-# Copy package files and install dependencies.
 COPY ./package.json /server
-
-
-COPY ./backend/serve.js /server
-COPY ./backend/externalIDGenerator.js /server
-COPY ./backend/cloudwatch.js /server
 RUN npm install
 
+# Copy package files and install dependencies.
+COPY ./backend /server
+
 # Copy the rest of your application code.
 # Expose the port Vite is running on.
 EXPOSE 81

Dockerfile-server

@@ -0,0 +1,3 @@
+[default]
+region=us-east-1
+output=json

backend/.aws/config

@@ -3,25 +3,40 @@ import {
   CloudWatchServiceException, // Handles specific errors from CloudWatch
   GetMetricDataCommand, // Sends a request to fetch metric data
 } from '@aws-sdk/client-cloudwatch';
+import { fromIni } from '@aws-sdk/credential-providers';
+const region = 'us-east-1';
 
-const client = new CloudWatchClient({ region: 'us-east-1' });
-let response;
-const InstanceId = 'i-0610f2356e0d72fcd';
+async function MixedMetrix(metricMap) {
+  const client = new CloudWatchClient({
+    region,
+    credentials: fromIni({
+      profile: 'default',
+    }),
+  });
+  let response;
+  const InstanceId = 'i-0610f2356e0d72fcd';
 
+  const { metric, data, graph } = metricMap;
+  const queries = [];
 
+  let currentTime = new Date();
+  currentTime.setSeconds(0);
+  while (currentTime.getMinutes() % 5 !== 0) {
+    currentTime.setMinutes(currentTime.getMinutes() - 1);
+  }
 
-async function MixedMetrix(metricMap) {
-  console.log('in metricmix: ', metricMap);
-  const { graph, metric, data } = metricMap;
-  const queries = [];
+  let pastHour = new Date(currentTime);
+  pastHour.setHours(pastHour.getHours() - 1);
 
-  
+  let num = 0;
 
   for (let i = 0; i < metric.length; i++) {
+    let id = metric[i].toLowerCase() + graph[i] + num.toString();
+    num++;
     queries.push(
       {
         // MetricDataQuery
-        Id: metric[i], // required
+        Id: id, // required
         MetricStat: {
           // MetricStat
           Metric: {
@@ -48,20 +63,19 @@ async function MixedMetrix(metricMap) {
     // Input object describes the data we're requesting from CloudWatch
     // GetMetricDataInput
     MetricDataQueries: queries,
-    StartTime: new Date('2025-01-18T23:05:00.000Z'), // required
-    EndTime: new Date('2025-01-18T23:30:00.000Z'), // required
-    ScanBy: 'TimestampDescending', // Gets the newest data first
-    MaxDatapoints: 1000, // Max Datapoints 100,000
+    StartTime: pastHour, // required
+    EndTime: currentTime, // required
+    ScanBy: 'TimestampAscending', // Gets the newest data first
+    MaxDatapoints: 10000, // Max Datapoints 100,000
   };
 
   const command = new GetMetricDataCommand(input); //Creates the request to send to CloudWatch using the input
   try {
     // Sends the request and waits for the response
     response = await client.send(command);
+    //console.log('response meta: ', response);
 
-    console.log('response results', response.MetricDataResults);
-
-    return response; // logs the metric data and entire response if successful
+    return response.MetricDataResults; // logs the metric data and entire response if successful
   } catch (caught) {
     if (caught instanceof CloudWatchServiceException) {
       // if theres a CloudWatch error, it logs the error name and message

backend/cloudwatch.js

@@ -39,7 +39,6 @@ const authenticateToken = async (req, res, next) => {
 
     // Decode the JWT to get the kid (key id)
     const decodedHeader = jwt.decode(token, { complete: true })?.header;
-
     //if decodedheader exists, grab the key id
     const kid = decodedHeader?.kid;
 
@@ -49,7 +48,6 @@ const authenticateToken = async (req, res, next) => {
         .status(400)
         .json({ error: 'Invalid token: Missing kid in token header' });
     }
-
     // Fetch the public key using the kid
     const publicKey = await getKey({ kid });
 

backend/controllers/authMiddleware.js

@@ -157,7 +157,6 @@ export const awsData = async () => {
   try {
     // Sends the request and waits for the response
     response = await client.send(command);
-
     return response; // logs the metric data and entire response if successful
   } catch (caught) {
     if (caught instanceof CloudWatchServiceException) {
@@ -172,7 +171,6 @@ export const awsData = async () => {
   for (const metric of response.MetricDataResults) {
     for (let i = 0; i < metric.Timestamps.length; i++) {
       // console.log('Metric:', metric.Id, 'Value:', metric.Values[i]); // Debugging output
-
       const query = `
           INSERT INTO aws_metrics 
           (aws_account_id, metric_name, metric_value, timestamp, service_name, region)
@@ -233,7 +231,6 @@ export const awsHourData = async () => {
     ScanBy: 'TimestampAscending', // Gets the oldest data first
     MaxDatapoints: 1000, // Max Datapoints 100,000
   };
-
   const command = new GetMetricDataCommand(input); //Creates the request to send to CloudWatch using the input
   try {
     // Sends the request and waits for the response

backend/data.js

@@ -1,6 +1,4 @@
 export async function AWSdata(graphs) {
-  console.log('in fetch', graphs);
-
   try {
     let res = await fetch('http://localhost:81/data', {
       headers: {
@@ -9,9 +7,9 @@ export async function AWSdata(graphs) {
       method: 'POST',
       body: JSON.stringify(graphs),
     });
-    console.log('res: ', res);
+
     let data = await res.json();
-    console.log('data in fetch.js: ', data);
+
     return data;
   } catch (error) {
     console.error(error);

backend/fetch.js

@@ -1,5 +1,5 @@
-import client from "./modal.js"; // Import PostgreSQL client from modal.js
-import { awsData } from "./data.js"; // Import the awsData function from data.js
+import client from './modal.js'; // Import PostgreSQL client from modal.js
+import { awsData } from './data.js'; // Import the awsData function from data.js
 
 // Function to transform fetched metric data
 const transformMetrics = (metricResults) => {
@@ -9,7 +9,6 @@ const transformMetrics = (metricResults) => {
     values: result.Values || [],
   }));
 };
-
 // Function to save the transformed metrics data into PostgreSQL (using UPSERT)
 const saveMetricsToDatabase = async (awsAccountId, transformedMetrics) => {
   for (const metric of transformedMetrics) {
@@ -21,14 +20,13 @@ const saveMetricsToDatabase = async (awsAccountId, transformedMetrics) => {
         null, // instanceId (if available, otherwise null)
         metric.values[i],
         metric.timestamps[i],
-        "Average", // Stat (you can modify based on data)
-        "%", // Unit (you can modify based on data)
+        'Average', // Stat (you can modify based on data)
+        '%', // Unit (you can modify based on data)
         60 // Period (you can modify based on data)
       );
     }
   }
 };
-
 // Function to update or insert the metric using UPSERT logic
 async function updateMetric(
   awsAccountId,
@@ -64,9 +62,9 @@ async function updateMetric(
       unit,
       period,
     ]);
-    console.log("Metric updated successfully");
+    console.log('Metric updated successfully');
   } catch (err) {
-    console.error("Error updating metric:", err);
+    console.error('Error updating metric:', err);
   }
 }
 
@@ -75,7 +73,7 @@ const getAwsAccountIdByEmail = async (email) => {
   const query = `SELECT aws_account_id FROM aws_accounts WHERE user_id = (SELECT id FROM users WHERE email = $1)`;
   const result = await client.query(query, [email]);
   if (result.rows.length === 0) {
-    throw new Error("AWS account not found for the provided email.");
+    throw new Error('AWS account not found for the provided email.');
   }
   return result.rows[0].aws_account_id;
 };
@@ -84,30 +82,29 @@ const getAwsAccountIdByEmail = async (email) => {
 const Workflow = async () => {
   try {
     // Get the AWS account ID from the email
-    const awsAccountId = await getAwsAccountIdByEmail("[email protected]");
+    const awsAccountId = await getAwsAccountIdByEmail('[email protected]');
     if (!awsAccountId) {
-      throw new Error("No AWS account found for the provided email.");
+      throw new Error('No AWS account found for the provided email.');
     }
-    //testing Account ID
-    console.log("AWS Account ID:", awsAccountId);
-
+    //CAN BE DELETED --> testing Account ID 
+    console.log('AWS Account ID:', awsAccountId);
     // Fetch the data from AWS CloudWatch
     const data = await awsData();
-    console.log("Fetched AWS Data:", data); // Log the raw AWS data to inspect it
+    console.log('Fetched AWS Data:', data); // Log the raw AWS data to inspect it
 
     // Check if data.MetricDataResults exists
     if (!data.MetricDataResults) {
-      throw new Error("MetricDataResults not found in AWS data.");
+      throw new Error('MetricDataResults not found in AWS data.');
     }
 
     // Transform the data
     const transformedMetrics = transformMetrics(data.MetricDataResults);
-    console.log("Transformed Metrics:", transformedMetrics); // Log the transformed metrics
+    console.log('Transformed Metrics:', transformedMetrics); // Log the transformed metrics
 
     // Save the transformed metrics into the database
     await saveMetricsToDatabase(awsAccountId, transformedMetrics);
   } catch (err) {
-    console.error("Error in the workflow:", err);
+    console.error('Error in the workflow:', err);
   } finally {
     await client.end(); // Close connection after all queries
   }

backend/metrics.js

@@ -10,16 +10,15 @@ app.use(cors());
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
-app.get('/random', (req, res) => {
-  let id = externalIdGenerator();
+app.get('/random', async (req, res) => {
+  let id = await externalIdGenerator();
   return res.status(200).json({ id });
 });
 
-app.post('/data', (req, res) => {
+app.post('/data', async (req, res) => {
   const { graph, metric, data } = req.body;
-  let result = MixedMetrix({ graph, metric, data });
-
-  return res.status(200).json(result);
+  let result = await MixedMetrix({ graph, metric, data });
+  return res.status(200).json({result});
 });
 
 app.use((req, res) => res.status(404).send('No Data'));

backend/serve.js

@@ -31,11 +31,6 @@ app.get('/data', async (req, res) => {
 });
 
 
-app.get('/random', (req, res) => {
-  let id = externalIdGenerator();
-  res.status(200).json({ id });
-});
-
 app.get('/protected', authenticateToken, (req, res) => {
   res.status(200).json('Success, accessed a protected route');
 });