update column type cleanup pr

bcgov · Jul 27, 2023 · df328e7 · df328e7
1 parent 6581ad7
commit df328e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 28 deletions.
diff --git a/met-api/src/met_api/models/subscribe_item.py b/met-api/src/met_api/models/subscribe_item.py
@@ -15,7 +15,7 @@ class SubscribeItem(BaseModel):  # pylint: disable=too-few-public-methods, too-m
 
     __tablename__ = 'subscribe_item'
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    description = db.Column(db.String(550))
+    description = db.Column(db.Text)
     call_to_action_text = db.Column(db.String(25))
     call_to_action_type = db.Column((db.String(25)), nullable=False)
     sort_index = db.Column(db.Integer, nullable=True, default=1)

diff --git a/met-web/src/components/engagement/form/EngagementWidgets/Subscribe/EmailListFormDrawer.tsx b/met-web/src/components/engagement/form/EngagementWidgets/Subscribe/EmailListFormDrawer.tsx
@@ -86,9 +86,6 @@ const EmailListDrawer = () => {
     };
 
     const saveForm = async (data: EmailList) => {
-        // if (!richEmailListDescription) {
-        //     return updateEmailListForm(data);
-        // }
         return createEmailListForm(data);
     };
 

diff --git a/met-web/src/services/subscriptionService/index.ts b/met-web/src/services/subscriptionService/index.ts
@@ -24,6 +24,15 @@ export const createSubscription = async (request: Subscribe): Promise<Subscribe>
     }
 };
 
+export const unSubscribe = async (request: Unsubscribe): Promise<Unsubscribe> => {
+    try {
+        const response = await http.PatchRequest<Unsubscribe>(Endpoints.Subscription.UPDATE, request);
+        return response.data;
+    } catch (err) {
+        return Promise.reject(err);
+    }
+};
+
 export const getSubscriptionsForms = async (widget_id: number): Promise<SubscribeForm[]> => {
     try {
         const url = replaceUrl(Endpoints.Subscription.GET_FORM_LIST, 'widget_id', String(widget_id));
@@ -115,7 +124,7 @@ export const deleteSubscribeForm = async (widget_id: number, subscribe_id: numbe
     }
 };
 
-export const sortWidgetEvents = async (widget_id: number, data: Subscribe[]): Promise<SubscribeForm> => {
+export const sortWidgetSubscribeForms = async (widget_id: number, data: Subscribe[]): Promise<SubscribeForm> => {
     try {
         const url = replaceUrl(Endpoints.Subscription.SORT_FORMS, 'widget_id', String(widget_id));
         const response = await http.PatchRequest<SubscribeForm>(url, data);
@@ -127,26 +136,3 @@ export const sortWidgetEvents = async (widget_id: number, data: Subscribe[]): Pr
         return Promise.reject(err);
     }
 };
-
-// export const createSubscribeForm = async (widget_id: number, data: SubscribeFormProps): Promise<Subscribe> => {
-//     try {
-//         console.log(data);
-//         const url = replaceUrl(Endpoints.Subscription.CREATE_FORM, 'widget_id', String(widget_id));
-//         const response = await http.PostRequest<Subscribe>(url, data);
-//         if (response.data) {
-//             return response.data;
-//         }
-//         return Promise.reject('Failed to create subscribe form');
-//     } catch (err) {
-//         return Promise.reject(err);
-//     }
-// };
-
-export const unSubscribe = async (request: Unsubscribe): Promise<Unsubscribe> => {
-    try {
-        const response = await http.PatchRequest<Unsubscribe>(Endpoints.Subscription.UPDATE, request);
-        return response.data;
-    } catch (err) {
-        return Promise.reject(err);
-    }
-};