tings

docker-compose.yml

@@ -5,7 +5,7 @@ services:
       dockerfile: Dockerfile
     environment:
       PORT: ${PORT}
-      DB_CONNECTION_STRING: ${DB_CONNECTION_STRING}
+      DB_CONNECTION_STRING: ${CLOUD_DB_CONNECTION_STRING}
       BASE_URL: ${BASE_URL}
       MQTT_CONNECT_STRING: ${MQTT_CONNECT_STRING}
       MQTT_USERNAME: ${MQTT_USERNAME}

package.json

@@ -21,6 +21,7 @@
     "bcrypt": "^5.1.1",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
+    "mongodb": "^6.5.0",
     "mongoose": "^8.2.0",
     "mqtt": "^5.3.6",
     "nodemon": "^3.1.0",

src/db/db.ts

@@ -1,17 +1,14 @@
 import mongoose from "mongoose";
 import { config } from "dotenv";
-import { mongoDbPreferences } from "./mongoDbPreferences";
 
 config();
 
 export async function connectToDb() {
-  if (process.env.DB_CONNECTION_STRING) {
+  if (process.env.CLOUD_DB_CONNECTION_STRING) {
     const db = await mongoose
-      .connect(
-        `${process.env.DB_CONNECTION_STRING}/${mongoDbPreferences.databaseName}`,
-      )
+      .connect(`${process.env.CLOUD_DB_CONNECTION_STRING}`)
       .then(() => console.log(`Successfully connected to MongoDB`))
-      .catch((error) => console.error(`Comnnection error: ${error}`));
+      .catch((error) => console.error(`Connection error: ${error}`));
     return db;
   }
 }

src/db/mongoDbPreferences.ts

@@ -2,9 +2,9 @@ import { config } from "dotenv";
 config();
 
 export enum mongoDbPreferences {
-  databaseName = "dryAger",
-  dryAgerCollection = "DryAgers",
-  usersCollection = "Users",
-  recordsCollection = "Records",
-  recipesColleciton = "Recipes",
+  databaseName = "MeatMatureDB",
+  dryAgerCollection = "dryAgers",
+  usersCollection = "users",
+  recordsCollection = "records",
+  recipesColleciton = "recipes",
 }

src/db/schemas.ts

@@ -7,26 +7,25 @@ export const userSchema = new mongoose.Schema({
   dryAgerIds: [{ type: mongoose.Schema.Types.ObjectId, ref: "DryAger" }],
 });
 
-export const User = mongoose.model("User", userSchema);
+export const User = mongoose.model("user", userSchema);
 export type UserType = typeof userSchema;
 
 export const dryAgerSchema = new mongoose.Schema({
-  userId: { type: mongoose.Schema.Types.ObjectId, ref: "User", required: true },
+  userId: { type: mongoose.Schema.Types.ObjectId, ref: "user", required: true },
   name: { type: String, required: true },
   model: String,
   status: {
     light: { type: String, enum: ["on", "off"], default: "off" },
     fan: { type: String, enum: ["on", "off"], default: "off" },
   },
-  // Assuming records are referenced in the Records collection, not stored directly
 });
 
-export const DryAger = mongoose.model("DryAger", dryAgerSchema);
+export const DryAger = mongoose.model("dryAger", dryAgerSchema);
 
 export const recordSchema = new mongoose.Schema({
   dryAgerId: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: "DryAger",
+    ref: "dryAger",
     required: true,
   },
   date: { type: Date, default: Date.now },
@@ -38,21 +37,21 @@ export const recordSchema = new mongoose.Schema({
 
 recordSchema.index({ dryAgerId: 1, date: -1 });
 
-export const Record = mongoose.model("Record", recordSchema);
+export const Record = mongoose.model("record", recordSchema);
 
 export const recipeSchema = new mongoose.Schema({
-  userId: { type: mongoose.Schema.Types.ObjectId, ref: "User", required: true },
+  userId: { type: mongoose.Schema.Types.ObjectId, ref: "user", required: true },
   name: { type: String, required: true },
   description: String,
   notes: String,
   dryAgerId: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: "DryAger",
+    ref: "dryAger",
     required: true,
   },
   startDate: { type: Date, required: true },
   endDate: { type: Date, required: true },
-  relatedRecords: [{ type: mongoose.Schema.Types.ObjectId, ref: "Record" }],
+  relatedRecords: [{ type: mongoose.Schema.Types.ObjectId, ref: "record" }],
 });
 
-export const Recipe = mongoose.model("Recipe", recipeSchema);
+export const Recipe = mongoose.model("recipe", recipeSchema);

src/endPoints/users/router.ts

@@ -72,9 +72,9 @@ export const userRouter = router({
     return res;
   }),
 
-  test: publicProcedure.query(()=>{
-    return 'success'
-  })
+  test: publicProcedure.query(() => {
+    return "success";
+  }),
 });
 
 export type userRouter = typeof userRouter;

src/types.ts

@@ -22,21 +22,6 @@ export type EditUser = {
   email?: string;
 };
 
-export const testSchema = z
-  .object({
-    username: z.string().optional(),
-    id: z.string().optional(),
-  })
-  .refine(
-    (data) => {
-      // Ensure exactly one of the properties is provided
-      return (data.username && !data.id) || (!data.username && data.id);
-    },
-    {
-      message: "Either 'username' or 'id' must be provided, but not both.",
-    },
-  );
-
 export type DryAger = {
   _id: string;
   userId: string; // Reference to User