payservedb 7.0.2 → 7.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payservedb",
-  "version": "7.0.2",
+  "version": "7.0.4",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/models/facilityInvoice.js

@@ -1,5 +1,5 @@
 const mongoose = require("mongoose");
-const {Recipient} = require("./facilityInvoiceRecipient")
+const {RecipientSchema} = require("./facilityInvoiceRecipient")
 
 const FacilityInvoiceSchema = new mongoose.Schema(
   {
@@ -14,7 +14,7 @@ const FacilityInvoiceSchema = new mongoose.Schema(
       required: true,
     },
       recipient: {
-          type: Recipient,
+          type: RecipientSchema,
           required: true,
       },
       invoiceNumber: {

package/src/models/facilityInvoiceRecipient.js

@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
 
-const Recipient = new mongoose.Schema(
+const RecipientSchema = new mongoose.Schema(
     {
         facilityId: {
             type: mongoose.Schema.Types.ObjectId,
@@ -25,7 +25,12 @@ const Recipient = new mongoose.Schema(
 );
 
 
+const Recipient = mongoose.model("Recipient", RecipientSchema);
+
+
+module.exports = Recipient
+
 
 module.exports = {
-    Recipient
-};
+    RecipientSchema
+}

package/src/models/facilityInvoicerecipientMD.js

@@ -1,33 +0,0 @@
-const mongoose = require("mongoose");
-
-const Recipient = new mongoose.Schema(
-    {
-        facilityId: {
-            type: mongoose.Schema.Types.ObjectId,
-            ref: "Facility",
-            required: true,
-        },
-        phoneNumber: {
-            type: String,
-            required: true
-        },
-        email: {
-            type: String,
-            required: true,
-            lowercase: true,
-            trim: true,
-            match: [/^\S+@\S+\.\S+$/, "Please enter a valid email address"]
-        }
-    },
-    {
-        timestamps: true,
-    }
-);
-
-
-const RecipientSchema = mongoose.model("RecipientSchema", Recipient);
-
-
-module.exports = {
-    RecipientSchema,
-};