From edcc0c7eb465b15d00bc54cb6a2b401b8c8518ed Mon Sep 17 00:00:00 2001
From: Daniel Villavicencio <danielvillavicencio@Daniels-MBP.attlocal.net>
Date: Tue, 12 Mar 2024 18:40:49 -0700
Subject: [PATCH] Fixed tests and removed controller advice

---
 build.gradle                                  |   1 +
 .../destiny2bot/Destiny2botApplication.java   |  28 +--
 .../destiny2bot/client/BungieClient.java      |  22 ++-
 .../client/BungieClientWrapper.java           |  35 ----
 .../config/BungieConfiguration.java           |   7 +-
 .../controller/GlobalExceptionHandler.java    |  35 ----
 .../dto/destiny/ExactUserSearchRequest.java   |  13 ++
 .../dto/destiny/ExactUserSearchResponse.java  |  21 +++
 ...ields.java => ManifestResponseFields.java} |   2 +-
 .../destiny2bot/dto/discord/Option.java       |   6 +
 .../filter/SignatureFilterFunction.java       |   1 +
 .../handler/InteractionHandler.java           |  12 +-
 .../destiny2bot/handler/RaidStatsHandler.java |  63 +++++--
 .../destiny2bot/service/BungieAPIService.java |  99 ++++++++++
 .../service/PostGameCarnageService.java       |   2 +-
 .../destiny2bot/service/RaidStatsService.java |   1 +
 .../service/UserRaidDetailsService.java       |  89 ++++-----
 .../service/WeeklyActivitiesService.java      |  45 ++---
 src/main/resources/application-local.yml      |   6 +-
 .../handler/RaidMapHandlerTest.java           |  32 ++--
 .../InteractionControllerTest.java            |  12 +-
 .../service/RaidInfographicsServiceTest.java  |   9 +-
 .../service/UserRaidDetailsServiceTest.java   | 173 ++++++++----------
 .../service/WeeklyActivitiesServiceTest.java  | 104 +++++------
 .../__files/bungie/milestone-response.json    |   2 +-
 25 files changed, 434 insertions(+), 386 deletions(-)
 delete mode 100644 src/main/java/com/danielvm/destiny2bot/client/BungieClientWrapper.java
 delete mode 100644 src/main/java/com/danielvm/destiny2bot/controller/GlobalExceptionHandler.java
 create mode 100644 src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchRequest.java
 create mode 100644 src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchResponse.java
 rename src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/{ResponseFields.java => ManifestResponseFields.java} (93%)
 create mode 100644 src/main/java/com/danielvm/destiny2bot/service/BungieAPIService.java

diff --git a/build.gradle b/build.gradle
index a123d97..6d0d5cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,7 @@ dependencies {
     implementation "commons-codec:commons-codec:${commonsCodecVersion}"
     implementation "software.pando.crypto:salty-coffee:${pandoCryptoVersion}"
     implementation "org.apache.commons:commons-collections4:${apacheCollectionsVersion}"
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapStructVersion}"
diff --git a/src/main/java/com/danielvm/destiny2bot/Destiny2botApplication.java b/src/main/java/com/danielvm/destiny2bot/Destiny2botApplication.java
index a6b3871..2387ec0 100644
--- a/src/main/java/com/danielvm/destiny2bot/Destiny2botApplication.java
+++ b/src/main/java/com/danielvm/destiny2bot/Destiny2botApplication.java
@@ -1,13 +1,10 @@
 package com.danielvm.destiny2bot;
 
-import com.danielvm.destiny2bot.exception.ExternalServiceException;
-import com.danielvm.destiny2bot.exception.InternalServerException;
 import com.danielvm.destiny2bot.filter.SignatureFilterFunction;
 import com.danielvm.destiny2bot.handler.InteractionHandler;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import java.nio.charset.StandardCharsets;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,13 +14,10 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
 
 @Slf4j
 @EnableCaching
@@ -36,7 +30,7 @@ public static void main(String[] args) {
   }
 
   @Bean
