Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

*.env
# Created by https://www.toptal.com/developers/gitignore/api/macos,androidstudio,node
# Edit at https://www.toptal.com/developers/gitignore?templates=macos,androidstudio,node

Expand Down
18 changes: 18 additions & 0 deletions server/models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,24 @@ const userSchema = new mongoose.Schema({
required: true,
unique: true,
},


licenseNumber: {
type: String,
required: true,
unique: true,
},

licensePrimaryKey: {
type: String,
required: true,
unique: true,
},

licenseType: {
type: String,
required: true,
},
});

module.exports = mongoose.model("User", userSchema);
121 changes: 72 additions & 49 deletions server/routes/trailer.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,78 @@
const express = require('express');
const express = require("express");
const router = express.Router();
const Trailer = require('../models/Trailer');
const bcryptjs = require('bcryptjs');
const user_jwt = require('../middleware/user_jwt');
const Trailer = require("../models/Trailer");
const bcryptjs = require("bcryptjs");
const user_jwt = require("../middleware/user_jwt");
require("dotenv").config();
const multer = require("multer");
const AWS = require("aws-sdk");
const { v4: uuidv4 } = require("uuid");

//트레일러 정보 등록 API
router.post('/trailers', user_jwt, async(req, res, next) => {
try {
const trailer = await Trailer.create({
userId: req.user.id,
trailerPhoto: req.body.trailerPhoto,
trailerName: req.body.trailerName,
license: req.body.license,
rentalPlace: req.body.rentalPlace,
cost: req.body.cost,
capacity: req.body.capacity,
facilities: req.body.facilities,
description: req.body.description
});
const upload = multer();

if(!trailer) {
res.status(400).json({
success: false,
msg: 'Something went wrong'
//트레일러 정보 등록 API
router.post(
"/trailers",
user_jwt,
upload.single("data"),
async (req, res, next) => {
try {
const imageName = uuidv4();
const trailer = await Trailer.create({
userId: req.user.id,
trailerPhoto: imageName,
trailerName: req.body.trailerName,
license: req.body.license,
rentalPlace: req.body.rentalPlace,
cost: req.body.cost,
capacity: req.body.capacity,
facilities: req.body.facilities,
description: req.body.description,
});
const S3 = new AWS.S3({
endpoint: new AWS.Endpoint("https://kr.object.ncloudstorage.com"),
region: "kr-standard",
credentials: {
accessKeyId: process.env.NAVER_ACCESS_KEY,
secretAccessKey: process.env.NAVER_SECRET_KEY,
},
});
await S3.putObject({
Bucket: "trailer-image",
Key: `${imageName}.PNG`,
ACL: "public-read",
Body: req.file.buffer,
}).promise();
if (!trailer) {
res.status(400).json({
success: false,
msg: "Something went wrong",
});
}

res.status(200).json({
success: true,
trailer: trailer,
msg: "Successfully created",
});
} catch (error) {
next(error);
}

res.status(200).json({
success: true,
trailer: trailer,
msg: 'Successfully created'
});
} catch(error) {
next(error);
}

});
);

//메인화면 모든 트레일러 정보 호출 API
router.get('/trailers', user_jwt, async(req,res,next) => {
router.get("/trailers", user_jwt, async (req, res, next) => {
try {
const trailers = await Trailer.find();

const user = req.user.id;
console.log(user);

if(trailers.length == 0) {
if (trailers.length == 0) {
res.status(400).json({
success: false,
msg: 'Trailer not exists'
msg: "Trailer not exists",
});
}

Expand All @@ -57,59 +81,58 @@ router.get('/trailers', user_jwt, async(req,res,next) => {
totalNumberOfTrailers: trailers.length,
user: user,
trailer: trailers,
msg: 'Successfully fetched'
msg: "Successfully fetched",
});
} catch(error) {
} catch (error) {
next(error);
}
});

//트레일러 선택시 트레일러에 대한 상세 정보 확인 API
router.get('/trailers/:id', user_jwt, async(req, res, next) => {
router.get("/trailers/:id", user_jwt, async (req, res, next) => {
try {
let trailer = await Trailer.findById(req.params.id);
const user = req.user.id;

if(!trailer) {
if (!trailer) {
res.status(400).json({
success: false,
msg: 'trailerInfo not exists'
msg: "trailerInfo not exists",
});
}

res.status(200).json({
success: true,
user: user,
trailer: trailer,
msg: 'Successfully fetched'
msg: "Successfully fetched",
});
} catch(error) {
} catch (error) {
next(error);
}
})
});

//등록한 트레일러 삭제 API - 문제 발생
router.delete('/trailers/:id', user_jwt, async(req, res, next) => {
router.delete("/trailers/:id", user_jwt, async (req, res, next) => {
try {
let registeredTrailer = await Trailer.findById(req.params.id);

if(!registeredTrailer) {
if (!registeredTrailer) {
res.status(400).json({
success: false,
msg: 'Trailer not exists'
msg: "Trailer not exists",
});
}

registeredTrailer = await Trailer.findByIdAndDelete(req.params.id);

res.status(200).json({
success: true,
msg: 'Successfully Deleted Trailer'
msg: "Successfully Deleted Trailer",
});
} catch(error) {
} catch (error) {
next(error);
}
});


module.exports = router;
Loading