Skip to content

Commit a9f0871

Browse files
committed
Update deleteSegmentList to include parentSegmentId in the request body
1 parent 1fb8128 commit a9f0871

File tree

6 files changed

+27
-21
lines changed

6 files changed

+27
-21
lines changed

backend/packages/Upgrade/test/unit/controllers/SegmentController.test.ts

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,15 @@ describe('Segment Controller Testing', () => {
154154
.expect(200);
155155
});
156156

157-
// TODO: Should be uncommented once the backend endpoint is implemented
158-
// test('Delete request for /api/segments/list/:segmentId (deleteSegmentList)', () => {
159-
// const segmentId = uuid();
160-
// const parentSegmentId = uuid();
161-
162-
// return request(app)
163-
// .delete(`/api/segments/list/${segmentId}`)
164-
// .send({ parentSegmentId })
165-
// .set('Accept', 'application/json')
166-
// .expect('Content-Type', /json/)
167-
// .expect(200);
168-
// });
157+
test('Delete request for /api/segments/list/:segmentId (deleteSegmentList)', () => {
158+
const segmentId = uuid();
159+
const parentSegmentId = uuid();
160+
161+
return request(app)
162+
.delete(`/api/segments/list/${segmentId}`)
163+
.send({ parentSegmentId })
164+
.set('Accept', 'application/json')
165+
.expect('Content-Type', /json/)
166+
.expect(200);
167+
});
169168
});

frontend/projects/upgrade/src/app/core/segments/segments.data.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ export class SegmentsDataService {
147147
);
148148
}
149149

150-
deleteSegmentList(segmentId: string) {
150+
deleteSegmentList(segmentId: string, parentSegmentId: string) {
151151
const url = `${this.environment.api.addSegmentList}/${segmentId}`;
152-
return this.http.delete(url);
152+
return this.http.delete(url, { body: { parentSegmentId } });
153153
}
154154
}

frontend/projects/upgrade/src/app/core/segments/segments.service.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,12 @@ export class SegmentsService {
231231
this.store$.dispatch(SegmentsActions.actionUpdateSegmentList({ list }));
232232
}
233233

234-
deletePrivateSegmentList(segmentId: string) {
235-
this.store$.dispatch(SegmentsActions.actionDeleteSegmentList({ segmentId }));
234+
deletePrivateSegmentList(segmentId: string, parentSegmentId: string) {
235+
this.store$.dispatch(
236+
SegmentsActions.actionDeleteSegmentList({
237+
segmentId,
238+
parentSegmentId,
239+
})
240+
);
236241
}
237242
}

frontend/projects/upgrade/src/app/core/segments/store/segments.actions.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,10 @@ export const actionUpdateSegmentListFailure = createAction(
155155
props<{ error: any }>()
156156
);
157157

158-
export const actionDeleteSegmentList = createAction('[Segments] Delete Segment List', props<{ segmentId: string }>());
158+
export const actionDeleteSegmentList = createAction(
159+
'[Segments] Delete Segment List',
160+
props<{ segmentId: string; parentSegmentId: string }>()
161+
);
159162

160163
export const actionDeleteSegmentListSuccess = createAction(
161164
'[Segments] Delete Segment List Success',

frontend/projects/upgrade/src/app/core/segments/store/segments.effects.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,8 @@ export class SegmentsEffects {
263263
deleteSegmentList$ = createEffect(() =>
264264
this.actions$.pipe(
265265
ofType(SegmentsActions.actionDeleteSegmentList),
266-
map((action) => action.segmentId),
267-
switchMap((segmentId) => {
268-
return this.segmentsDataService.deleteSegmentList(segmentId).pipe(
266+
switchMap(({ segmentId, parentSegmentId }) => {
267+
return this.segmentsDataService.deleteSegmentList(segmentId, parentSegmentId).pipe(
269268
map(() => SegmentsActions.actionDeleteSegmentListSuccess({ segmentId })),
270269
catchError((error) => of(SegmentsActions.actionDeleteSegmentListFailure({ error })))
271270
);

frontend/projects/upgrade/src/app/features/dashboard/segments/pages/segment-details-page/segment-details-page-content/segment-lists-section-card/segment-lists-section-card.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export class SegmentListsSectionCardComponent {
109109
.afterClosed()
110110
.subscribe((confirmClicked) => {
111111
if (confirmClicked) {
112-
this.segmentsService.deletePrivateSegmentList(segment.id);
112+
this.segmentsService.deletePrivateSegmentList(segment.id, this.data.id);
113113
}
114114
});
115115
}

0 commit comments

Comments
 (0)