chore: Unify backend express project into ESM (#281)

This commit is contained in:
kimatata
2025-09-15 22:46:46 +09:00
committed by GitHub
parent 72fd3af24f
commit 761869736e
83 changed files with 2129 additions and 2328 deletions

View File

@@ -2,4 +2,4 @@ const roles = [{ uid: 'administrator' }, { uid: 'user' }];
const memberRoles = [{ uid: 'manager' }, { uid: 'developer' }, { uid: 'reporter' }];
const defaultDangerKey = 'test-plat-default-key';
module.exports = { roles, memberRoles, defaultDangerKey };
export { roles, memberRoles, defaultDangerKey };

View File

@@ -1,10 +1,11 @@
const express = require('express');
import express from 'express';
const router = express.Router();
const { DataTypes } = require('sequelize');
const defineUser = require('../../models/users');
import { DataTypes } from 'sequelize';
import defineUser from '../../models/users.js';
import authMiddleware from '../../middleware/auth.js';
module.exports = function (sequelize) {
const { verifySignedIn } = require('../../middleware/auth')(sequelize);
export default function (sequelize) {
const { verifySignedIn } = authMiddleware(sequelize);
const User = defineUser(sequelize, DataTypes);
router.get('/find/:userId', verifySignedIn, async (req, res) => {
@@ -33,4 +34,4 @@ module.exports = function (sequelize) {
});
return router;
};
}

View File

@@ -1,10 +1,11 @@
const express = require('express');
import express from 'express';
const router = express.Router();
const { DataTypes } = require('sequelize');
const defineUser = require('../../models/users');
import { DataTypes } from 'sequelize';
import defineUser from '../../models/users.js';
import authMiddleware from '../../middleware/auth.js';
module.exports = function (sequelize) {
const { verifySignedIn, verifyAdmin } = require('../../middleware/auth')(sequelize);
export default function (sequelize) {
const { verifySignedIn, verifyAdmin } = authMiddleware(sequelize);
const User = defineUser(sequelize, DataTypes);
router.get('/', verifySignedIn, verifyAdmin, async (req, res) => {
@@ -20,4 +21,4 @@ module.exports = function (sequelize) {
});
return router;
};
}

View File

@@ -1,11 +1,12 @@
const express = require('express');
import express from 'express';
const router = express.Router();
const { DataTypes, Op } = require('sequelize');
const defineUser = require('../../models/users');
const defineMember = require('../../models/members');
import { DataTypes, Op } from 'sequelize';
import defineUser from '../../models/users.js';
import defineMember from '../../models/members.js';
import authMiddleware from '../../middleware/auth.js';
module.exports = function (sequelize) {
const { verifySignedIn } = require('../../middleware/auth')(sequelize);
export default function (sequelize) {
const { verifySignedIn } = authMiddleware(sequelize);
const User = defineUser(sequelize, DataTypes);
const Member = defineMember(sequelize, DataTypes);
@@ -42,4 +43,4 @@ module.exports = function (sequelize) {
});
return router;
};
}

View File

@@ -1,12 +1,12 @@
const express = require('express');
import express from 'express';
const router = express.Router();
const { DataTypes } = require('sequelize');
const bcrypt = require('bcrypt');
const jwt = require('jsonwebtoken');
const defineUser = require('../../models/users');
const { defaultDangerKey } = require('./authSettings');
import { DataTypes } from 'sequelize';
import bcrypt from 'bcrypt';
import jwt from 'jsonwebtoken';
import defineUser from '../../models/users.js';
import { defaultDangerKey } from './authSettings.js';
module.exports = function (sequelize) {
export default function (sequelize) {
const User = defineUser(sequelize, DataTypes);
const secretKey = process.env.SECRET_KEY || defaultDangerKey;
@@ -39,4 +39,4 @@ module.exports = function (sequelize) {
});
return router;
};
}

View File

@@ -1,12 +1,12 @@
const express = require('express');
import express from 'express';
const router = express.Router();
const { DataTypes } = require('sequelize');
const bcrypt = require('bcrypt');
const jwt = require('jsonwebtoken');
const defineUser = require('../../models/users');
const { roles, defaultDangerKey } = require('./authSettings');
import { DataTypes } from 'sequelize';
import bcrypt from 'bcrypt';
import jwt from 'jsonwebtoken';
import defineUser from '../../models/users.js';
import { roles, defaultDangerKey } from './authSettings.js';
module.exports = function (sequelize) {
export default function (sequelize) {
const User = defineUser(sequelize, DataTypes);
const secretKey = process.env.SECRET_KEY || defaultDangerKey;
@@ -42,4 +42,4 @@ module.exports = function (sequelize) {
});
return router;
};
}

View File

@@ -3,13 +3,13 @@ import request from 'supertest';
import express from 'express';
import { Sequelize } from 'sequelize';
import updateRoute from './update';
import { roles } from './authSettings';
import { roles } from './authSettings.js';
const adminRoleIndex = roles.findIndex((entry) => entry.uid === 'administrator');
const userRoleIndex = roles.findIndex((entry) => entry.uid === 'user');
// mock of authentication middleware
vi.mock('../../middleware/auth', () => ({
vi.mock('../../middleware/auth.js', () => ({
default: () => ({
verifySignedIn: vi.fn((req, res, next) => {
req.userId = 1; // Mock user ID
@@ -27,7 +27,7 @@ const mockUser = {
count: vi.fn(),
update: vi.fn(),
};
vi.mock('../../models/users', () => ({
vi.mock('../../models/users.js', () => ({
default: () => mockUser,
}));