-  RouterFunction<ServerResponse> interactionFilterFunction(
+  RouterFunction<ServerResponse> interactionRouterFunction(
       InteractionHandler interactionHandler,
       SignatureFilterFunction signatureFilterFunction) {
     return RouterFunctions.route()
@@ -72,25 +66,7 @@ CacheManager inMemoryCacheManager() {
    */
   @Bean
   public WebClient.Builder webClient() {
-    return WebClient.builder()
-        .defaultStatusHandler(
-            HttpStatusCode::is5xxServerError,
-            clientResponse -> clientResponse.createException()
-                .flatMap(ce -> Mono.error(new ExternalServiceException(
-                    ce.getResponseBodyAsString(StandardCharsets.UTF_8),
-                    HttpStatus.INTERNAL_SERVER_ERROR,
-                    ce.getCause()))
-                )
-        )
-        .defaultStatusHandler(
-            HttpStatusCode::is4xxClientError,
-            clientResponse -> clientResponse.createException()
-                .flatMap(ce -> Mono.error(
-                    new InternalServerException(
-                        ce.getResponseBodyAsString(StandardCharsets.UTF_8),
-                        HttpStatus.BAD_REQUEST)
-                ))
-        );
+    return WebClient.builder();
   }
 
   @Bean
diff --git a/src/main/java/com/danielvm/destiny2bot/client/BungieClient.java b/src/main/java/com/danielvm/destiny2bot/client/BungieClient.java
index 1193cb4..ab75149 100644
--- a/src/main/java/com/danielvm/destiny2bot/client/BungieClient.java
+++ b/src/main/java/com/danielvm/destiny2bot/client/BungieClient.java
@@ -2,15 +2,18 @@
 
 import com.danielvm.destiny2bot.dto.destiny.ActivitiesResponse;
 import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
+import com.danielvm.destiny2bot.dto.destiny.ExactUserSearchRequest;
+import com.danielvm.destiny2bot.dto.destiny.ExactUserSearchResponse;
 import com.danielvm.destiny2bot.dto.destiny.MemberGroupResponse;
 import com.danielvm.destiny2bot.dto.destiny.MembershipResponse;
 import com.danielvm.destiny2bot.dto.destiny.PostGameCarnageReport;
 import com.danielvm.destiny2bot.dto.destiny.SearchResult;
 import com.danielvm.destiny2bot.dto.destiny.UserGlobalSearchBody;
 import com.danielvm.destiny2bot.dto.destiny.characters.CharactersResponse;
-import com.danielvm.destiny2bot.dto.destiny.manifest.ResponseFields;
+import com.danielvm.destiny2bot.dto.destiny.manifest.ManifestResponseFields;
 import com.danielvm.destiny2bot.dto.destiny.milestone.MilestoneEntry;
 import com.danielvm.destiny2bot.enums.ManifestEntity;
+import java.util.List;
 import java.util.Map;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,10 +43,10 @@ Mono<BungieResponse<MembershipResponse>> getMembershipInfoById(
    *
    * @param entityType     The entity type (see {@link ManifestEntity})
    * @param hashIdentifier The entity hash identifier
-   * @return {@link Mono} of {@link ResponseFields}
+   * @return {@link Mono} of {@link ManifestResponseFields}
    */
   @GetExchange("/Destiny2/Manifest/{entityType}/{hashIdentifier}/")
-  Mono<BungieResponse<ResponseFields>> getManifestEntity(
+  Mono<BungieResponse<ManifestResponseFields>> getManifestEntity(
       @PathVariable String entityType, @PathVariable Long hashIdentifier);
 
   /**
@@ -52,7 +55,7 @@ Mono<BungieResponse<ResponseFields>> getManifestEntity(
    * @return {@link Mono} of Map of {@link MilestoneEntry}
    */
   @GetExchange("/Destiny2/Milestones/")
-  Mono<BungieResponse<Map<String, MilestoneEntry>>> getPublicMilestonesRx();
+  Mono<BungieResponse<Map<String, MilestoneEntry>>> getPublicMilestones();
 
   /**
    * Get a user characters
@@ -121,4 +124,15 @@ Mono<BungieResponse<ActivitiesResponse>> getActivityHistory(@PathVariable Intege
   Mono<BungieResponse<PostGameCarnageReport>> getPostGameCarnageReport(
       @PathVariable Long activityId
   );
+
+  /**
+   * Search for a Destiny 2 membership using exact parameters, that is, name and code
+   *
+   * @param request The request to make to Bungie for an exact user search
+   * @return {@link ExactUserSearchRequest}
+   */
+  @PostExchange("/Destiny2/SearchDestinyPlayerByBungieName/-1/")
+  Mono<BungieResponse<List<ExactUserSearchResponse>>> searchUserByExactNameAndCode(
+      @RequestBody ExactUserSearchRequest request
+  );
 }
diff --git a/src/main/java/com/danielvm/destiny2bot/client/BungieClientWrapper.java b/src/main/java/com/danielvm/destiny2bot/client/BungieClientWrapper.java
deleted file mode 100644
index 78c582b..0000000
--- a/src/main/java/com/danielvm/destiny2bot/client/BungieClientWrapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.danielvm.destiny2bot.client;
-
-import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
-import com.danielvm.destiny2bot.dto.destiny.manifest.ResponseFields;
-import com.danielvm.destiny2bot.enums.ManifestEntity;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Mono;
-
-/**
- * This Bungie Client wrapper class is responsible for caching manifest entities
- */
-@Component
-public class BungieClientWrapper {
-
-  private final BungieClient defaultBungieClient;
-
-  public BungieClientWrapper(BungieClient defaultBungieClient) {
-    this.defaultBungieClient = defaultBungieClient;
-  }
-
-  /**
-   * Wraps the client call to the Manifest with a Cacheable method
-   *
-   * @param entityType     The entity type (see {@link ManifestEntity})
-   * @param hashIdentifier The hash identifier
-   * @return {@link BungieResponse} of {@link ResponseFields}
-   */
-  @Cacheable(cacheNames = "entity", cacheManager = "inMemoryCacheManager")
-  public Mono<BungieResponse<ResponseFields>> getManifestEntity(
-      ManifestEntity entityType, Long hashIdentifier) {
-    return defaultBungieClient.getManifestEntity(entityType.getId(), hashIdentifier).cache();
-  }
-
-}
diff --git a/src/main/java/com/danielvm/destiny2bot/config/BungieConfiguration.java b/src/main/java/com/danielvm/destiny2bot/config/BungieConfiguration.java
index 6b78b16..f241509 100644
--- a/src/main/java/com/danielvm/destiny2bot/config/BungieConfiguration.java
+++ b/src/main/java/com/danielvm/destiny2bot/config/BungieConfiguration.java
@@ -78,7 +78,7 @@ public BungieClient bungieCharacterClient(WebClient.Builder builder) {
         .clientConnector(new ReactorClientHttpConnector(httpClient))
         .defaultHeader(API_KEY_HEADER_NAME, this.key)
         .codecs(clientCodecConfigurer -> clientCodecConfigurer.defaultCodecs()
-            .maxInMemorySize(1024 * 1024))
+            .maxInMemorySize(1024 * 512))
         .build();
     return HttpServiceProxyFactory.builder()
         .exchangeAdapter(WebClientAdapter.create(webClient))
@@ -95,16 +95,13 @@ public BungieClient bungieCharacterClient(WebClient.Builder builder) {
   @Bean(name = "pgcrBungieClient")
   public BungieClient pgcrBungieClient(WebClient.Builder builder) {
     // Don't keep alive connections with Bungie.net
-    HttpClient httpClient = HttpClient.create()
-        .keepAlive(false);
     var webClient = builder
         .baseUrl(this.statsBaseUrl)
-        .clientConnector(new ReactorClientHttpConnector(httpClient))
         .defaultHeader(API_KEY_HEADER_NAME, this.key)
         .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
         .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
         .codecs(clientCodecConfigurer -> clientCodecConfigurer.defaultCodecs()
-            .maxInMemorySize(1024 * 1024 * 5))
+            .maxInMemorySize(1024 * 20))
         .build();
     return HttpServiceProxyFactory.builder()
         .exchangeAdapter(WebClientAdapter.create(webClient))
diff --git a/src/main/java/com/danielvm/destiny2bot/controller/GlobalExceptionHandler.java b/src/main/java/com/danielvm/destiny2bot/controller/GlobalExceptionHandler.java
deleted file mode 100644
index 0528e8e..0000000
--- a/src/main/java/com/danielvm/destiny2bot/controller/GlobalExceptionHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.danielvm.destiny2bot.controller;
-
-import com.danielvm.destiny2bot.exception.BaseException;
-import jakarta.validation.ConstraintViolationException;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ProblemDetail;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-
-@RestControllerAdvice
-public class GlobalExceptionHandler {
-
-  @ExceptionHandler
-  public ProblemDetail handleWebClientException(WebClientResponseException wcre) {
-    var detail = ProblemDetail.forStatus(HttpStatus.BAD_REQUEST);
-    detail.setDetail(wcre.getResponseBodyAsString());
-    return detail;
-  }
-
-  @ExceptionHandler
-  public ProblemDetail handleConstraintViolationException(ConstraintViolationException cve) {
-    var detail = ProblemDetail.forStatus(HttpStatus.BAD_REQUEST);
-    detail.setDetail(cve.getMessage());
-    return detail;
-  }
-
-  @ExceptionHandler
-  public ProblemDetail handleBaseException(BaseException baseException) {
-    var detail = ProblemDetail.forStatus(baseException.getStatus());
-    detail.setDetail(baseException.getMessage());
-    return detail;
-  }
-
-}
diff --git a/src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchRequest.java b/src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchRequest.java
new file mode 100644
index 0000000..0072be6
--- /dev/null
+++ b/src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchRequest.java
@@ -0,0 +1,13 @@
+package com.danielvm.destiny2bot.dto.destiny;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ExactUserSearchRequest {
+
+  private String displayName;
+
+  private Integer displayNameCode;
+}
diff --git a/src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchResponse.java b/src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchResponse.java
new file mode 100644
index 0000000..4127769
--- /dev/null
+++ b/src/main/java/com/danielvm/destiny2bot/dto/destiny/ExactUserSearchResponse.java
@@ -0,0 +1,21 @@
+package com.danielvm.destiny2bot.dto.destiny;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExactUserSearchResponse {
+
+  private String bungieGlobalDisplayName;
+
+  private Integer bungieGlobalDisplayNameCode;
+
+  private Integer membershipType;
+
+  private String membershipId;
+
+  private String displayName;
+}
diff --git a/src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/ResponseFields.java b/src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/ManifestResponseFields.java
similarity index 93%
rename from src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/ResponseFields.java
rename to src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/ManifestResponseFields.java
index 32e28fb..080c3d9 100644
--- a/src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/ResponseFields.java
+++ b/src/main/java/com/danielvm/destiny2bot/dto/destiny/manifest/ManifestResponseFields.java
@@ -9,7 +9,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class ResponseFields {
+public class ManifestResponseFields {
 
   private DisplayProperties displayProperties;
 
diff --git a/src/main/java/com/danielvm/destiny2bot/dto/discord/Option.java b/src/main/java/com/danielvm/destiny2bot/dto/discord/Option.java
index 41605b7..ca78857 100644
--- a/src/main/java/com/danielvm/destiny2bot/dto/discord/Option.java
+++ b/src/main/java/com/danielvm/destiny2bot/dto/discord/Option.java
@@ -1,5 +1,6 @@
 package com.danielvm.destiny2bot.dto.discord;
 
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -29,4 +30,9 @@ public class Option {
    */
   private Boolean focused;
 
+  /**
+   * The list of options that belong to this sub-command or sub-command group
+   */
+  private List<Option> options;
+
 }
diff --git a/src/main/java/com/danielvm/destiny2bot/filter/SignatureFilterFunction.java b/src/main/java/com/danielvm/destiny2bot/filter/SignatureFilterFunction.java
index c770894..7fd55d3 100644
--- a/src/main/java/com/danielvm/destiny2bot/filter/SignatureFilterFunction.java
+++ b/src/main/java/com/danielvm/destiny2bot/filter/SignatureFilterFunction.java
@@ -26,6 +26,7 @@ public class SignatureFilterFunction implements
 
   private static final String SIGNATURE_HEADER_NAME = "X-Signature-Ed25519";
   private static final String TIMESTAMP_HEADER_NAME = "X-Signature-Timestamp";
+
   private final DiscordConfiguration discordConfiguration;
 
   public SignatureFilterFunction(DiscordConfiguration discordConfiguration) {
diff --git a/src/main/java/com/danielvm/destiny2bot/handler/InteractionHandler.java b/src/main/java/com/danielvm/destiny2bot/handler/InteractionHandler.java
index d70b8d4..7c845a2 100644
--- a/src/main/java/com/danielvm/destiny2bot/handler/InteractionHandler.java
+++ b/src/main/java/com/danielvm/destiny2bot/handler/InteractionHandler.java
@@ -5,6 +5,7 @@
 import com.danielvm.destiny2bot.enums.InteractionResponseType;
 import com.danielvm.destiny2bot.enums.InteractionType;
 import com.danielvm.destiny2bot.enums.SlashCommand;
+import com.danielvm.destiny2bot.exception.BaseException;
 import com.danielvm.destiny2bot.factory.ApplicationCommandFactory;
 import com.danielvm.destiny2bot.factory.AutocompleteFactory;
 import com.danielvm.destiny2bot.factory.MessageComponentFactory;
@@ -16,6 +17,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.ProblemDetail;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.reactive.function.BodyInserters;
@@ -67,7 +69,15 @@ public Mono<ServerResponse> handle(ServerRequest request) {
                     BodyInserters.fromProducer(attachmentsResponse(interaction, response),
                         multiValueReference) :
                     BodyInserters.fromValue(response));
-              });
+              })
+              .onErrorResume(BaseException.class,
+                  ex -> {
+                    ProblemDetail problemDetail = ProblemDetail.forStatus(ex.getStatus());
+                    problemDetail.setDetail(ex.getMessage());
+                    return ServerResponse.status(ex.getStatus())
+                        .body(BodyInserters.fromValue(ex.getMessage()));
+                  }
+              );
         });
   }
 
diff --git a/src/main/java/com/danielvm/destiny2bot/handler/RaidStatsHandler.java b/src/main/java/com/danielvm/destiny2bot/handler/RaidStatsHandler.java
index 348022b..b1da8e8 100644
--- a/src/main/java/com/danielvm/destiny2bot/handler/RaidStatsHandler.java
+++ b/src/main/java/com/danielvm/destiny2bot/handler/RaidStatsHandler.java
@@ -3,8 +3,8 @@
 import com.danielvm.destiny2bot.client.BungieClient;
 import com.danielvm.destiny2bot.client.DiscordClient;
 import com.danielvm.destiny2bot.config.DiscordConfiguration;
+import com.danielvm.destiny2bot.dto.destiny.ExactUserSearchRequest;
 import com.danielvm.destiny2bot.dto.destiny.MemberGroupResponse;
-import com.danielvm.destiny2bot.entity.RaidStatistics;
 import com.danielvm.destiny2bot.dto.destiny.UserGlobalSearchBody;
 import com.danielvm.destiny2bot.dto.destiny.UserSearchResult;
 import com.danielvm.destiny2bot.dto.discord.Choice;
@@ -16,12 +16,16 @@
 import com.danielvm.destiny2bot.dto.discord.Interaction;
 import com.danielvm.destiny2bot.dto.discord.InteractionResponse;
 import com.danielvm.destiny2bot.dto.discord.InteractionResponseData;
+import com.danielvm.destiny2bot.dto.discord.Option;
+import com.danielvm.destiny2bot.entity.RaidStatistics;
 import com.danielvm.destiny2bot.enums.InteractionResponseType;
+import com.danielvm.destiny2bot.exception.BadRequestException;
 import com.danielvm.destiny2bot.service.RaidStatsService;
 import java.time.Instant;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.http.HttpStatus;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
@@ -31,6 +35,8 @@ public class RaidStatsHandler implements AutocompleteSource, ApplicationCommandS
 
   private static final String STATS_TITLE = "Raid Stats for %s";
   private static final String CHOICE_FORMAT = "%s:%s";
+  private static final String USER_TAG_OPTION_NAME = "usertag";
+  private static final String USERNAME_OPTION_NAME = "username";
   private static final Integer CLAN_GROUP_TYPE = 1;
   private static final Integer CLAN_SIZE_FILTER = 0;
 
@@ -52,9 +58,13 @@ public RaidStatsHandler(
 
   @Override
   public Mono<InteractionResponse> autocompleteResponse(Interaction interaction) {
-    Object focusedOption = interaction.getData().getOptions().get(0).getValue();
-    return defaultBungieClient.searchByGlobalName(new UserGlobalSearchBody((String) focusedOption),
-            0)
+    Option usernameLookupOption = interaction.getData().getOptions().stream()
+        .filter(option -> option.getName().equalsIgnoreCase(USERNAME_OPTION_NAME)).findFirst()
+        .orElseThrow(
+            () -> new BadRequestException("Username option not found", HttpStatus.BAD_REQUEST))
+        .getOptions().getFirst();
+    return defaultBungieClient.searchByGlobalName(
+            new UserGlobalSearchBody((String) usernameLookupOption.getValue()), 0)
         .flatMapIterable(response -> response.getResponse().getSearchResults())
         .take(25)
         .filter(result -> CollectionUtils.isNotEmpty(result.getDestinyMemberships()))
@@ -83,10 +93,10 @@ private Mono<Choice> createUserChoices(UserSearchResult result) {
   @Override
   public Mono<InteractionResponse> createResponse(Interaction interaction) {
     var asyncScheduler = Schedulers.boundedElastic();
-    var raidsAsync = processRaidsResponseUser(interaction)
+    var raidsAsync = processRaidsAsynchronously(interaction)
+        .subscribeOn(asyncScheduler)
         .flatMap(response -> discordClient.editOriginalInteraction(
-            discordConfiguration.getApplicationId(), interaction.getToken(), response))
-        .subscribeOn(asyncScheduler);
+            discordConfiguration.getApplicationId(), interaction.getToken(), response));
 
     raidsAsync.subscribe();
 
@@ -96,13 +106,38 @@ public Mono<InteractionResponse> createResponse(Interaction interaction) {
         .build());
   }
 
-  private Mono<InteractionResponseData> processRaidsResponseUser(Interaction interaction) {
-    String parsedData = ((String) interaction.getData().getOptions().get(0)
-        .getValue());
-    String[] values = parsedData.split(":");
-    Integer membershipType = Integer.valueOf(values[0]);
-    String membershipId = values[1];
+  private Mono<InteractionResponseData> processRaidsAsynchronously(Interaction interaction) {
+    return Mono.just(interaction).flatMap(i -> {
+      var usernameOnly = interaction.getData().getOptions().stream()
+          .anyMatch(option -> option.getName().equalsIgnoreCase(USERNAME_OPTION_NAME));
+      // If the request only has username
+      if (usernameOnly) {
+        Object optionValue = i.getData().getOptions().get(0).getOptions().get(0).getValue();
+
+        String[] values = ((String) optionValue).split(":");
+        Integer membershipType = Integer.valueOf(values[0]);
+        String membershipId = values[1];
+        return createResponse(membershipType, membershipId);
+      } else {
+        String username = (String) i.getData().getOptions().get(0).getOptions().stream()
+            .filter(option -> option.getName().equalsIgnoreCase(USERNAME_OPTION_NAME))
+            .findFirst().orElseThrow().getValue();
+        Integer userTag = (Integer) i.getData().getOptions().get(0).getOptions().stream()
+            .filter(option -> option.getName().equalsIgnoreCase(USER_TAG_OPTION_NAME))
+            .findFirst().orElseThrow().getValue();
+        ExactUserSearchRequest request = ExactUserSearchRequest.builder()
+            .displayName(username)
+            .displayNameCode(userTag)
+            .build();
+        return defaultBungieClient.searchUserByExactNameAndCode(request)
+            .flatMap(response -> createResponse(response.getResponse().get(0).getMembershipType(),
+                response.getResponse().get(0).getMembershipId()));
+      }
+    });
+  }
 
+  private Mono<InteractionResponseData> createResponse(Integer membershipType,
+      String membershipId) {
     return defaultBungieClient.getMembershipInfoById(membershipId, membershipType)
         .flatMap(bungieUser -> {
           String uniqueUsername = bungieUser.getResponse().getBungieNetUser().getUniqueName();
@@ -134,7 +169,7 @@ private Mono<InteractionResponseData> processRaidsResponseUser(Interaction inter
                               .text("""
                                   Keep in mind this command is still being developed and the data displayed may be inaccurate. \
                                                               
-                                  For example, fastest clears for Last Wish could be incorrect because of the Wall of Wishes, \
+                                  For example, fastest clears for Last Wish *could* be incorrect because of the Wall of Wishes, \
                                   meaning that if the raid was started from the beginning, but you used a wish to get to \
                                   Riven and finish the raid in under ~10 minutes, the bot would still count that as your fastest clear.""")
                               .build())
diff --git a/src/main/java/com/danielvm/destiny2bot/service/BungieAPIService.java b/src/main/java/com/danielvm/destiny2bot/service/BungieAPIService.java
new file mode 100644
index 0000000..447286d
--- /dev/null
+++ b/src/main/java/com/danielvm/destiny2bot/service/BungieAPIService.java
@@ -0,0 +1,99 @@
+package com.danielvm.destiny2bot.service;
+
+import com.danielvm.destiny2bot.client.BungieClient;
+import com.danielvm.destiny2bot.dto.destiny.ActivitiesResponse;
+import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
+import com.danielvm.destiny2bot.dto.destiny.characters.UserCharacter;
+import com.danielvm.destiny2bot.dto.destiny.manifest.ManifestResponseFields;
+import com.danielvm.destiny2bot.dto.destiny.milestone.MilestoneEntry;
+import com.danielvm.destiny2bot.enums.ManifestEntity;
+import com.danielvm.destiny2bot.exception.ResourceNotFoundException;
+import java.util.Map;
+import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+
+@Service
+@Slf4j
+public class BungieAPIService {
+
+  private static final Integer MAX_NUMBER_OF_ELEMENTS = 250;
+  private static final Integer RAID_MODE = 4;
+
+  private final BungieClient defaultBungieClient;
+
+  public BungieAPIService(BungieClient defaultBungieClient) {
+    this.defaultBungieClient = defaultBungieClient;
+  }
+
+  /**
+   * Get the raid activities from the user's activity history for a character
+   *
+   * @param membershipType The membership type of the bungie.net user
+   * @param membershipId   The membershipId of the bungie.net user
+   * @param characterId    The characterId of the bungie.net user
+   * @param pageNumber     The page number to request
+   * @return {@link ActivitiesResponse}
+   */
+  public Mono<ActivitiesResponse> getRaidActivities(Integer membershipType, String membershipId,
+      String characterId, Integer pageNumber) {
+    return defaultBungieClient.getActivityHistory(membershipType, membershipId, characterId,
+            MAX_NUMBER_OF_ELEMENTS, RAID_MODE, pageNumber)
+        .filter(response ->
+            Objects.nonNull(response.getResponse()) &&
+            CollectionUtils.isNotEmpty(response.getResponse().getActivities()))
+        .map(BungieResponse::getResponse)
+        .switchIfEmpty(Mono.just(new ActivitiesResponse()));
+  }
+
+  /**
+   * Return a map of character details for a bungie.net user
+   *
+   * @param membershipType The membership type of the bungie.net user
+   * @param membershipId   The membershipId of the bungie.net user
+   * @return A map with the key being the characterIds and the values being character-specific
+   * details
+   */
+  public Mono<Map<String, UserCharacter>> getUserCharacters(Integer membershipType,
+      String membershipId) {
+    return defaultBungieClient.getUserCharacters(membershipType, membershipId)
+        .flatMap(response -> {
+          if (Objects.isNull(response) || Objects.isNull(response.getResponse())
+              || Objects.isNull(response.getResponse().getCharacters())) {
+            return Mono.error(new ResourceNotFoundException(
+                "No available characters were found for user with membershipId [%s] and membership type [%s]".formatted(
+                    membershipId, membershipType)));
+          }
+          return Mono.just(response.getResponse());
+        })
+        .map(response -> response.getCharacters().getData());
+  }
+
+  /**
+   * Retrieves a manifest entity from Bungie's manifest database, checking the cache first before
+   * calling Bungie
+   *
+   * @param entityType The type of the entity
+   * @param hash       The hash of the entity
+   * @return {@link ManifestResponseFields}
+   */
+  @Cacheable(cacheNames = "manifestEntity", cacheManager = "inMemoryCacheManager")
+  public Mono<ManifestResponseFields> getManifestEntity(ManifestEntity entityType, Long hash) {
+    return defaultBungieClient.getManifestEntity(entityType.getId(), hash).cache()
+        .filter(Objects::nonNull)
+        .map(BungieResponse::getResponse);
+  }
+
+  /**
+   * Retrieve all the public milestones
+   *
+   * @return Map containing all public milestones
+   */
+  public Mono<Map<String, MilestoneEntry>> getPublicMilestones() {
+    return defaultBungieClient.getPublicMilestones()
+        .map(BungieResponse::getResponse);
+  }
+}
diff --git a/src/main/java/com/danielvm/destiny2bot/service/PostGameCarnageService.java b/src/main/java/com/danielvm/destiny2bot/service/PostGameCarnageService.java
index b953d8f..0f46804 100644
--- a/src/main/java/com/danielvm/destiny2bot/service/PostGameCarnageService.java
+++ b/src/main/java/com/danielvm/destiny2bot/service/PostGameCarnageService.java
@@ -54,7 +54,7 @@ public Mono<PGCRDetails> retrievePGCR(Long activityInstanceId) {
     Mono<PGCRDetails> retrievePGCR = bungieClient.getPostGameCarnageReport(activityInstanceId)
         .transformDeferred(RateLimiterOperator.of(PGCR_RATE_LIMITER))
         .onErrorResume(WebClientException.class, err -> {
-          log.warn("Response too big to parse, ignoring and falling back to default value", err);
+          log.debug("Response too big to parse, ignoring and falling back to default value", err);
           return Mono.just(new BungieResponse<>(errorFallbackResponse));
         })
         .map(BungieResponse::getResponse)
diff --git a/src/main/java/com/danielvm/destiny2bot/service/RaidStatsService.java b/src/main/java/com/danielvm/destiny2bot/service/RaidStatsService.java
index 5f528dd..508548b 100644
--- a/src/main/java/com/danielvm/destiny2bot/service/RaidStatsService.java
+++ b/src/main/java/com/danielvm/destiny2bot/service/RaidStatsService.java
@@ -150,6 +150,7 @@ private Mono<UserDetails> updateUser(Instant now, String uniqueUsername, Integer
 
   private Mono<UserDetails> createUser(Instant now, String uniqueUsername,
       Integer membershipType, String membershipId) {
+
     return userRaidDetailsService.createUserDetails(now, uniqueUsername, membershipId,
             membershipType)
         .doOnSubscribe(subscription -> log.info(
diff --git a/src/main/java/com/danielvm/destiny2bot/service/UserRaidDetailsService.java b/src/main/java/com/danielvm/destiny2bot/service/UserRaidDetailsService.java
index c10c228..8727d67 100644
--- a/src/main/java/com/danielvm/destiny2bot/service/UserRaidDetailsService.java
+++ b/src/main/java/com/danielvm/destiny2bot/service/UserRaidDetailsService.java
@@ -1,11 +1,8 @@
 package com.danielvm.destiny2bot.service;
 
-import com.danielvm.destiny2bot.client.BungieClient;
-import com.danielvm.destiny2bot.client.BungieClientWrapper;
 import com.danielvm.destiny2bot.dto.destiny.ActivitiesResponse;
 import com.danielvm.destiny2bot.dto.destiny.Activity;
 import com.danielvm.destiny2bot.dto.destiny.Basic;
-import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
 import com.danielvm.destiny2bot.dto.destiny.ValueEntry;
 import com.danielvm.destiny2bot.entity.UserDetails;
 import com.danielvm.destiny2bot.entity.UserRaidDetails;
@@ -14,9 +11,9 @@
 import com.danielvm.destiny2bot.repository.UserDetailsRepository;
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -27,25 +24,24 @@
 @Slf4j
 public class UserRaidDetailsService {
 
-  private static final Integer MAX_SANE_AMOUNT_OF_RAID_PAGES = 100;
+  private static final Integer MAX_SANE_AMOUNT_OF_RAID_PAGES = 50;
   private static final Integer MAX_PAGE_COUNT = 250;
-  private static final Integer RAID_MODE = 4;
   private static final String EMPTY_RAID_NAME = "empty_name";
 
-  private final BungieClient defaultBungieClient;
+  private static final Integer MAX_MANIFEST_CONCURRENT_CALLS = 2;
+  private static final Integer MAX_CONCURRENT_ACTIVITY_HISTORY_CALLS = 3;
+
   private final UserDetailsRepository userDetailsRepository;
   private final PostGameCarnageService postGameCarnageService;
-  private final BungieClientWrapper bungieClientWrapper;
+  private final BungieAPIService bungieAPIService;
 
   public UserRaidDetailsService(
-      BungieClient defaultBungieClient,
       UserDetailsRepository userDetailsRepository,
       PostGameCarnageService postGameCarnageService,
-      BungieClientWrapper bungieClientWrapper) {
-    this.defaultBungieClient = defaultBungieClient;
+      BungieAPIService bungieAPIService) {
     this.userDetailsRepository = userDetailsRepository;
     this.postGameCarnageService = postGameCarnageService;
-    this.bungieClientWrapper = bungieClientWrapper;
+    this.bungieAPIService = bungieAPIService;
   }
 
   /**
@@ -69,12 +65,10 @@ public Mono<Boolean> existsById(String userId) {
    */
   public Mono<UserDetails> createUserDetails(Instant creationInstant, String uniqueUsername,
       String membershipId, Integer membershipType) {
-    return defaultBungieClient.getUserCharacters(membershipType, membershipId)
-        .flatMapMany(userCharacter -> Flux.fromIterable(
-            userCharacter.getResponse().getCharacters().getData().keySet()))
-        .flatMap(
-            characterId -> getActivitiesAll(membershipType, membershipId, characterId))
-        .flatMap(this::buildRaidDetails)
+    return bungieAPIService.getUserCharacters(membershipType, membershipId)
+        .flatMapMany(characters -> Flux.fromIterable(characters.keySet()))
+        .flatMap(characterId -> getActivitiesAll(membershipType, membershipId, characterId))
+        .flatMap(this::buildRaidDetails, MAX_MANIFEST_CONCURRENT_CALLS)
         .flatMap(this::addPGCRDetails)
         .collectList()
         .flatMap(raidDetails -> {
@@ -96,11 +90,11 @@ public Mono<UserDetails> createUserDetails(Instant creationInstant, String uniqu
   public Mono<UserDetails> updateUserDetails(Instant updateTimestamp, String uniqueUsername,
       String membershipId, Integer membershipType) {
     return userDetailsRepository.findById(uniqueUsername)
-        .flatMap(userDetails -> defaultBungieClient.getUserCharacters(membershipType, membershipId)
-            .flatMapIterable(response -> response.getResponse().getCharacters().getData().keySet())
+        .flatMap(userDetails -> bungieAPIService.getUserCharacters(membershipType, membershipId)
+            .flatMapIterable(Map::keySet)
             .flatMap(characterId -> getActivitiesUntil(membershipType, membershipId,
                 characterId, userDetails.getLastRequestDateTime())
-                .flatMap(this::buildRaidDetails)
+                .flatMap(this::buildRaidDetails, MAX_MANIFEST_CONCURRENT_CALLS)
                 .flatMap(this::addPGCRDetails))
             .collectList()
             .flatMap(raidDetails -> {
@@ -130,31 +124,22 @@ public Mono<UserDetails> updateUserDetails(Instant updateTimestamp, String uniqu
    */
   public Flux<Activity> getActivitiesAll(Integer membershipType, String membershipId,
       String characterId) {
-    Predicate<BungieResponse<ActivitiesResponse>> takeUntilCondition = response ->
-        Objects.isNull(response.getResponse()) ||
-        CollectionUtils.isEmpty(response.getResponse().getActivities()) ||
-        response.getResponse().getActivities().size() < MAX_PAGE_COUNT;
-
-    // Filters if response is null and activities is null
-    Predicate<BungieResponse<ActivitiesResponse>> filterCondition = response ->
-        Objects.nonNull(response.getResponse()) &&
-        Objects.nonNull(response.getResponse().getActivities());
-
     return Flux.range(0, MAX_SANE_AMOUNT_OF_RAID_PAGES)
         .flatMapSequential(pageNumber ->
-            defaultBungieClient.getActivityHistory(membershipType, membershipId,
-                characterId, MAX_PAGE_COUNT, RAID_MODE, pageNumber))
-        .takeUntil(takeUntilCondition)
-        .filter(filterCondition)
-        .flatMapIterable(response -> response.getResponse().getActivities())
+            bungieAPIService.getRaidActivities(membershipType, membershipId,
+                characterId, pageNumber), MAX_CONCURRENT_ACTIVITY_HISTORY_CALLS)
+        .takeUntil(response ->
+            CollectionUtils.isEmpty(response.getActivities()) ||
+            response.getActivities().size() < MAX_PAGE_COUNT)
+        .filter(response -> Objects.nonNull(response.getActivities()))
+        .flatMapIterable(ActivitiesResponse::getActivities)
         .switchIfEmpty(Flux.empty());
-
   }
 
   /**
    * Gets all the activities from the user's character activity history until an instant in time.
-   * Like {@link #getActivitiesUntil} this operation is exhaustive and won't stop until the
-   * predicate is true.
+   * Like {@link #getActivitiesAll} this operation is exhaustive and won't stop until the predicate
+   * is true.
    *
    * @param membershipType The membershipType of the user
    * @param membershipId   The membershipId of the user
@@ -166,23 +151,21 @@ public Flux<Activity> getActivitiesUntil(Integer membershipType, String membersh
       String characterId, Instant until) {
     return Flux.range(0, MAX_SANE_AMOUNT_OF_RAID_PAGES)
         .flatMapSequential(pageNumber ->
-            defaultBungieClient.getActivityHistory(membershipType, membershipId, characterId,
-                MAX_PAGE_COUNT, RAID_MODE, pageNumber))
-        .filter(response ->
-            Objects.nonNull(response.getResponse()) &&
-            Objects.nonNull(response.getResponse().getActivities()))
+            bungieAPIService.getRaidActivities(membershipType, membershipId, characterId,
+                pageNumber), MAX_CONCURRENT_ACTIVITY_HISTORY_CALLS)
+        .filter(response -> Objects.nonNull(response) && Objects.nonNull(response.getActivities()))
         .takeUntil(response -> {
-          boolean nullResponse = Objects.isNull(response.getResponse());
-          boolean emptyActivities = CollectionUtils.isEmpty(response.getResponse().getActivities());
+          boolean nullResponse = Objects.isNull(response);
+          boolean emptyActivities = CollectionUtils.isEmpty(response.getActivities());
 
-          List<Activity> activities = response.getResponse().getActivities();
+          List<Activity> activities = response.getActivities();
           long newRaidCount = activities.stream()
               .filter(activity -> activity.getPeriod().isAfter(until))
               .count();
           boolean noMoreNewDataAvailable = newRaidCount < MAX_PAGE_COUNT;
           return nullResponse || emptyActivities || noMoreNewDataAvailable;
         })
-        .flatMapIterable(response -> response.getResponse().getActivities())
+        .flatMapIterable(ActivitiesResponse::getActivities)
         .filter(activity -> activity.getPeriod().isAfter(until))
         .switchIfEmpty(Flux.empty());
   }
@@ -196,17 +179,17 @@ private Mono<UserRaidDetails> addPGCRDetails(UserRaidDetails userRaidDetails) {
   }
 
   private Mono<UserRaidDetails> buildRaidDetails(Activity activity) {
-    return bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION,
+    return bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION,
             activity.getActivityDetails().getDirectorActivityHash())
         .map(entity -> {
               boolean emptyRaidDetails =
-                  entity.getResponse().getDisplayProperties() == null ||
-                  entity.getResponse().getDisplayProperties().getName() == null;
+                  entity.getDisplayProperties() == null ||
+                  entity.getDisplayProperties().getName() == null;
 
               String raidName = emptyRaidDetails ? EMPTY_RAID_NAME :
-                  resolveRaidName(entity.getResponse().getDisplayProperties().getName());
+                  resolveRaidName(entity.getDisplayProperties().getName());
               RaidDifficulty raidDifficulty = emptyRaidDetails ? null :
-                  resolveRaidDifficult(entity.getResponse().getDisplayProperties().getName());
+                  resolveRaidDifficult(entity.getDisplayProperties().getName());
 
               var valuesMap = activity.getValues();
               var instanceId = activity.getActivityDetails().getInstanceId();
diff --git a/src/main/java/com/danielvm/destiny2bot/service/WeeklyActivitiesService.java b/src/main/java/com/danielvm/destiny2bot/service/WeeklyActivitiesService.java
index 24002e2..9ce6566 100644
--- a/src/main/java/com/danielvm/destiny2bot/service/WeeklyActivitiesService.java
+++ b/src/main/java/com/danielvm/destiny2bot/service/WeeklyActivitiesService.java
@@ -4,11 +4,9 @@
 import static com.danielvm.destiny2bot.enums.ManifestEntity.ACTIVITY_TYPE_DEFINITION;
 import static com.danielvm.destiny2bot.enums.ManifestEntity.MILESTONE_DEFINITION;
 
-import com.danielvm.destiny2bot.client.BungieClient;
-import com.danielvm.destiny2bot.client.BungieClientWrapper;
 import com.danielvm.destiny2bot.dto.MilestoneResponse;
 import com.danielvm.destiny2bot.dto.WeeklyActivity;
-import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
+import com.danielvm.destiny2bot.dto.destiny.manifest.ManifestResponseFields;
 import com.danielvm.destiny2bot.dto.destiny.milestone.ActivitiesDto;
 import com.danielvm.destiny2bot.dto.destiny.milestone.MilestoneEntry;
 import com.danielvm.destiny2bot.enums.ActivityMode;
@@ -25,14 +23,10 @@
 @Slf4j
 public class WeeklyActivitiesService {
 
-  private final BungieClient defaultBungieClient;
-  private final BungieClientWrapper bungieClientWrapper;
+  private final BungieAPIService bungieAPIService;
 
-  public WeeklyActivitiesService(
-      BungieClient defaultBungieClient,
-      BungieClientWrapper bungieClientWrapper) {
-    this.defaultBungieClient = defaultBungieClient;
-    this.bungieClientWrapper = bungieClientWrapper;
+  public WeeklyActivitiesService(BungieAPIService bungieAPIService) {
+    this.bungieAPIService = bungieAPIService;
   }
 
   /**
@@ -42,22 +36,21 @@ public WeeklyActivitiesService(
    * @return {@link MilestoneResponse}
    */
   public Mono<WeeklyActivity> getWeeklyActivity(ActivityMode activityMode) {
-    return defaultBungieClient.getPublicMilestonesRx()
-        .map(BungieResponse::getResponse)
+    return bungieAPIService.getPublicMilestones()
         .flatMapIterable(Map::values)
         .filter(this::hasWeeklyObjectives)
         .filterWhen(milestoneEntry -> activityModeMatches(milestoneEntry, activityMode))
+        .switchIfEmpty(Mono.error(new ResourceNotFoundException(
+            "No weekly activity found for activity type [%s]".formatted(activityMode))))
         .flatMap(this::createWeeklyActivity)
-        .next() // ideally there should only be one weekly activity
-        .switchIfEmpty(Mono.error(
-            new ResourceNotFoundException("No weekly activity found for activity type [%s]"
-                .formatted(activityMode))));
+        .next(); // ideally there should only be one weekly activity
+
   }
 
   private Mono<WeeklyActivity> createWeeklyActivity(MilestoneEntry milestoneEntry) {
-    return bungieClientWrapper.getManifestEntity(MILESTONE_DEFINITION,
+    return bungieAPIService.getManifestEntity(MILESTONE_DEFINITION,
             milestoneEntry.getMilestoneHash())
-        .map(milestoneEntity -> milestoneEntity.getResponse().getDisplayProperties())
+        .map(ManifestResponseFields::getDisplayProperties)
         .map(displayProperties ->
             WeeklyActivity.builder()
                 .name(displayProperties.getName())
@@ -72,15 +65,15 @@ private Mono<Boolean> activityModeMatches(MilestoneEntry entry, ActivityMode act
       return Mono.just(false);
     }
     return Flux.fromIterable(entry.getActivities())
-        .flatMap(activity -> bungieClientWrapper.getManifestEntity(
+        .flatMap(activity -> bungieAPIService.getManifestEntity(
             ACTIVITY_DEFINITION, activity.getActivityHash()))
-        .filter(activity -> activity.getResponse().getActivityTypeHash() != null)
-        .flatMap(activityDefinition -> bungieClientWrapper.getManifestEntity(
-            ACTIVITY_TYPE_DEFINITION, activityDefinition.getResponse().getActivityTypeHash()))
-        .filter(activityType -> activityType.getResponse() != null &&
-                                activityType.getResponse().getDisplayProperties() != null)
-        .any(activityTypeDefinition -> activityTypeDefinition.getResponse().getDisplayProperties()
-            .getName().equalsIgnoreCase(activityMode.getLabel()));
+        .filter(activity -> activity.getActivityTypeHash() != null)
+        .flatMap(activityDefinition -> bungieAPIService.getManifestEntity(
+            ACTIVITY_TYPE_DEFINITION, activityDefinition.getActivityTypeHash()))
+        .filter(activityType -> activityType != null &&
+                                activityType.getDisplayProperties() != null)
+        .any(activityTypeDefinition -> activityTypeDefinition.getDisplayProperties().getName()
+            .equalsIgnoreCase(activityMode.getLabel()));
   }
 
   private boolean hasWeeklyObjectives(MilestoneEntry entry) {
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 47516e3..c8c5b12 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -27,8 +27,4 @@ server:
 application:
   callback:
     # Replace with your own callback url masking port 8080 to run locally
-    url: https://c3ee-2600-1700-4390-a930-19b5-f155-e766-6d6.ngrok-free.app
-
-logging:
-  level:
-    org.springframework.web.reactive: DEBUG
\ No newline at end of file
+    url: https://c3ee-2600-1700-4390-a930-19b5-f155-e766-6d6.ngrok-free.app
\ No newline at end of file
diff --git a/src/test/java/com/danielvm/destiny2bot/handler/RaidMapHandlerTest.java b/src/test/java/com/danielvm/destiny2bot/handler/RaidMapHandlerTest.java
index aa08189..ed629dd 100644
--- a/src/test/java/com/danielvm/destiny2bot/handler/RaidMapHandlerTest.java
+++ b/src/test/java/com/danielvm/destiny2bot/handler/RaidMapHandlerTest.java
@@ -1,13 +1,27 @@
 package com.danielvm.destiny2bot.handler;
 
+import static com.danielvm.destiny2bot.enums.InteractionResponseType.CHANNEL_MESSAGE_WITH_SOURCE;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.danielvm.destiny2bot.TestUtils;
-import com.danielvm.destiny2bot.dto.discord.*;
+import com.danielvm.destiny2bot.dto.discord.Attachment;
+import com.danielvm.destiny2bot.dto.discord.Choice;
+import com.danielvm.destiny2bot.dto.discord.Embedded;
+import com.danielvm.destiny2bot.dto.discord.EmbeddedImage;
+import com.danielvm.destiny2bot.dto.discord.Interaction;
+import com.danielvm.destiny2bot.dto.discord.InteractionData;
+import com.danielvm.destiny2bot.dto.discord.InteractionResponse;
+import com.danielvm.destiny2bot.dto.discord.InteractionResponseData;
+import com.danielvm.destiny2bot.dto.discord.Option;
 import com.danielvm.destiny2bot.enums.InteractionResponseType;
 import com.danielvm.destiny2bot.enums.InteractionType;
 import com.danielvm.destiny2bot.enums.Raid;
 import com.danielvm.destiny2bot.enums.RaidEncounter;
-import com.danielvm.destiny2bot.handler.RaidMapHandler;
 import com.danielvm.destiny2bot.service.RaidInfographicsService;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -19,13 +33,6 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static com.danielvm.destiny2bot.enums.InteractionResponseType.CHANNEL_MESSAGE_WITH_SOURCE;
-import static org.assertj.core.api.Assertions.assertThat;
-
 @ExtendWith(MockitoExtension.class)
 public class RaidMapHandlerTest {
 
@@ -39,7 +46,8 @@ public class RaidMapHandlerTest {
   @DisplayName("Creating autocomplete response works correctly")
   public void creatingAutocompleteResponseWorksCorrectly() {
     // given: an interaction with a 'raid' option value present
-    List<Option> options = List.of(new Option("raid", 3, "last_wish", false));
+    List<Option> options = List.of(
+        new Option("raid", 3, "last_wish", false, Collections.emptyList()));
     InteractionData data = InteractionData.builder()
         .id(1).name("raid_map").options(options).type(1)
         .build();
@@ -72,8 +80,8 @@ public void creatingAutocompleteResponseWorksCorrectly() {
   public void creatingApplicationCommandResponseWorksCorrectly() throws IOException {
     // given: an interaction with a 'raid' option value present
     List<Option> options = List.of(
-        new Option("raid", 3, "last_wish", false),
-        new Option("encounter", 3, "kalli", false));
+        new Option("raid", 3, "last_wish", false, Collections.emptyList()),
+        new Option("encounter", 3, "kalli", false, Collections.emptyList()));
     InteractionData data = InteractionData.builder()
         .id(1).name("raid_map").options(options).type(1)
         .build();
diff --git a/src/test/java/com/danielvm/destiny2bot/integration/InteractionControllerTest.java b/src/test/java/com/danielvm/destiny2bot/integration/InteractionControllerTest.java
index 35e48bf..fe97265 100644
--- a/src/test/java/com/danielvm/destiny2bot/integration/InteractionControllerTest.java
+++ b/src/test/java/com/danielvm/destiny2bot/integration/InteractionControllerTest.java
@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -261,7 +262,8 @@ public void getWeeklyRaidsShouldThrowErrors() throws JsonProcessingException, De
         .isBadRequest()
         .expectBody()
         .jsonPath("$.detail").value(json -> assertJsonLenient(errorJson, json))
-        .jsonPath("$.status").isEqualTo(HttpStatus.BAD_REQUEST.value());
+        .jsonPath("$.status").isEqualTo(HttpStatus.BAD_REQUEST.value())
+        .returnResult();
   }
 
   @Test
@@ -325,8 +327,8 @@ public void autocompleteRequestsForRaidMapAreSuccessful()
       throws DecoderException, IOException {
     // given: an interaction for autocomplete for the /raid_map command
     List<Option> options = List.of(
-        new Option("raid", 3, "last_wish", false),
-        new Option("raid", 3, "k", true)
+        new Option("raid", 3, "last_wish", false, Collections.emptyList()),
+        new Option("raid", 3, "k", true, Collections.emptyList())
     );
     InteractionData data = InteractionData.builder()
         .id("someID")
@@ -366,8 +368,8 @@ public void commandRequestsForRaidMapAreSuccessful()
       throws DecoderException, IOException {
     // given: an interaction for autocomplete for the /raid_map command
     List<Option> options = List.of(
-        new Option("raid", 3, "last_wish", false),
-        new Option("encounter", 3, "kalli", false)
+        new Option("raid", 3, "last_wish", false, Collections.emptyList()),
+        new Option("encounter", 3, "kalli", false, Collections.emptyList())
     );
     InteractionData data = InteractionData.builder()
         .id("someID")
diff --git a/src/test/java/com/danielvm/destiny2bot/service/RaidInfographicsServiceTest.java b/src/test/java/com/danielvm/destiny2bot/service/RaidInfographicsServiceTest.java
index 2e51ed4..2138a78 100644
--- a/src/test/java/com/danielvm/destiny2bot/service/RaidInfographicsServiceTest.java
+++ b/src/test/java/com/danielvm/destiny2bot/service/RaidInfographicsServiceTest.java
@@ -9,6 +9,7 @@
 import com.danielvm.destiny2bot.dto.discord.Option;
 import com.danielvm.destiny2bot.exception.ImageProcessingException;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
@@ -37,8 +38,8 @@ public void retrieveEncounterImagesIsSuccessful() throws IOException {
     String raidName = "last_wish";
     String raidEncounter = "kalli";
     List<Option> options = List.of(
-        new Option("raid", 3, raidName, false),
-        new Option("encounter", 3, raidEncounter, false));
+        new Option("raid", 3, raidName, false, Collections.emptyList()),
+        new Option("encounter", 3, raidEncounter, false, Collections.emptyList()));
     InteractionData data = InteractionData.builder()
         .options(options)
         .build();
@@ -74,8 +75,8 @@ public void retrieveEncountersImagesFailsOnIOException() throws IOException {
     String raidName = "last_wish";
     String raidEncounter = "kalli";
     List<Option> options = List.of(
-        new Option("raid", 3, raidName, false),
-        new Option("encounter", 3, raidEncounter, false));
+        new Option("raid", 3, raidName, false, Collections.emptyList()),
+        new Option("encounter", 3, raidEncounter, false, Collections.emptyList()));
     InteractionData data = InteractionData.builder()
         .options(options)
         .build();
diff --git a/src/test/java/com/danielvm/destiny2bot/service/UserRaidDetailsServiceTest.java b/src/test/java/com/danielvm/destiny2bot/service/UserRaidDetailsServiceTest.java
index 2aca2a6..aea8ff9 100644
--- a/src/test/java/com/danielvm/destiny2bot/service/UserRaidDetailsServiceTest.java
+++ b/src/test/java/com/danielvm/destiny2bot/service/UserRaidDetailsServiceTest.java
@@ -9,19 +9,14 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.danielvm.destiny2bot.client.BungieClient;
-import com.danielvm.destiny2bot.client.BungieClientWrapper;
 import com.danielvm.destiny2bot.dto.destiny.ActivitiesResponse;
 import com.danielvm.destiny2bot.dto.destiny.Activity;
 import com.danielvm.destiny2bot.dto.destiny.ActivityDetails;
 import com.danielvm.destiny2bot.dto.destiny.Basic;
-import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
 import com.danielvm.destiny2bot.dto.destiny.ValueEntry;
-import com.danielvm.destiny2bot.dto.destiny.characters.Characters;
-import com.danielvm.destiny2bot.dto.destiny.characters.CharactersResponse;
 import com.danielvm.destiny2bot.dto.destiny.characters.UserCharacter;
 import com.danielvm.destiny2bot.dto.destiny.manifest.DisplayProperties;
-import com.danielvm.destiny2bot.dto.destiny.manifest.ResponseFields;
+import com.danielvm.destiny2bot.dto.destiny.manifest.ManifestResponseFields;
 import com.danielvm.destiny2bot.entity.PGCRDetails;
 import com.danielvm.destiny2bot.entity.UserDetails;
 import com.danielvm.destiny2bot.entity.UserRaidDetails;
@@ -48,9 +43,7 @@
 public class UserRaidDetailsServiceTest {
 
   @Mock
-  BungieClient bungieClient;
-  @Mock
-  BungieClientWrapper bungieClientWrapper;
+  BungieAPIService bungieAPIService;
   @Mock
   UserDetailsRepository userDetailsRepository;
   @Mock
@@ -83,9 +76,8 @@ public void getUserActivitiesSuccess() {
       activities.add(new Activity(completionDate, details, entryMap));
     }
     var activitiesResponse = new ActivitiesResponse(activities);
-    var bungieResponse = new BungieResponse<>(activitiesResponse);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0))
-        .thenReturn(Mono.just(bungieResponse));
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 0))
+        .thenReturn(Mono.just(activitiesResponse));
 
     // when: getActivitiesAll is called
     var response = sut.getActivitiesAll(membershipType, membershipId, characterId);
@@ -98,10 +90,10 @@ public void getUserActivitiesSuccess() {
         }).verifyComplete();
 
     // and: the bungie API calls is only one
-    verify(bungieClient, times(1)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 0);
-    verify(bungieClient, times(0)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 1);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 0);
+    verify(bungieAPIService, times(0))
+        .getRaidActivities(membershipType, membershipId, characterId, 1);
   }
 
   @Test
@@ -127,9 +119,8 @@ public void getUserActivitiesMoreThanOnePageSuccess() {
           .toInstant(ZoneOffset.UTC);
       firstActivities.add(new Activity(completionDate, details, entryMap));
     }
-    var firstPageActivities = new ActivitiesResponse(firstActivities);
-    var firstPage = new BungieResponse<>(firstPageActivities);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0))
+    var firstPage = new ActivitiesResponse(firstActivities);
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 0))
         .thenReturn(Mono.just(firstPage));
 
     ArrayList<Activity> secondActivities = new ArrayList<>();
@@ -139,9 +130,8 @@ public void getUserActivitiesMoreThanOnePageSuccess() {
           .toInstant(ZoneOffset.UTC);
       secondActivities.add(new Activity(completionDate, details, entryMap));
     }
-    var secondPageActivities = new ActivitiesResponse(secondActivities);
-    var secondPage = new BungieResponse<>(secondPageActivities);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 1))
+    var secondPage = new ActivitiesResponse(secondActivities);
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 1))
         .thenReturn(Mono.just(secondPage));
 
     // when: getActivitiesAll is called
@@ -155,12 +145,12 @@ public void getUserActivitiesMoreThanOnePageSuccess() {
         }).verifyComplete();
 
     // and: there's two Bungie API calls
-    verify(bungieClient, times(1)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 0);
-    verify(bungieClient, times(1)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 1);
-    verify(bungieClient, times(0)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 2);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 0);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 1);
+    verify(bungieAPIService, times(0))
+        .getRaidActivities(membershipType, membershipId, characterId, 2);
   }
 
   @Test
@@ -171,9 +161,8 @@ public void getUserActivitiesEmptyActivityHistorySuccess() {
     String membershipId = "1389012";
     String characterId = "1";
 
-    var bungieResponse = new BungieResponse<ActivitiesResponse>(null);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0))
-        .thenReturn(Mono.just(bungieResponse));
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 0))
+        .thenReturn(Mono.just(new ActivitiesResponse()));
 
     // when: getActivitiesAll is called
     var response = StepVerifier.create(
@@ -183,10 +172,10 @@ public void getUserActivitiesEmptyActivityHistorySuccess() {
     response.expectNextCount(0).verifyComplete();
 
     // and: the bungie API calls is only one
-    verify(bungieClient, times(1)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 0);
-    verify(bungieClient, times(0)).getActivityHistory(membershipType, membershipId, characterId,
-        250, 4, 1);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 0);
+    verify(bungieAPIService, times(0))
+        .getRaidActivities(membershipType, membershipId, characterId, 1);
   }
 
   @Test
@@ -197,15 +186,12 @@ public void createUserRaidDetailsIsSuccessful() {
     int userTag = 8080;
     String membershipId = "12345";
     Integer membershipType = 3;
-    String clanName = "Legends of Honor";
     String userId = username + "#" + userTag;
     Instant creationInstant = Instant.now();
 
     Map<String, UserCharacter> data = Map.of("1", new UserCharacter());
-    Characters characters = new Characters(data);
-    CharactersResponse charactersResponse = new CharactersResponse(characters);
-    when(bungieClient.getUserCharacters(membershipType, membershipId))
-        .thenReturn(Mono.just(new BungieResponse<>(charactersResponse)));
+    when(bungieAPIService.getUserCharacters(membershipType, membershipId))
+        .thenReturn(Mono.just(data));
 
     Map<String, ValueEntry> entryMap = Map.of(
         "deaths", new ValueEntry("deaths", new Basic(0.0, "0")),
@@ -223,20 +209,20 @@ public void createUserRaidDetailsIsSuccessful() {
         new Activity(Instant.now(), new ActivityDetails(2L, 789124L, 4), entryMap)
     );
     ActivitiesResponse activitiesResponse = new ActivitiesResponse(activities);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, "1", 250, 4, 0))
-        .thenReturn(Mono.just(new BungieResponse<>(activitiesResponse)));
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, "1", 0))
+        .thenReturn(Mono.just(activitiesResponse));
 
-    ResponseFields firstActivity = ResponseFields.builder()
+    ManifestResponseFields firstActivity = ManifestResponseFields.builder()
         .displayProperties(new DisplayProperties("", "Last Wish: 50", "", "", false))
         .build();
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 1L))
-        .thenReturn(Mono.just(new BungieResponse<>(firstActivity)));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 1L))
+        .thenReturn(Mono.just(firstActivity));
 
-    ResponseFields secondActivity = ResponseFields.builder()
+    ManifestResponseFields secondActivity = ManifestResponseFields.builder()
         .displayProperties(new DisplayProperties("", "King's Fall: Master", "", "", false))
         .build();
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2L))
-        .thenReturn(Mono.just(new BungieResponse<>(secondActivity)));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2L))
+        .thenReturn(Mono.just(secondActivity));
 
     PGCRDetails pgcr = new PGCRDetails(null, true, null);
     when(postGameCarnageService.retrievePGCR(any(Long.class)))
