diff --git a/src/cli.js b/src/cli.js index 7eeb043..dae73ab 100644 --- a/src/cli.js +++ b/src/cli.js @@ -1,15 +1,15 @@ const { Command } = require('commander'); const program = new Command(); -const createInviteCommand = require('./commands/createInvite'); +const createAppInviteCommand = require('./commands/createAppInvite'); program .version('1.0.0') .description('CLI for managing web app tasks'); program - .command('createInvite ') + .command('createAppInvite ') .description('Create an invite') - .action(createInviteCommand); + .action(createAppInviteCommand); program.parse(process.argv); \ No newline at end of file diff --git a/src/commands/createAppInvite.js b/src/commands/createAppInvite.js new file mode 100644 index 0000000..9fa7def --- /dev/null +++ b/src/commands/createAppInvite.js @@ -0,0 +1,7 @@ +const { exec } = require('child_process'); + +const appInviteService = require('../services/appInviteService'); + +module.exports = async function createAppInvite(inviterNpub) { + await appInviteService.createAppInvite(inviterNpub); +}; diff --git a/src/commands/createInvite.js b/src/commands/createInvite.js deleted file mode 100644 index 79c027c..0000000 --- a/src/commands/createInvite.js +++ /dev/null @@ -1,7 +0,0 @@ -const { exec } = require('child_process'); - -const appInviteService = require('../services/appInviteService'); - -module.exports = async function createInvite(inviterNpub) { - await appInviteService.createInvite(inviterNpub); -}; diff --git a/src/models/Session.js b/src/models/SessionCreated.js similarity index 75% rename from src/models/Session.js rename to src/models/SessionCreated.js index 04a9bd2..dc899f4 100644 --- a/src/models/Session.js +++ b/src/models/SessionCreated.js @@ -1,7 +1,7 @@ const { DataTypes } = require('sequelize'); const sequelize = require('../database'); -const Session = sequelize.define('Session', { +const SessionCreated = sequelize.define('SessionCreated', { uuid: { type: DataTypes.UUID, allowNull: false, @@ -17,7 +17,7 @@ const Session = sequelize.define('Session', { allowNull: false } }, { - tableName: 'session' + tableName: 'session_created' }); -module.exports = Session; \ No newline at end of file +module.exports = SessionCreated; \ No newline at end of file diff --git a/src/services/appInviteService.js b/src/services/appInviteService.js index a0642ab..9f3b036 100644 --- a/src/services/appInviteService.js +++ b/src/services/appInviteService.js @@ -1,10 +1,10 @@ const uuid = require('uuid'); -const AppInvite = require('../models/AppInvite'); +const AppInviteCreated = require('../models/AppInviteCreated'); const InvitedNpub = require('../models/InvitedNpub'); async function appInviteExists(inviteUuid) { - const invite = await AppInvite.findOne({ where: { uuid: inviteUuid } }); + const invite = await AppInviteCreated.findOne({ where: { uuid: inviteUuid } }); if (invite) { return true; } @@ -12,7 +12,7 @@ async function appInviteExists(inviteUuid) { } async function getAppInvite(inviteUuid) { - const invite = await AppInvite.findOne({ where: { uuid: inviteUuid } }); + const invite = await AppInviteCreated.findOne({ where: { uuid: inviteUuid } }); return invite; } @@ -29,8 +29,8 @@ async function isAppInviteSpent(inviteUuid) { return false; } -async function createInvite(inviterNpub) { - await AppInvite.create({ +async function createAppInvite(inviterNpub) { + await AppInviteCreated.create({ uuid: uuid.v7(), inviter_npub: inviterNpub, created_at: new Date().toISOString() @@ -42,4 +42,4 @@ async function createInvite(inviterNpub) { exports.appInviteExists = appInviteExists; exports.getAppInvite = getAppInvite; exports.isAppInviteSpent = isAppInviteSpent; -exports.createInvite = createInvite; +exports.createAppInvite = createAppInvite; diff --git a/src/services/sessionService.js b/src/services/sessionService.js index 3428012..48ee116 100644 --- a/src/services/sessionService.js +++ b/src/services/sessionService.js @@ -1,6 +1,6 @@ const uuid = require("uuid"); -const Session = require('../models/Session'); +const SessionCreated = require('../models/SessionCreated'); const SessionNpubbed = require('../models/SessionNpubbed'); const invitedNpubService = require('./invitedNpubService'); @@ -12,7 +12,7 @@ async function createSession(sessionUuid) { const expiryTimestamp = new Date(currentTimestamp.getTime()); expiryTimestamp.setSeconds(expiryTimestamp.getSeconds() + constants.DEFAULT_SESSION_DURATION_SECONDS); - await Session.create({ + await SessionCreated.create({ uuid: sessionUuid, created_at: currentTimestamp.toISOString(), expires_at: expiryTimestamp.toISOString() @@ -20,7 +20,7 @@ async function createSession(sessionUuid) { } async function isSessionExpired(sessionUuid) { - const currentSession = await Session.findOne({ + const currentSession = await SessionCreated.findOne({ where: { 'uuid': sessionUuid }