Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions src/views/PreferencesView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ import PageHeader from '@/components/PageHeader.vue';
import PageCard from '@/components/PageCard.vue';
import TooltipTitle from '@/components/TooltipTitle.vue';

interface DigestSubscriptionPreferences {
interface SubscriptionsPreferences {
subscribed: boolean;
taskAvailableEmailSubscribed: boolean;
taskDailyDigestSubscribed: boolean;
Expand All @@ -244,7 +244,7 @@ const updating = ref(false);
const digestSubscribed = ref(false);
const taskAvailableEmailSubscribed = ref(false);
const taskDailyDigestSubscribed = ref(false);
const lastSavedPreferences = ref<DigestSubscriptionPreferences>({
const lastSavedPreferences = ref<SubscriptionsPreferences>({
subscribed: false,
taskAvailableEmailSubscribed: false,
taskDailyDigestSubscribed: false,
Expand Down Expand Up @@ -272,17 +272,17 @@ const taskDailyDigestTooltipText = computed(() =>
: 'Inactive: You will not receive daily task digest emails.',
);

// Load user data and digest subscription
// Load user data and subscriptions
const loadUserData = async () => {
try {
// Get current user info
const userResponse = await axios.get<{ data: CCFUser }>('/api/users/me');
user.value = userResponse.data.data;

// Get digest subscription status
// Get subscriptions status
const subscriptionResponse = await axios.get<{
data: DigestSubscriptionPreferences;
}>('/api/users/me/digest-subscription');
data: SubscriptionsPreferences;
}>('/api/users/me/subscriptions');

digestSubscribed.value = subscriptionResponse.data.data.subscribed;
taskAvailableEmailSubscribed.value =
Expand Down Expand Up @@ -313,7 +313,7 @@ const updateEmailPreferences = async () => {
updateSuccess.value = false;

try {
await axios.put('/api/users/me/digest-subscription', {
await axios.put('/api/users/me/subscriptions', {
subscribed: digestSubscribed.value,
taskAvailableEmailSubscribed: taskAvailableEmailSubscribed.value,
taskDailyDigestSubscribed: taskDailyDigestSubscribed.value,
Expand Down
6 changes: 3 additions & 3 deletions src/views/__tests__/PreferencesView.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('PreferencesView', () => {
});
}

if (url === '/api/users/me/digest-subscription') {
if (url === '/api/users/me/subscriptions') {
return Promise.resolve({
data: {
data: {
Expand Down Expand Up @@ -221,7 +221,7 @@ describe('PreferencesView', () => {
});
}

if (url === '/api/users/me/digest-subscription') {
if (url === '/api/users/me/subscriptions') {
return Promise.resolve({
data: {
data: {
Expand Down Expand Up @@ -273,7 +273,7 @@ describe('PreferencesView', () => {
await wrapper.vm.updateEmailPreferences();

expect(mockAxios.put).toHaveBeenCalledWith(
'/api/users/me/digest-subscription',
'/api/users/me/subscriptions',
{
subscribed: true,
taskAvailableEmailSubscribed: true,
Expand Down