Skip to content

Commit 2400ef3

Browse files
committed
hot fix
1 parent 178cb5c commit 2400ef3

1 file changed

Lines changed: 28 additions & 26 deletions

File tree

src/bookkp.js

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,45 +59,47 @@ function putImage(req,res){
5959
} else res.status(401).send('log in first');
6060
}
6161

62-
function getMyBook(req,res){
62+
async function getMyBook(req,res){
6363
var user = req.user;
6464
if (user){
65-
var resblist = getBook(user_id);
66-
67-
if (resblist) { res.status(200).send(resblist);}
68-
else { res.status(202).send('no user');}
65+
userdb.images.findOne({
66+
where : { id : user_id },
67+
attributes : ['animals']
68+
}).then((results) => {
69+
if (results){
70+
var less_animals = animal_list;
71+
for (const key of Object.keys(results.animals)){
72+
const idx = less_animals.indexOf(key);
73+
less_animals.splice(idx,1);
74+
}
75+
res.status(200).send({has : results.animals, less : less_animals});
76+
} else {res.status(202).send('no user')}
77+
});
6978
} else { res.status(401).send('login first');}
7079
}
7180

72-
function getOtherBook(req,res){
81+
async function getOtherBook(req,res){
7382
var user = req.user;
7483
if (user){
7584
userdb.user.findOne({
7685
where : {nickname : req.params.nickname },
7786
attributes : ['id']
7887
}).then((results) => {
7988
if (results){
80-
var resblist = getBook(results.id);
81-
if (resblist) { res.stauts(200).send(resblist);}
82-
else { res.status(202).send('no user');}
89+
userdb.images.findOne({
90+
where : { id : user_id },
91+
attributes : ['animals']
92+
}).then((results) => {
93+
if (results){
94+
var less_animals = animal_list;
95+
for (const key of Object.keys(results.animals)){
96+
const idx = less_animals.indexOf(key);
97+
less_animals.splice(idx,1);
98+
}
99+
res.status(200).send({has : results.animals, less : less_animals});
100+
} else {res.status(202).send('no user')}
101+
});
83102
} else { res.status(202).send('check the nickname');}
84103
})
85104
} else { res.status(401).send('login first');}
86105
}
87-
88-
function getBook(user_id){
89-
userdb.images.findOne({
90-
where : { id : user_id },
91-
attributes : ['animals']
92-
}).then((results) => {
93-
if (results){
94-
var less_animals = animal_list;
95-
for (const key of Object.keys(results.animals)){
96-
const idx = less_animals.indexOf(key);
97-
less_animals.splice(idx,1);
98-
}
99-
return new Object ({has : results.animals, less : less_animals})
100-
}
101-
});
102-
return null;
103-
}

0 commit comments

Comments
 (0)