Skip to content
This repository was archived by the owner on Jun 13, 2019. It is now read-only.

no new link genrated for same url for issue #33 #70

Open
arvindkalra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

no new link genrated for same url for issue #33 #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 36 additions & 21 deletions utils/db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,44 @@ sequelize.sync(); //Normal case


module.exports = {
addUrl: function (code, longURL, alias, done, failed) {
if (!alias) {
URL.findOrCreate({
where: {
code: code
},
defaults: {
code: code,
codeStr: r.to64(code),
longURL: longURL
addUrl: function (code, longURL, alias, done, failed) {
if (!alias) {
URL.findOne({
where: {
longURL: longURL
}
}).then(function (result) {
if(!result){
URL.findOrCreate({
where: {
code: code
},
defaults: {
code: code,
codeStr: r.to64(code),
longURL: longURL
}
}).spread(function (url, created) {
done(url.codeStr, !created, url.longURL);
}).catch(function (error) {
console.log(error);
failed(error);
})
}
else {
done(result.codeStr, true, result.longURL);
}
}).catch(function (error) {
console.log(error);
failed(error);
})
} else {
//TODO: handle longer than 9 with alias map
}
},

}).spread(function (url, created) {
done(url.codeStr, !created, url.longURL);
}).catch(function (error) {
console.log(error);
failed(error);
})
} else {
//TODO: handle longer than 9 with alias map
}
},
fetchUrl: function (code, from, done, failed) {

fetchUrl: function (code, from, done, failed) {
URL.findById(code).then(function (url) {
done(url.longURL);
Event.create({
Expand Down