@@ -272,8 +258,8 @@ public void createUserRaidDetailsIsSuccessful() {
     response.verifyComplete();
 
     // and: the correct interactions occur
-    verify(bungieClient, times(1)).getUserCharacters(membershipType, membershipId);
-    verify(bungieClientWrapper, times(5)).getManifestEntity(any(), anyLong());
+    verify(bungieAPIService, times(1)).getUserCharacters(membershipType, membershipId);
+    verify(bungieAPIService, times(5)).getManifestEntity(any(), anyLong());
     verify(postGameCarnageService, atMost(5)).retrievePGCR(anyLong());
     verify(userDetailsRepository, times(1)).save(any());
   }
@@ -286,15 +272,12 @@ public void createUserDetailsRaidStatsDefaultValues() {
     int userTag = 8080;
     String membershipId = "12345";
     Integer membershipType = 3;
-    String clanName = "Legends of Honor";
     String userId = username + "#" + userTag;
     Instant creationInstant = Instant.now();
 
     Map<String, UserCharacter> data = Map.of("1", new UserCharacter());
-    Characters characters = new Characters(data);
-    CharactersResponse charactersResponse = new CharactersResponse(characters);
-    when(bungieClient.getUserCharacters(membershipType, membershipId))
-        .thenReturn(Mono.just(new BungieResponse<>(charactersResponse)));
+    when(bungieAPIService.getUserCharacters(membershipType, membershipId))
+        .thenReturn(Mono.just(data));
 
     List<Activity> activities = List.of(
         new Activity(Instant.now(), new ActivityDetails(1L, 789120L, 4), Collections.emptyMap()),
@@ -304,20 +287,20 @@ public void createUserDetailsRaidStatsDefaultValues() {
         new Activity(Instant.now(), new ActivityDetails(2L, 789124L, 4), Collections.emptyMap())
     );
     ActivitiesResponse activitiesResponse = new ActivitiesResponse(activities);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, "1", 250, 4, 0))
