From bf478bbbe912fa1c681b91163184a7f6c23a1f4c Mon Sep 17 00:00:00 2001 From: counterweight Date: Sat, 8 Mar 2025 00:29:52 +0100 Subject: [PATCH] pull up --- src/dependencies.js | 4 ++- src/models/index.js | 64 ++++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/dependencies.js b/src/dependencies.js index 8b4eef3..6c68534 100644 --- a/src/dependencies.js +++ b/src/dependencies.js @@ -5,8 +5,10 @@ function buildDependencies() { const errors = require('./errors'); const constants = require('./constants'); + const sequelize = require('./database'); + const { DataTypes } = require('sequelize'); const ModelsProvider = require('./models'); - const models = new ModelsProvider().provide(); + const models = new ModelsProvider({ sequelize, DataTypes }).provide(); const ServicesProvider = require('./services'); const services = new ServicesProvider({ diff --git a/src/models/index.js b/src/models/index.js index 16e3dec..02b4028 100644 --- a/src/models/index.js +++ b/src/models/index.js @@ -1,74 +1,78 @@ -const sequelize = require('../database'); -const { DataTypes } = require('sequelize'); - class ModelsProvider { + constructor({ sequelize, DataTypes }) { + this.sequelize = sequelize; + this.DataTypes = DataTypes; + } provide() { const AppInviteCreatedProvider = require('./AppInviteCreated'); const AppInviteCreated = new AppInviteCreatedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const ContactDetailsSetProvider = require('./ContactDetailsSet'); const ContactDetailsSet = new ContactDetailsSetProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const LoginChallengeCompletedProvider = require('./LoginChallengeCompleted'); const LoginChallengeCompleted = new LoginChallengeCompletedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const LoginChallengeCreatedProvider = require('./LoginChallengeCreated'); const LoginChallengeCreated = new LoginChallengeCreatedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const NostrChallengeCompletedProvider = require('./NostrChallengeCompleted'); const NostrChallengeCompleted = new NostrChallengeCompletedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const NostrChallengeCreatedProvider = require('./NostrChallengeCreated'); const NostrChallengeCreated = new NostrChallengeCreatedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const NymSetProvider = require('./NymSet'); - const NymSet = new NymSetProvider({ sequelize, DataTypes }).provide(); + const NymSet = new NymSetProvider({ + sequelize: this.sequelize, + DataTypes: this.DataTypes, + }).provide(); const OfferCreatedProvider = require('./OfferCreated'); const OfferCreated = new OfferCreatedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const OfferDeletedProvider = require('./OfferDeleted'); const OfferDeleted = new OfferDeletedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const OfferDetailsSetProvider = require('./OfferDetailsSet'); const OfferDetailsSet = new OfferDetailsSetProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const SessionCreatedProvider = require('./SessionCreated'); const SessionCreated = new SessionCreatedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const SessionRelatedToPublickeyProvider = require('./SessionRelatedToPublickey'); const SessionRelatedToPublickey = new SessionRelatedToPublickeyProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const SignUpChallengeCompletedProvider = require('./SignUpChallengeCompleted'); const SignUpChallengeCompleted = new SignUpChallengeCompletedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); const SignUpChallengeCreatedProvider = require('./SignUpChallengeCreated'); const SignUpChallengeCreated = new SignUpChallengeCreatedProvider({ - sequelize, - DataTypes, + sequelize: this.sequelize, + DataTypes: this.DataTypes, }).provide(); return {