comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better error return in subscriptions

Browse source
This commit is contained in:
vjrj 2018-03-02 10:08:52 +01:00
parent 9062012d18
commit 8deaafb96b
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
imports/api/Subscriptions/methods.js
View file

@ -17,21 +17,21 @@ Meteor.methods({
distance: Number
});
const type = 'web';
const newDoc = {
owner: this.userId,
type,
geo: geo(doc),
...doc
};
// console.log(newDoc);
const already = Subscriptions.findOne(newDoc);
if (already) {
throw new Meteor.Error('on-already-subscribed', 'The user is already subscribed to this area');
}
try {
const newDoc = {
owner: this.userId,
type,
geo: geo(doc),
...doc
};
// console.log(newDoc);
const already = Subscriptions.findOne(newDoc);
if (already) {
throw new Meteor.Error('500', 'on-already-subscribed');
}
return Subscriptions.insert(newDoc);
} catch (exception) {
console.error(exception);
// console.error(exception);
throw new Meteor.Error('500', exception);
}
},

6
imports/ui/components/SubscriptionEditor/SubscriptionEditor.js
View file

@ -40,8 +40,10 @@ class SubscriptionEditor extends React.Component {
Meteor.call(methodToCall, doc, (error, subscriptionId) => {
if (error) {
self.setState({ disableFstBtn: false });
if (error.reason && error.reason.reason) {
Bert.alert(t(error.reason.reason), 'danger');
if (error.error && error.error === 'on-already-subscribed') {
Bert.alert(t(error.error), 'danger');
} else if (error.reason) {
Bert.alert(error.reason, 'danger');
}
} else {
self.setState({ disableFstBtn: false });