-        .thenReturn(Mono.just(new BungieResponse<>(activitiesResponse)));
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, "1", 0))
+        .thenReturn(Mono.just(activitiesResponse));
 
-    ResponseFields firstActivity = ResponseFields.builder()
+    ManifestResponseFields firstActivity = ManifestResponseFields.builder()
         .displayProperties(new DisplayProperties("", "Last Wish: 50", "", "", false))
         .build();
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 1L))
-        .thenReturn(Mono.just(new BungieResponse<>(firstActivity)));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 1L))
+        .thenReturn(Mono.just(firstActivity));
 
-    ResponseFields secondActivity = ResponseFields.builder()
+    ManifestResponseFields secondActivity = ManifestResponseFields.builder()
         .displayProperties(new DisplayProperties("", "King's Fall: Master", "", "", false))
         .build();
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2L))
-        .thenReturn(Mono.just(new BungieResponse<>(secondActivity)));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2L))
+        .thenReturn(Mono.just(secondActivity));
 
     PGCRDetails pgcr = new PGCRDetails(null, true, null);
     when(postGameCarnageService.retrievePGCR(any(Long.class)))
@@ -353,8 +336,8 @@ public void createUserDetailsRaidStatsDefaultValues() {
     response.verifyComplete();
 
     // and: the correct interactions occur
-    verify(bungieClient, times(1)).getUserCharacters(membershipType, membershipId);
-    verify(bungieClientWrapper, times(5)).getManifestEntity(any(), anyLong());
+    verify(bungieAPIService, times(1)).getUserCharacters(membershipType, membershipId);
+    verify(bungieAPIService, times(5)).getManifestEntity(any(), anyLong());
     verify(postGameCarnageService, atMost(5)).retrievePGCR(anyLong());
     verify(userDetailsRepository, times(1)).save(any());
   }
