Merge pull request #390 from beabee-communityrm/fix/delete-callout

fix: deleting wrong callout

src/api/controllers/CalloutController.ts

@@ -117,7 +117,7 @@ export class CalloutController {
 
   @Authorized("admin")
   @OnUndefined(204)
-  @Delete("/:slug")
+  @Delete("/:id")
   async deleteCallout(@CalloutId() id: string): Promise<void> {
     const deleted = await CalloutsService.deleteCallout(id);
     if (!deleted) {

src/api/decorators/CalloutId.ts

@@ -14,6 +14,10 @@ export function CalloutId() {
     required: true,
     value: async (action): Promise<string | undefined> => {
       const id = action.request.params.id;
+      if (!id) {
+        throw new NotFoundError();
+      }
+
       if (isUUID(id)) {
         return id;
       } else {

src/core/services/CalloutsService.ts

@@ -11,6 +11,7 @@ import NewsletterService from "@core/services/NewsletterService";
 import OptionsService from "@core/services/OptionsService";
 
 import { getRepository, runTransaction } from "@core/database";
+import { log as mainLogger } from "@core/logging";
 import { isDuplicateIndex } from "@core/utils";
 
 import Contact from "@models/Contact";
@@ -22,12 +23,13 @@ import CalloutTag from "@models/CalloutTag";
 import CalloutVariant from "@models/CalloutVariant";
 
 import DuplicateId from "@api/errors/DuplicateId";
-
 import InvalidCalloutResponse from "@api/errors/InvalidCalloutResponse";
+import NotFoundError from "@api/errors/NotFoundError";
 
 import { CalloutAccess } from "@enums/callout-access";
 import { CreateCalloutData } from "@type/callout-data";
-import NotFoundError from "@api/errors/NotFoundError";
+
+const log = mainLogger.child({ app: "callouts-service" });
 
 class CalloutsService {
   /**
@@ -51,6 +53,7 @@ class CalloutsService {
 
     while (true) {
       const slug = baseSlug + (autoSlug ? "-" + autoSlug : "");
+      log.info("Creating callout with slug " + slug);
       try {
         return await this.saveCallout({ ...data, slug });
       } catch (err) {
@@ -73,6 +76,7 @@ class CalloutsService {
     id: string,
     data: Partial<CreateCalloutData>
   ): Promise<void> {
+    log.info("Updating callout " + id);
     // Prevent the join survey from being made inactive
     if (OptionsService.getText("join-survey") === id) {
       if (data.expires) {
@@ -127,6 +131,8 @@ class CalloutsService {
    * @returns true if the callout was deleted
    */
   async deleteCallout(id: string): Promise<boolean> {
+    log.info("Deleting callout " + id);
+
     return await runTransaction(async (em) => {
       await em
         .createQueryBuilder()
@@ -342,6 +348,8 @@ class CalloutsService {
         );
       }
 
+      log.info("Saved callout " + newId);
+
       return newId;
     });
   }