Skip to content

Commit

Permalink
전체 기능 merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ymj07168 committed May 19, 2023
1 parent 4952d08 commit 16c3103
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/controllers/alarmController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sc from '../modules/statusCode.js';
import { alarmService } from '../service/index.js';
import { dateFormat } from '../modules/dateformat.js';
import { dateFormat } from '../modules/dateFormat.js';

const getAlarm = async (req, res, next) => {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/analyController.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from 'axios';
import { analyService } from '../service/index.js';
import sc from '../modules/statusCode.js';
import { dateFormat } from '../modules/dateformat.js';
import { dateFormat } from '../modules/dateFormat.js';

const postSentence = async (req, res, next) => {
try {
Expand Down
1 change: 0 additions & 1 deletion src/models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const userSchema = mongoose.Schema({
nok_tel: {
type: String,
trim: true,
unique: 1,
required: true
},
token: {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/analyEmotion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Record from "../models/Record.js";
import { dateFormat } from "./dateformat.js";
import { dateFormat } from "./dateFormat.js";
import axios from "axios";

const analyEmotion = async () => {
Expand Down
2 changes: 0 additions & 2 deletions src/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { Router } from 'express';
import authRouter from './authRouter.js';
import chatRouter from './chatRouter.js';
import messageRouter from './messageRouter.js';
import analyRouter from './analyRouter.js';
import chatRouter from './chatRouter.js';
import authRouter from './authRouter.js';
import alarmRouter from './alarmRouter.js';

Expand Down
2 changes: 1 addition & 1 deletion src/routes/messageRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import auth from '../middleware/auth.js'

const router = Router();

router.post('', auth, messageController.checkMessageAlarm);
router.get('', auth, messageController.checkMessageAlarm);

export default router;

0 comments on commit 16c3103

Please sign in to comment.