@@ -384,9 +367,8 @@ public void getCharacterActivitiesUntil() {
       activities.add(new Activity(completionDate, details, entryMap));
     }
     var activitiesResponse = new ActivitiesResponse(activities);
-    var bungieResponse = new BungieResponse<>(activitiesResponse);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0))
-        .thenReturn(Mono.just(bungieResponse));
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 0))
+        .thenReturn(Mono.just(activitiesResponse));
 
     // when: getting activities and the most recent call was 25 days ago
     var response = sut.getActivitiesUntil(membershipType, membershipId, characterId, timestamp);
@@ -424,9 +406,8 @@ public void getCharacterActivitiesUntilVariousPages() {
           .toInstant(ZoneOffset.UTC);
       firstPageActivities.add(new Activity(completionDate, details, entryMap));
     }
-    var activitiesResponse = new ActivitiesResponse(firstPageActivities);
-    var firstPage = new BungieResponse<>(activitiesResponse);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0))
+    var firstPage = new ActivitiesResponse(firstPageActivities);
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 0))
         .thenReturn(Mono.just(firstPage));
 
     ArrayList<Activity> secondPageActivities = new ArrayList<>();
@@ -436,9 +417,8 @@ public void getCharacterActivitiesUntilVariousPages() {
           .toInstant(ZoneOffset.UTC);
       secondPageActivities.add(new Activity(completionDate, details, entryMap));
     }
