Skip to content

Commit

Permalink
Merge pull request #139 from lamb0711/master
Browse files Browse the repository at this point in the history 
Pull request
  • Loading branch information
@lamb0711
lamb0711 authored Sep 18, 2022
2 parents f99946d + de7c06d commit 8960a4c
Show file tree
Hide file tree
Showing 12 changed files with 472 additions and 103 deletions.
27 changes: 22 additions & 5 deletions fe-backend/module/apiQuery.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const router = express.Router();
// router.post("/registerUser", registerUser);
router.post("/getApiInfo", getApiInfo);
// router.post("/verifyToken", verifyToken);
// router.post("/deleteUser", deleteUser);
router.post("/deleteUser", deleteUser);

async function getApiInfo(req, res) {
let userEmail = req.body.email;
Expand All @@ -24,7 +24,7 @@ async function getApiInfo(req, res) {
for (let item of result){
delete item.veri_code;
}

return res
.status(200)
.json(
Expand Down Expand Up @@ -58,7 +58,24 @@ async function getApiInfo(req, res) {
// })
// );
// });
}
}

async function deleteUser(req, res) {
let userEmail = req.body.email;
apiuser.deleteMany(
{ user_email: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
}



module.exports = router;
module.exports = router;
18 changes: 18 additions & 0 deletions fe-backend/module/keepMyDocQuery.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,22 @@ router.post("/getMyKeyword", (req, res) => {
});
});


router.post("/deleteUser", (req, res) => {
let userEmail = req.body.email;
myDoc.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

module.exports = router;
213 changes: 199 additions & 14 deletions fe-backend/module/textMiningQuery.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async function uploadDict(req, res) {
async function getPreprocessedData(req, res) {
let userEmail = req.body.userEmail;
let savedDate = req.body.savedDate;

preprocessing
.findOne(
{ $and : [ { 'userEmail' : userEmail }, { 'savedDate' : savedDate }] }
Expand Down Expand Up @@ -107,7 +107,7 @@ async function uploadDict(req, res) {
.status(400)
.json(new Res(false, "successfully saved doc HashKeys", null));
});

/*
preprocessing
.findOne(
Expand Down Expand Up @@ -144,11 +144,11 @@ async function uploadDict(req, res) {
}

async function uploadChart(req, res) {
if(req.body.userEmail == null || req.body.chartImg == null)
if(req.body.userEmail == null || req.body.chartImg == null)
return res.status(400).json(
new Res(false, "Request body does not exist",null)
);

// console.log('req',req);
// let doc = {
// 'userEmail': req.body.userEmail,
Expand Down Expand Up @@ -196,7 +196,7 @@ async function getCharts(req, res) {
new Res(true, "successfully loaded", result)
);
}else{
return res
return res
.status(400)
.json(
new Res(false, "no saved chart",null)
Expand Down Expand Up @@ -243,7 +243,7 @@ async function deleteCharts(req, res){
async function getChartData(req, res){
if(req.body.activity === 'tfidf'){
tfidf.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
).then((result) => {
if(result){
return res
Expand All @@ -268,7 +268,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "count"){
count.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -294,7 +294,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "kmeans"){
kmeans.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -320,7 +320,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "network"){
network.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -346,7 +346,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "ngrams"){
ngrams.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -372,7 +372,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "hcluster"){
hcluster.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -398,7 +398,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "word2vec"){
word2vec.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -424,7 +424,7 @@ async function getChartData(req, res){
});
}else if(req.body.activity === "topicLDA"){
topicLDA.findOne(
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }
{ $and: [{ userEmail: req.body.userEmail }, { analysisDate: req.body.analysisDate}] }

).then((result) => {
if(result){
Expand All @@ -451,6 +451,191 @@ async function getChartData(req, res){
}
}

router.post("/deleteCount", (req, res) => {
let userEmail = req.body.email;
count.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteHcluster", (req, res) => {
let userEmail = req.body.email;
hcluster.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteKmeans", (req, res) => {
let userEmail = req.body.email;
kmeans.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteMyAnalysis", (req, res) => {
let userEmail = req.body.email;
myAnalysis.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteNetwork", (req, res) => {
let userEmail = req.body.email;
network.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteNgrams", (req, res) => {
let userEmail = req.body.email;
ngrams.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deletePreprocessing", (req, res) => {
let userEmail = req.body.email;
preprocessing.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteTfidf", (req, res) => {
let userEmail = req.body.email;
tfidf.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteTopicLDA", (req, res) => {
let userEmail = req.body.email;
topicLDA.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteUserDic", (req, res) => {
let userEmail = req.body.email;
usersDict.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

router.post("/deleteWord2vec", (req, res) => {
let userEmail = req.body.email;
word2vec.deleteMany(
{ userEmail: userEmail },
(error, result) => {
if (error) {
console.log(error);
} else {
if (!result) {
res.json(new Res(false, "can't remove"));
}
res.json(new Res(true, "success remove"));
}
}
);
});

module.exports = router;

Loading

0 comments on commit 8960a4c

Please sign in to comment.