From c690bcc9f3474d865496af85b4633d41587b1c18 Mon Sep 17 00:00:00 2001 From: kyleburgess Date: Fri, 27 Sep 2024 11:00:53 -0500 Subject: [PATCH 1/2] Solution script --- app/api/exercises/route.ts | 5 +- app/api/stats/route.ts | 59 ++++++++- app/api/workouts/route.ts | 19 ++- models/Exercise.ts | 13 ++ models/Workout.ts | 14 +++ package-lock.json | 244 ++++++++++++++++++++++++++++++++++++- package.json | 3 + 7 files changed, 347 insertions(+), 10 deletions(-) create mode 100644 models/Exercise.ts create mode 100644 models/Workout.ts diff --git a/app/api/exercises/route.ts b/app/api/exercises/route.ts index 9b4c3ab..c75b921 100644 --- a/app/api/exercises/route.ts +++ b/app/api/exercises/route.ts @@ -1,6 +1,9 @@ -import { exercises } from "@/constants/fake-data"; +import dbConnect from "@/lib/db-connect"; +import { Exercise } from "@/models/Exercise"; export async function GET() { + await dbConnect(); + const exercises = await Exercise.find({}); return new Response(JSON.stringify(exercises), { headers: { "content-type": "application/json", diff --git a/app/api/stats/route.ts b/app/api/stats/route.ts index aa71d73..31eede4 100644 --- a/app/api/stats/route.ts +++ b/app/api/stats/route.ts @@ -1,6 +1,63 @@ -import {stats} from "@/constants/fake-data"; +import dbConnect from "@/lib/db-connect"; +import { Workout } from "@/models/Workout"; export async function GET() { + await dbConnect(); + const totalWorkouts = await Workout.countDocuments(); + const totalReps = await Workout.aggregate([ + { + $group: { + _id: null, + total: { $sum: { $multiply: ["$reps", "$sets"] } }, + }, + }, + ]); + const totalSets = await Workout.aggregate([ + { + $group: { + _id: null, + total: { $sum: "$sets" }, + }, + }, + ]); + const totalLifted = await Workout.aggregate([ + { + $group: { + _id: null, + total: { $sum: { $multiply: ["$reps", "$sets", "$weight"] } }, + }, + }, + ]); + // IF TIME PERMITS + const totalChestLifted = await Workout.aggregate([ + { + // match chest exercises, which uses info from the Exercise collection + $lookup: { + from: "exercises", + localField: "exercise", + foreignField: "_id", + as: "exercise", + }, + }, + { + $match: { + "exercise.muscleGroup": "Chest", + }, + }, + { + $group: { + _id: null, + total: { $sum: { $multiply: ["$reps", "$sets", "$weight"] } }, + }, + }, + ]); + console.log("totalChestLifted", totalChestLifted); + const stats = { + totalWorkouts: await totalWorkouts, + totalReps: totalReps[0]?.total || 0, + totalSets: totalSets[0]?.total || 0, + totalLifted: totalLifted[0]?.total || 0, + } return new Response(JSON.stringify(stats), { headers: { "content-type": "application/json", diff --git a/app/api/workouts/route.ts b/app/api/workouts/route.ts index dbd6d05..7732fea 100644 --- a/app/api/workouts/route.ts +++ b/app/api/workouts/route.ts @@ -1,6 +1,10 @@ -import { workouts } from "@/constants/fake-data"; +import dbConnect from "@/lib/db-connect"; +import { Workout } from "@/models/Workout"; -export function GET() { +export async function GET() { + await dbConnect(); + + const workouts = await Workout.find({}).populate("exercise").exec(); return new Response(JSON.stringify(workouts), { headers: { "content-type": "application/json", @@ -9,7 +13,14 @@ export function GET() { } export async function POST(request: Request) { + await dbConnect(); + const body = await request.json(); - console.log(body) - return new Response(); + const doc = new Workout(body); + const response = await doc.save(); + return new Response(JSON.stringify(response), { + headers: { + "content-type": "application/json", + }, + }); } \ No newline at end of file diff --git a/models/Exercise.ts b/models/Exercise.ts new file mode 100644 index 0000000..608bc64 --- /dev/null +++ b/models/Exercise.ts @@ -0,0 +1,13 @@ +import {Schema, model, models} from "mongoose"; +import {ExerciseType} from "../types/types"; + +export const exerciseSchema = new Schema({ + name: String, + muscleGroup: String, + equipment: String, + difficulty: Number, +}); + +console.log(models) + +export const Exercise = models.exercises || model("Exercise", exerciseSchema); \ No newline at end of file diff --git a/models/Workout.ts b/models/Workout.ts new file mode 100644 index 0000000..3184755 --- /dev/null +++ b/models/Workout.ts @@ -0,0 +1,14 @@ +import {Schema, model, models} from "mongoose"; +import {WorkoutType} from "../types/types"; + +const workoutSchema = new Schema({ + exercise: { + type: Schema.Types.ObjectId, + ref: "Exercise", + }, + reps: Number, + sets: Number, + weight: Number, +}); + +export const Workout = models.workouts || model("Workout", workoutSchema); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index cd42f64..bad45c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,9 @@ "dependencies": { "@ant-design/nextjs-registry": "^1.0.1", "antd": "^5.21.1", + "dotenv": "^16.4.5", + "mongodb": "^6.9.0", + "mongoose": "^8.6.3", "next": "14.2.13", "react": "^18", "react-dom": "^18" @@ -351,6 +354,14 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz", + "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==", + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, "node_modules/@next/env": { "version": "14.2.13", "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.13.tgz", @@ -760,6 +771,19 @@ "@types/react": "*" } }, + "node_modules/@types/webidl-conversions": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + }, + "node_modules/@types/whatwg-url": { + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", + "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", + "dependencies": { + "@types/webidl-conversions": "*" + } + }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "8.7.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.7.0.tgz", @@ -1367,6 +1391,14 @@ "node": ">=8" } }, + "node_modules/bson": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.8.0.tgz", + "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", + "engines": { + "node": ">=16.20.1" + } + }, "node_modules/busboy": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", @@ -1639,7 +1671,6 @@ "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dev": true, "dependencies": { "ms": "^2.1.3" }, @@ -1748,6 +1779,17 @@ "node": ">=6.0.0" } }, + "node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -3406,6 +3448,14 @@ "node": ">=4.0" } }, + "node_modules/kareem": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.6.3.tgz", + "integrity": "sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q==", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -3499,6 +3549,11 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true }, + "node_modules/memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3551,11 +3606,149 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/mongodb": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz", + "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==", + "dependencies": { + "@mongodb-js/saslprep": "^1.1.5", + "bson": "^6.7.0", + "mongodb-connection-string-url": "^3.0.0" + }, + "engines": { + "node": ">=16.20.1" + }, + "peerDependencies": { + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.1.0", + "gcp-metadata": "^5.2.0", + "kerberos": "^2.0.1", + "mongodb-client-encryption": ">=6.0.0 <7", + "snappy": "^7.2.2", + "socks": "^2.7.1" + }, + "peerDependenciesMeta": { + "@aws-sdk/credential-providers": { + "optional": true + }, + "@mongodb-js/zstd": { + "optional": true + }, + "gcp-metadata": { + "optional": true + }, + "kerberos": { + "optional": true + }, + "mongodb-client-encryption": { + "optional": true + }, + "snappy": { + "optional": true + }, + "socks": { + "optional": true + } + } + }, + "node_modules/mongodb-connection-string-url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", + "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==", + "dependencies": { + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^13.0.0" + } + }, + "node_modules/mongoose": { + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.6.3.tgz", + "integrity": "sha512-++yRmm7hjMbqVA/8WeiygTnEfrFbiy+OBjQi49GFJIvCQuSYE56myyQWo4j5hbpcHjhHQU8NukMNGTwAWFWjIw==", + "dependencies": { + "bson": "^6.7.0", + "kareem": "2.6.3", + "mongodb": "6.8.0", + "mpath": "0.9.0", + "mquery": "5.0.0", + "ms": "2.1.3", + "sift": "17.1.3" + }, + "engines": { + "node": ">=16.20.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mongoose" + } + }, + "node_modules/mongoose/node_modules/mongodb": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz", + "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", + "dependencies": { + "@mongodb-js/saslprep": "^1.1.5", + "bson": "^6.7.0", + "mongodb-connection-string-url": "^3.0.0" + }, + "engines": { + "node": ">=16.20.1" + }, + "peerDependencies": { + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.1.0", + "gcp-metadata": "^5.2.0", + "kerberos": "^2.0.1", + "mongodb-client-encryption": ">=6.0.0 <7", + "snappy": "^7.2.2", + "socks": "^2.7.1" + }, + "peerDependenciesMeta": { + "@aws-sdk/credential-providers": { + "optional": true + }, + "@mongodb-js/zstd": { + "optional": true + }, + "gcp-metadata": { + "optional": true + }, + "kerberos": { + "optional": true + }, + "mongodb-client-encryption": { + "optional": true + }, + "snappy": { + "optional": true + }, + "socks": { + "optional": true + } + } + }, + "node_modules/mpath": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz", + "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mquery": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-5.0.0.tgz", + "integrity": "sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==", + "dependencies": { + "debug": "4.x" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/mz": { "version": "2.7.0", @@ -4152,7 +4345,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, "engines": { "node": ">=6" } @@ -5092,6 +5284,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/sift": { + "version": "17.1.3", + "resolved": "https://registry.npmjs.org/sift/-/sift-17.1.3.tgz", + "integrity": "sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==" + }, "node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -5112,6 +5309,14 @@ "node": ">=0.10.0" } }, + "node_modules/sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "dependencies": { + "memory-pager": "^1.0.2" + } + }, "node_modules/stop-iteration-iterator": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", @@ -5514,6 +5719,17 @@ "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz", "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==" }, + "node_modules/tr46": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "dependencies": { + "punycode": "^2.3.0" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/ts-api-utils": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", @@ -5695,6 +5911,26 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", + "dependencies": { + "tr46": "^4.1.1", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 6c3038d..4e875e8 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,9 @@ "dependencies": { "@ant-design/nextjs-registry": "^1.0.1", "antd": "^5.21.1", + "dotenv": "^16.4.5", + "mongodb": "^6.9.0", + "mongoose": "^8.6.3", "next": "14.2.13", "react": "^18", "react-dom": "^18" From ae7b3c7d4b79c36c8eab36e7e96ba6f4ec4dd539 Mon Sep 17 00:00:00 2001 From: kyleburgess Date: Fri, 27 Sep 2024 18:18:14 -0500 Subject: [PATCH 2/2] Fixing --- app/api/exercises/route.ts | 6 +----- app/api/stats/route.ts | 6 +----- app/api/workouts/route.ts | 6 +----- models/Exercise.ts | 2 +- models/Workout.ts | 2 +- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/app/api/exercises/route.ts b/app/api/exercises/route.ts index c75b921..bc5a546 100644 --- a/app/api/exercises/route.ts +++ b/app/api/exercises/route.ts @@ -4,9 +4,5 @@ import { Exercise } from "@/models/Exercise"; export async function GET() { await dbConnect(); const exercises = await Exercise.find({}); - return new Response(JSON.stringify(exercises), { - headers: { - "content-type": "application/json", - }, - }); + return new Response(JSON.stringify(exercises)); } \ No newline at end of file diff --git a/app/api/stats/route.ts b/app/api/stats/route.ts index 31eede4..726258d 100644 --- a/app/api/stats/route.ts +++ b/app/api/stats/route.ts @@ -58,9 +58,5 @@ export async function GET() { totalSets: totalSets[0]?.total || 0, totalLifted: totalLifted[0]?.total || 0, } - return new Response(JSON.stringify(stats), { - headers: { - "content-type": "application/json", - }, - }); + return new Response(JSON.stringify(stats)); } \ No newline at end of file diff --git a/app/api/workouts/route.ts b/app/api/workouts/route.ts index 7732fea..781c459 100644 --- a/app/api/workouts/route.ts +++ b/app/api/workouts/route.ts @@ -18,9 +18,5 @@ export async function POST(request: Request) { const body = await request.json(); const doc = new Workout(body); const response = await doc.save(); - return new Response(JSON.stringify(response), { - headers: { - "content-type": "application/json", - }, - }); + return new Response(JSON.stringify(response)); } \ No newline at end of file diff --git a/models/Exercise.ts b/models/Exercise.ts index 608bc64..309700b 100644 --- a/models/Exercise.ts +++ b/models/Exercise.ts @@ -10,4 +10,4 @@ export const exerciseSchema = new Schema({ console.log(models) -export const Exercise = models.exercises || model("Exercise", exerciseSchema); \ No newline at end of file +export const Exercise = models.Exercise || model("Exercise", exerciseSchema); \ No newline at end of file diff --git a/models/Workout.ts b/models/Workout.ts index 3184755..c7038b3 100644 --- a/models/Workout.ts +++ b/models/Workout.ts @@ -11,4 +11,4 @@ const workoutSchema = new Schema({ weight: Number, }); -export const Workout = models.workouts || model("Workout", workoutSchema); \ No newline at end of file +export const Workout = models.Workout || model("Workout", workoutSchema); \ No newline at end of file