-    var secondResponse = new ActivitiesResponse(secondPageActivities);
-    var secondPage = new BungieResponse<>(secondResponse);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 1))
+    var secondPage = new ActivitiesResponse(secondPageActivities);
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 1))
         .thenReturn(Mono.just(secondPage));
 
     // when: getting activities and the most recent call was 300 days ago
@@ -454,12 +434,12 @@ public void getCharacterActivitiesUntilVariousPages() {
         }).verifyComplete();
 
     // and: verify that the activities endpoint was called for both pages and a third page was not called
-    verify(bungieClient, times(1))
-        .getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0);
-    verify(bungieClient, times(1))
-        .getActivityHistory(membershipType, membershipId, characterId, 250, 4, 1);
-    verify(bungieClient, times(0))
-        .getActivityHistory(membershipType, membershipId, characterId, 250, 4, 2);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 0);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 1);
+    verify(bungieAPIService, times(0))
+        .getRaidActivities(membershipType, membershipId, characterId, 2);
   }
 
   @Test
@@ -486,9 +466,8 @@ public void getCharacter() {
           .toInstant(ZoneOffset.UTC);
       firstPageActivities.add(new Activity(completionDate, details, entryMap));
     }
-    var activitiesResponse = new ActivitiesResponse(firstPageActivities);
-    var firstPage = new BungieResponse<>(activitiesResponse);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0))
+    var firstPage = new ActivitiesResponse(firstPageActivities);
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, characterId, 0))
         .thenReturn(Mono.just(firstPage));
 
     // when: getting activities and the most recent call was 300 days ago
