fixed imports/exports

impresso · Oct 3, 2024 · aac8830 · aac8830
1 parent 592d7da
commit aac8830
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/src/models/collections.model.js b/src/models/collections.model.js
@@ -1,13 +1,14 @@
+import User from './users.model'
+
 const nanoid = require('nanoid')
 const { DataTypes } = require('sequelize')
-const User = require('./users.model').default
 
-const STATUS_PRIVATE = 'PRI'
-const STATUS_SHARED = 'SHA'
-const STATUS_PUBLIC = 'PUB'
-const STATUS_DELETED = 'DEL'
+export const STATUS_PRIVATE = 'PRI'
+export const STATUS_SHARED = 'SHA'
+export const STATUS_PUBLIC = 'PUB'
+export const STATUS_DELETED = 'DEL'
 
-class Collection {
+export default class Collection {
   constructor(
     {
       uid = '',

diff --git a/src/models/jobs.model.js b/src/models/jobs.model.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-unused-vars */
+import User from './users.model'
+
 const { DataTypes } = require('sequelize')
 const Attachment = require('./attachments.model')
-const User = require('./users.model').default
 
 const TYPE_BULK_COLLECTION_FROM_QUERY = 'BCQ'
 const TYPE_DELETE_COLLECTION = 'DCO'
@@ -15,7 +16,7 @@ const STATUS_ARCHIVED = 'ARC'
 const STATUS_STOPPING = 'STO'
 const STATUS_KILLED = 'RIP'
 
-class Job {
+export default class Job {
   constructor({
     id = -1,
     labels = ['job'],

diff --git a/src/models/search-queries.model.js b/src/models/search-queries.model.js
@@ -1,6 +1,7 @@
+import User from './users.model'
+
 const crypto = require('crypto')
 const { DataTypes } = require('sequelize')
-const User = require('./users.model').default
 
 class SearchQuery {
   constructor({

diff --git a/src/models/uploaded-images.model.js b/src/models/uploaded-images.model.js
@@ -1,5 +1,5 @@
+import User from './users.model'
 const { DataTypes } = require('sequelize')
-const User = require('./users.model').default
 
 class UploadedImage {
   constructor({ uid = '', name = '', checksum = '', signature = '', thumbnail = '', creationDate = new Date() } = {}) {

diff --git a/src/services/me/me.class.js b/src/services/me/me.class.js
@@ -1,8 +1,9 @@
 /* eslint-disable no-unused-vars */
+import User from '../../models/users.model'
+
 const debug = require('debug')('impresso/services:me')
 const { BadRequest } = require('@feathersjs/errors')
 const SequelizeService = require('../sequelize.service')
-const User = require('../../models/users.model').default
 const Profile = require('../../models/profiles.model')
 const { measureTime } = require('../../util/instruments')
 

diff --git a/src/services/password-reset/password-reset.class.js b/src/services/password-reset/password-reset.class.js
@@ -1,5 +1,6 @@
+import User from '../../models/users.model'
+
 const jwt = require('jsonwebtoken')
-const User = require('../../models/users.model').default
 const { NotImplemented, BadRequest, NotFound } = require('@feathersjs/errors')
 const debug = require('debug')('impresso/services:password-reset')
 

diff --git a/src/services/users/users.class.js b/src/services/users/users.class.js
@@ -1,4 +1,6 @@
 /* eslint-disable no-unused-vars */
+import User from '../../models/users.model'
+
 const { BadRequest, NotFound } = require('@feathersjs/errors')
 const shorthash = require('short-hash')
 const nanoid = require('nanoid')
@@ -7,7 +9,6 @@ const debug = require('debug')('impresso/services:users')
 const { encrypt } = require('../../crypto')
 const sequelize = require('../../sequelize')
 const { sequelizeErrorHandler } = require('../../services/sequelize.utils')
-const User = require('../../models/users.model').default
 const Profile = require('../../models/profiles.model')
 
 class Service {