Subsribe and unsubscribe functionality #3035
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,10 +32,16 @@ const SubscriptionSchema = new mongoose.Schema( | |
| type: Boolean, | ||
| default: true, | ||
| }, | ||
|
|
||
| email: { | ||
| type: Boolean, | ||
| default: true, | ||
| }, | ||
|
|
||
| mobile_push: { | ||
| type: Boolean, | ||
| default: true, | ||
| }, | ||
| phone: { | ||
| type: Boolean, | ||
| default: true, | ||
|
|
@@ -44,7 +50,7 @@ const SubscriptionSchema = new mongoose.Schema( | |
| type: Boolean, | ||
| default: true, | ||
| }, | ||
| } | ||
| }, | ||
| { | ||
| timestamps: true, | ||
|
|
@@ -63,9 +69,10 @@ SubscriptionSchema.methods = { | |
| toJSON() { | ||
| return { | ||
| _id: this._id, | ||
| email: this.email, | ||
|
There was a problem hiding this comment. Thanks @BenjaminSsempala , this is great progress. Awesome! I am envisioning a future where we try our level best NOT to categorise users but rather, just approach it as AirQo users. In summary, the current status of things should not have a direct influence on our implementations. I am more than happy to sync further on the strategy. There was a problem hiding this comment. Thanks, @Baalmart We could have a sync to review the strategy. But to offer more light, the categories were more for the products, i.e., app notifications and analytics notifications. |
||
| notifications: this.notifications, | ||
| subscribed: this.subscribed, | ||
| isSystemUser: this.isSystemUser, | ||
| }; | ||
| }, | ||
| }; | ||
|
|
@@ -250,8 +257,24 @@ SubscriptionSchema.statics.remove = async function ( | |
| } | ||
| }; | ||
|
|
||
| SubscriptionSchema.statics.subscribe = async function (email, type) { | ||
| const updatedSubscription = await this.findOneAndUpdate( | ||
| { email }, | ||
| { $set: { [`notifications.${type}`]: true } }, | ||
| { new: true, upsert: true } | ||
| ); | ||
|
|
||
| return updatedSubscription; | ||
| }; | ||
|
|
||
| SubscriptionSchema.statics.unsubscribe = async function (email, type) { | ||
| const updatedSubscription = await this.findOneAndUpdate( | ||
|
There was a problem hiding this comment. Great work here, thanks @BenjaminSsempala |
||
| { email }, | ||
| { $set: { [`notifications.${type}`]: false } }, | ||
| { new: true, upsert: true } | ||
| ); | ||
|
|
||
| return updatedSubscription; | ||
| }; | ||
|
|
||
| SubscriptionSchema.statics.checkNotificationStatus = async function ( | ||
|
|
@@ -270,31 +293,27 @@ SubscriptionSchema.statics.checkNotificationStatus = async function ( | |
| message: `No subscription found for email: ${email}`, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| let isSubscribed = subscription.notifications[type]; | ||
|
|
||
|
|
||
| if (!isSubscribed) { | ||
| return { | ||
| success: false, | ||
| message: `Forbidden`, | ||
| status: httpStatus.FORBIDDEN, | ||
| errors: { | ||
| message: `User not subscribed to ${type} notifications.`, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| return { | ||
| success: true, | ||
| message: `User is subscribed to ${type} notifications.`, | ||
| status: httpStatus.OK, | ||
| }; | ||
| } catch (error) { | ||
| logger.error(`Data conflicts detected -- ${error.message}`); | ||
| next( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -195,12 +195,6 @@ const UserSchema = new Schema( | |
| category: { | ||
| type: String, | ||
| }, | ||
| profilePicture: { | ||
| type: String, | ||
| }, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this @BenjaminSsempala ,
environmentspecific variables are handled underconfig/environments. Could you shed more light on this?constants.PLATFORM_BASE_URLorconstants.ANALYTICS_BASE_URL. See attached screenshot for visual reference.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Baalmart , Yes, I failed to use the constants variable because of circular dependencies.