@@ -502,10 +481,10 @@ public void getCharacter() {
         }).verifyComplete();
 
     // and: verify that the activities endpoint was called for only the first page
-    verify(bungieClient, times(1))
-        .getActivityHistory(membershipType, membershipId, characterId, 250, 4, 0);
-    verify(bungieClient, times(0))
-        .getActivityHistory(membershipType, membershipId, characterId, 250, 4, 1);
+    verify(bungieAPIService, times(1))
+        .getRaidActivities(membershipType, membershipId, characterId, 0);
+    verify(bungieAPIService, times(0))
+        .getRaidActivities(membershipType, membershipId, characterId, 1);
   }
 
   @Test
@@ -539,10 +518,8 @@ public void updateActionSuccessful() {
     when(userDetailsRepository.findById(userId)).thenReturn(Mono.just(existingUser));
 
     Map<String, UserCharacter> data = Map.of("1", new UserCharacter());
-    Characters characters = new Characters(data);
-    CharactersResponse charactersResponse = new CharactersResponse(characters);
-    when(bungieClient.getUserCharacters(membershipType, membershipId))
-        .thenReturn(Mono.just(new BungieResponse<>(charactersResponse)));
+    when(bungieAPIService.getUserCharacters(membershipType, membershipId))
+        .thenReturn(Mono.just(data));
 
     Map<String, ValueEntry> entryMap = Map.of(
         "deaths", new ValueEntry("deaths", new Basic(0.0, "0")),
@@ -561,14 +538,14 @@ public void updateActionSuccessful() {
         new Activity(threeDaysAgo, new ActivityDetails(2L, 4L, 4), Collections.emptyMap())
     );
     ActivitiesResponse activitiesResponse = new ActivitiesResponse(activities);
-    when(bungieClient.getActivityHistory(membershipType, membershipId, "1", 250, 4, 0))
-        .thenReturn(Mono.just(new BungieResponse<>(activitiesResponse)));
+    when(bungieAPIService.getRaidActivities(membershipType, membershipId, "1", 0))
+        .thenReturn(Mono.just(activitiesResponse));
 
-    ResponseFields firstActivity = ResponseFields.builder()
+    ManifestResponseFields firstActivity = ManifestResponseFields.builder()
         .displayProperties(new DisplayProperties("", "Last Wish: 50", "", "", false))
         .build();
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 1L))
-        .thenReturn(Mono.just(new BungieResponse<>(firstActivity)));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 1L))
+        .thenReturn(Mono.just(firstActivity));
 
     PGCRDetails pgcr = new PGCRDetails(null, true, null);
     when(postGameCarnageService.retrievePGCR(any(Long.class)))
@@ -599,8 +576,8 @@ public void updateActionSuccessful() {
     response.verifyComplete();
 
     // and: the correct interactions occur
-    verify(bungieClient, times(1)).getUserCharacters(membershipType, membershipId);
-    verify(bungieClientWrapper, times(1)).getManifestEntity(any(), anyLong());
+    verify(bungieAPIService, times(1)).getUserCharacters(membershipType, membershipId);
+    verify(bungieAPIService, times(1)).getManifestEntity(any(), anyLong());
     verify(postGameCarnageService, atMost(1)).retrievePGCR(anyLong());
     verify(userDetailsRepository, times(1)).save(any());
   }
diff --git a/src/test/java/com/danielvm/destiny2bot/service/WeeklyActivitiesServiceTest.java b/src/test/java/com/danielvm/destiny2bot/service/WeeklyActivitiesServiceTest.java
index 6c9f08e..9117fa6 100644
--- a/src/test/java/com/danielvm/destiny2bot/service/WeeklyActivitiesServiceTest.java
+++ b/src/test/java/com/danielvm/destiny2bot/service/WeeklyActivitiesServiceTest.java
@@ -2,12 +2,9 @@
 
 import static org.mockito.Mockito.when;
 
-import com.danielvm.destiny2bot.client.BungieClient;
-import com.danielvm.destiny2bot.client.BungieClientWrapper;
 import com.danielvm.destiny2bot.dto.WeeklyActivity;
-import com.danielvm.destiny2bot.dto.destiny.BungieResponse;
 import com.danielvm.destiny2bot.dto.destiny.manifest.DisplayProperties;
-import com.danielvm.destiny2bot.dto.destiny.manifest.ResponseFields;
+import com.danielvm.destiny2bot.dto.destiny.manifest.ManifestResponseFields;
 import com.danielvm.destiny2bot.dto.destiny.milestone.ActivitiesDto;
 import com.danielvm.destiny2bot.dto.destiny.milestone.MilestoneEntry;
 import com.danielvm.destiny2bot.enums.ActivityMode;
