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
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package devkor.com.teamcback.domain.notification.config;

import devkor.com.teamcback.domain.notification.converter.AppVariantConverter;
import org.springframework.context.annotation.Configuration;
import org.springframework.format.FormatterRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
public class NotificationWebConfig implements WebMvcConfigurer {

@Override
public void addFormatters(FormatterRegistry registry) {
registry.addConverter(new AppVariantConverter());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package devkor.com.teamcback.domain.notification.converter;

import devkor.com.teamcback.domain.notification.entity.type.AppVariant;
import org.springframework.core.convert.converter.Converter;

public class AppVariantConverter implements Converter<String, AppVariant> {

@Override
public AppVariant convert(String source) {
if (source == null || source.isEmpty()) {
return null;
}

return AppVariant.from(source);
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
package devkor.com.teamcback.domain.notification.controller;

import devkor.com.teamcback.domain.notification.dto.response.AdminPushEventFlagRes;
import devkor.com.teamcback.domain.notification.converter.AppVariantConverter;
import devkor.com.teamcback.domain.notification.entity.type.AppVariant;
import devkor.com.teamcback.domain.notification.entity.type.PushEventType;
import devkor.com.teamcback.domain.notification.service.AdminNotificationService;
import devkor.com.teamcback.domain.notification.service.PushEventFlagService;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.format.support.DefaultFormattingConversionService;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;

import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
Expand All @@ -37,7 +45,12 @@ void setUp() {
adminNotificationService,
pushEventFlagService
);
mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
conversionService.addConverter(new AppVariantConverter());

mockMvc = MockMvcBuilders.standaloneSetup(controller)
.setConversionService(conversionService)
.build();
}

@Test
Expand All @@ -63,4 +76,45 @@ void updatedEventFlagIsReflectedInAdminApiQueryResult() throws Exception {
.andExpect(jsonPath("$.data[1].eventType").value("REPORT"))
.andExpect(jsonPath("$.data[1].enabled").value(true));
}

@ParameterizedTest
@CsvSource({
"dev,DEV",
"DEV,DEV",
"preview,PREVIEW",
"PREVIEW,PREVIEW",
"production,PRODUCTION",
"PRODUCTION,PRODUCTION"
})
void searchInstallationsBindsAppVariantIgnoringCase(String requestValue, AppVariant expected) throws Exception {
when(adminNotificationService.searchInstallations(1L, null, expected))
.thenReturn(List.of());

mockMvc.perform(get("/api/admin/notifications/installations/search")
.param("userId", "1")
.param("appVariant", requestValue))
.andExpect(status().isOk());

verify(adminNotificationService).searchInstallations(1L, null, expected);
}

@Test
void getDispatchesBindsAppVariantIgnoringCase() throws Exception {
when(adminNotificationService.getDispatches(1, 20, AppVariant.PREVIEW, null))
.thenReturn(new PageImpl<>(List.of(), PageRequest.of(0, 20), 0));

mockMvc.perform(get("/api/admin/notifications/dispatches")
.param("appVariant", "preview"))
.andExpect(status().isOk());

verify(adminNotificationService).getDispatches(1, 20, AppVariant.PREVIEW, null);
}

@Test
void invalidAppVariantReturnsBadRequest() throws Exception {
mockMvc.perform(get("/api/admin/notifications/installations/search")
.param("userId", "1")
.param("appVariant", "invalid"))
.andExpect(status().isBadRequest());
}
}
Loading