Get the request from the model

tim-s-ccs · Feb 24, 2022 · 32195bc · 32195bc
1 parent 650e1c9
commit 32195bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/models/activeModel.ts b/src/models/activeModel.ts
@@ -186,7 +186,7 @@ abstract class ActiveModel extends Model implements ActiveModelInterface {
     })) as TableRow
   }
 
-  assignAttributes = (req: Request, data?: ActiveModelData): void  => {
+  assignAttributes = (data?: ActiveModelData): void  => {
     if (data === undefined) return
 
     for (const attribute in this.modelSchema) {
@@ -206,7 +206,7 @@ abstract class ActiveModel extends Model implements ActiveModelInterface {
               }, {})
 
               this.data[attribute].forEach((activeModel: ActiveModel) => {
-                activeModel.assignAttributes(req, activeModels[activeModel.data.id])
+                activeModel.assignAttributes(activeModels[activeModel.data.id])
               })
             } else if (arrayItemConstuctor.prototype instanceof StaticModel) {
               // TODO: Chnage to somthing that is not any
@@ -221,9 +221,9 @@ abstract class ActiveModel extends Model implements ActiveModelInterface {
           }
         } else if (attributeConstructor.constructor.prototype instanceof ActiveModel) {
           if (this.data[attribute] === undefined) {
-            this.data[attribute] = (attributeConstructor.constructor as any).build(req, data[attribute])
+            this.data[attribute] = (attributeConstructor.constructor as any).build(this.req, data[attribute])
           } else {
-            (this.data[attribute] as ActiveModel).assignAttributes(req, data[attribute])
+            (this.data[attribute] as ActiveModel).assignAttributes(data[attribute])
           }
         } else if (attributeConstructor.constructor.prototype instanceof StaticModel) {
           const primaryKeyValue = utils.cast(data[attribute], String)

diff --git a/src/types/models/model.ts b/src/types/models/model.ts
@@ -18,7 +18,7 @@ export interface ActiveModelInterface {
   addError(attribute: string, error: string, message: string): void
   errorList(): Array<ListError>
   attributes(): TableRow
-  assignAttributes(req: Request, data?: ActiveModelData): void
+  assignAttributes(data?: ActiveModelData): void
   save(call: string): boolean
   create(): boolean
 }