@@ -30,9 +27,8 @@
 public class WeeklyActivitiesServiceTest {
 
   @Mock
-  private BungieClient bungieClient;
-  @Mock
-  private BungieClientWrapper bungieClientWrapper;
+  BungieAPIService bungieAPIService;
+
   @InjectMocks
   private WeeklyActivitiesService sut;
 
@@ -46,48 +42,43 @@ public void retrieveWeeklyRaidWorksSuccessfully() {
     var endTime = ZonedDateTime.now().plusDays(2L);
     var activitiesNoWeekly = List.of(new ActivitiesDto(1262462921L, Collections.emptyList()));
     var activitiesWeekly = List.of(new ActivitiesDto(2823159265L, List.of("897950155")));
-    var milestoneResponse = new BungieResponse<>(
-        Map.of(
-            "526718853", new MilestoneEntry(526718853L,
-                startTime, endTime, activitiesNoWeekly),
+    var milestoneResponse = Map.of(
+        "526718853", new MilestoneEntry(526718853L,
+            startTime, endTime, activitiesNoWeekly),
 
-            "3618845105", new MilestoneEntry(3618845105L,
-                startTime, endTime, activitiesWeekly),
+        "3618845105", new MilestoneEntry(3618845105L,
+            startTime, endTime, activitiesWeekly),
 
-            "2029743966", new MilestoneEntry(2029743966L,
-                startTime, endTime, null)
-        )
+        "2029743966", new MilestoneEntry(2029743966L,
+            startTime, endTime, null)
     );
 
-    when(bungieClient.getPublicMilestonesRx())
+    when(bungieAPIService.getPublicMilestones())
         .thenReturn(Mono.just(milestoneResponse));
 
-    var activityWithType = new ResponseFields();
+    var activityWithType = new ManifestResponseFields();
     activityWithType.setActivityTypeHash(608898761L);
-    var raidActivityEntity = new BungieResponse<>(activityWithType);
 
     when(
-        bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2823159265L))
-        .thenReturn(Mono.just(raidActivityEntity));
+        bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2823159265L))
+        .thenReturn(Mono.just(activityWithType));
 
-    var raidResponseFields = new ResponseFields();
+    var raidResponseFields = new ManifestResponseFields();
     raidResponseFields.setDisplayProperties(
         new DisplayProperties("someDescription", "Raid", null, null, false));
-    var activityTypeEntity = new BungieResponse<>(raidResponseFields);
 
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_TYPE_DEFINITION,
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_TYPE_DEFINITION,
         608898761L))
-        .thenReturn(Mono.just(activityTypeEntity));
+        .thenReturn(Mono.just(raidResponseFields));
 
-    var milestoneResponseFields = new ResponseFields();
+    var milestoneResponseFields = new ManifestResponseFields();
     var lastWishDisplayProperties = new DisplayProperties("Delve into the Last Wish raid",
         "The Last Wish", null, null, false);
     milestoneResponseFields.setDisplayProperties(lastWishDisplayProperties);
-    var milestoneEntity = new BungieResponse<>(milestoneResponseFields);
 
     when(
-        bungieClientWrapper.getManifestEntity(ManifestEntity.MILESTONE_DEFINITION, 3618845105L))
-        .thenReturn(Mono.just(milestoneEntity));
+        bungieAPIService.getManifestEntity(ManifestEntity.MILESTONE_DEFINITION, 3618845105L))
+        .thenReturn(Mono.just(milestoneResponseFields));
 
     WeeklyActivity expectedResponse = new WeeklyActivity("The Last Wish",
         "Delve into the Last Wish raid", startTime, endTime);
@@ -111,46 +102,41 @@ public void retrieveWeeklyDungeonIsSuccessful() {
     var endTime = ZonedDateTime.now().plusDays(2L);
     var activitiesNoWeekly = List.of(new ActivitiesDto(1262462921L, Collections.emptyList()));
     var activitiesWeekly = List.of(new ActivitiesDto(2823159265L, List.of("897950155")));
-    var milestoneResponse = new BungieResponse<>(
-        Map.of(
-            "526718853", new MilestoneEntry(526718853L,
-                startTime, endTime, activitiesNoWeekly),
+    var milestoneResponse = Map.of(
+        "526718853", new MilestoneEntry(526718853L,
+            startTime, endTime, activitiesNoWeekly),
 
-            "3618845105", new MilestoneEntry(3618845105L,
-                startTime, endTime, activitiesWeekly),
+        "3618845105", new MilestoneEntry(3618845105L,
+            startTime, endTime, activitiesWeekly),
 
-            "2029743966", new MilestoneEntry(2029743966L,
-                startTime, endTime, null)
-        )
+        "2029743966", new MilestoneEntry(2029743966L,
+            startTime, endTime, null)
     );
 
-    when(bungieClient.getPublicMilestonesRx())
+    when(bungieAPIService.getPublicMilestones())
         .thenReturn(Mono.just(milestoneResponse));
 
-    var activityWithType = new ResponseFields();
+    var activityWithType = new ManifestResponseFields();
     activityWithType.setActivityTypeHash(608898761L);
-    var raidActivityEntity = new BungieResponse<>(activityWithType);
 
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2823159265L))
-        .thenReturn(Mono.just(raidActivityEntity));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_DEFINITION, 2823159265L))
+        .thenReturn(Mono.just(activityWithType));
 
-    var dungeonResponseFields = new ResponseFields();
+    var dungeonResponseFields = new ManifestResponseFields();
     dungeonResponseFields.setDisplayProperties(
         new DisplayProperties("someDescription", "Dungeon", null, null, false));
-    var activityTypeEntity = new BungieResponse<>(dungeonResponseFields);
 
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.ACTIVITY_TYPE_DEFINITION,
+    when(bungieAPIService.getManifestEntity(ManifestEntity.ACTIVITY_TYPE_DEFINITION,
         608898761L))
-        .thenReturn(Mono.just(activityTypeEntity));
+        .thenReturn(Mono.just(dungeonResponseFields));
 
-    var milestoneResponseFields = new ResponseFields();
+    var milestoneResponseFields = new ManifestResponseFields();
     var dualityDisplayProperties = new DisplayProperties("Calus' mind as a dungeon lol",
         "Duality", null, null, false);
     milestoneResponseFields.setDisplayProperties(dualityDisplayProperties);
-    var milestoneEntity = new BungieResponse<>(milestoneResponseFields);
 
-    when(bungieClientWrapper.getManifestEntity(ManifestEntity.MILESTONE_DEFINITION, 3618845105L))
-        .thenReturn(Mono.just(milestoneEntity));
+    when(bungieAPIService.getManifestEntity(ManifestEntity.MILESTONE_DEFINITION, 3618845105L))
+        .thenReturn(Mono.just(milestoneResponseFields));
 
     WeeklyActivity expectedResponse = new WeeklyActivity(dualityDisplayProperties.getName(),
         dualityDisplayProperties.getDescription(), startTime, endTime);
@@ -173,17 +159,15 @@ public void getWeeklyActivityError() {
     var startTime = ZonedDateTime.now();
     var endTime = ZonedDateTime.now().plusDays(2L);
     var activitiesNoWeekly = List.of(new ActivitiesDto(1262462921L, Collections.emptyList()));
-    var milestoneResponse = new BungieResponse<>(
-        Map.of(
-            "526718853", new MilestoneEntry(526718853L,
-                startTime, endTime, activitiesNoWeekly),
-
-            "2029743966", new MilestoneEntry(2029743966L,
-                startTime, endTime, null)
-        )
+    var milestoneResponse = Map.of(
+        "526718853", new MilestoneEntry(526718853L,
+            startTime, endTime, activitiesNoWeekly),
+
+        "2029743966", new MilestoneEntry(2029743966L,
+            startTime, endTime, null)
     );
 
-    when(bungieClient.getPublicMilestonesRx())
+    when(bungieAPIService.getPublicMilestones())
         .thenReturn(Mono.just(milestoneResponse));
 
     // when: getWeeklyActivity is called
diff --git a/src/test/resources/__files/bungie/milestone-response.json b/src/test/resources/__files/bungie/milestone-response.json
index ee44ea6..977d69a 100644
--- a/src/test/resources/__files/bungie/milestone-response.json
+++ b/src/test/resources/__files/bungie/milestone-response.json
@@ -1 +1 @@
-{"response":{"3021174356":{"milestoneHash":3021174356,"startDate":null,"endDate":null,"activities":null},"644555645":{"milestoneHash":644555645,"startDate":null,"endDate":null,"activities":null},"3181387331":{"milestoneHash":3181387331,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":[{"activityHash":2122313384,"challengeObjectiveHashes":[]}]},"4253138191":{"milestoneHash":4253138191,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":null},"3603098564":{"milestoneHash":3603098564,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":null},"3802603984":{"milestoneHash":3802603984,"startDate":null,"endDate":null,"activities":null},"2709491520":{"milestoneHash":2709491520,"startDate":null,"endDate":null,"activities":null},"2594202463":{"milestoneHash":2594202463,"startDate":null,"endDate":null,"activities":null},"3899487295":{"milestoneHash":3899487295,"startDate":null,"endDate":null,"activities":null},"2712317338":{"milestoneHash":2712317338,"startDate":1709658000.000000000,"endDate":1710259200.000000000,"activities":[{"activityHash":1042180643,"challengeObjectiveHashes":["2398860795"]}]},"541780856":{"milestoneHash":541780856,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":[{"activityHash":910380154,"challengeObjectiveHashes":[]}]},"526718853":{"milestoneHash":526718853,"startDate":1709658000.000000000,"endDate":1710259200.000000000,"activities":[{"activityHash":1262462921,"challengeObjectiveHashes":["3211393925"]},{"activityHash":2296818662,"challengeObjectiveHashes":["3211393925"]}]}}}
\ No newline at end of file
+{"response":{"3021174356":{"milestoneHash":3021174356,"startDate":null,"endDate":null,"activities":null},"644555645":{"milestoneHash":644555645,"startDate":null,"endDate":null,"activities":null},"3181387331":{"milestoneHash":3181387331,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":[{"activityHash":2122313384,"challengeObjectiveHashes":[]}]},"4253138191":{"milestoneHash":4253138191,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":null},"3603098564":{"milestoneHash":3603098564,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":null},"3802603984":{"milestoneHash":3802603984,"startDate":null,"endDate":null,"activities":null},"2709491520":{"milestoneHash":2709491520,"startDate":null,"endDate":null,"activities":null},"2594202463":{"milestoneHash":2594202463,"startDate":null,"endDate":null,"activities":null},"3899487295":{"milestoneHash":3899487295,"startDate":null,"endDate":null,"activities":null},"2712317338":{"milestoneHash":2712317338,"startDate":1709658000.000000000,"endDate":1710864000.000000000,"activities":[{"activityHash":1042180643,"challengeObjectiveHashes":["2398860795"]}]},"541780856":{"milestoneHash":541780856,"startDate":1701795600.000000000,"endDate":1702400400.000000000,"activities":[{"activityHash":910380154,"challengeObjectiveHashes":[]}]},"526718853":{"milestoneHash":526718853,"startDate":1709658000.000000000,"endDate":1710864000.000000000,"activities":[{"activityHash":1262462921,"challengeObjectiveHashes":["3211393925"]},{"activityHash":2296818662,"challengeObjectiveHashes":["3211393925"]}]}}}
\ No newline at end of file