fix: fixed search packaging

k8s/aircraft/service.yml

@@ -41,7 +41,7 @@ spec:
           command: [ "sh", "-c", "until nc -z aircraft-cache.aircraft.svc.cluster.local 6379; do sleep 2; done;" ]
       containers:
         - name: aircraft-service
-          image: ghcr.io/edinstance/distributed-aviation-system-services/aircraft:latest
+          image: ghcr.io/edinstance/distributed-aviation-system-services/aircraft:dev
           ports:
             - containerPort: 8080
               name: http

k8s/flights/service.yml

@@ -36,7 +36,7 @@ spec:
           command: [ "sh", "-c", "until nc -z flights-cache.flights.svc.cluster.local 6379; do sleep 2; done;" ]
       containers:
         - name: flights-service
-          image: ghcr.io/edinstance/distributed-aviation-system-services/flights:latest
+          image: ghcr.io/edinstance/distributed-aviation-system-services/flights:dev
           ports:
             - containerPort: 8081
           env:

k8s/gateway/service.yml

@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
         - name: gateway-service
-          image: ghcr.io/edinstance/distributed-aviation-system-services/gateway:latest
+          image: ghcr.io/edinstance/distributed-aviation-system-services/gateway:dev
           ports:
             - containerPort: 4001
           env:

k8s/search/service.yml

@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
         - name: search-service
-          image: ghcr.io/edinstance/distributed-aviation-system-services/search:latest
+          image: ghcr.io/edinstance/distributed-aviation-system-services/search:dev
           ports:
             - containerPort: 8082
           env:

services/search/src/main/java/search/config/OpenSearchConfig.java

@@ -1,4 +1,4 @@
-package aviation.search.config;
+package search.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

services/search/src/main/java/search/config/SearchLogger.java

@@ -1,4 +1,4 @@
-package aviation.search.config;
+package search.config;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsHelpers.java

@@ -1,4 +1,4 @@
-package aviation.search.config.metrics.graphql;
+package search.config.metrics.graphql;
 
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
 import graphql.language.Definition;

services/search/src/main/java/search/config/metrics/graphql/GraphqlMetricsInstrumentation.java

@@ -1,4 +1,4 @@
-package aviation.search.config.metrics.graphql;
+package search.config.metrics.graphql;
 
 import graphql.ExecutionResult;
 import graphql.execution.DataFetcherResult;
@@ -37,7 +37,7 @@ public class GraphqlMetricsInstrumentation implements Instrumentation {
    * A constructor for the instrumentation.
    */
   public GraphqlMetricsInstrumentation() {
-    Meter meter = GlobalOpenTelemetry.getMeter("aviation.search.graphql");
+    Meter meter = GlobalOpenTelemetry.getMeter("search.graphql");
 
     this.graphqlRequests = meter.counterBuilder("search_graphql_requests_total")
             .setDescription("Total GraphQL operations")

services/search/src/main/java/search/consumer/FlightEventConsumer.java

@@ -1,8 +1,8 @@
-package aviation.search.consumer;
+package search.consumer;
 
-import aviation.search.config.SearchLogger;
-import aviation.search.model.FlightDocument;
-import aviation.search.service.FlightSearchService;
+import search.config.SearchLogger;
+import search.model.FlightDocument;
+import search.service.FlightSearchService;
 import java.time.Instant;
 import lombok.RequiredArgsConstructor;
 import org.apache.avro.Schema;

services/search/src/main/java/search/exceptions/DomainException.java

@@ -1,4 +1,4 @@
-package aviation.search.exceptions;
+package search.exceptions;
 
 import lombok.Getter;
 

services/search/src/main/java/search/exceptions/ExceptionCategories.java

@@ -1,4 +1,4 @@
-package aviation.search.exceptions;
+package search.exceptions;
 
 /**
  * An enum for managing exception categories.

services/search/src/main/java/search/exceptions/GlobalGraphQlExceptionHandler.java

@@ -1,4 +1,4 @@
-package aviation.search.exceptions;
+package search.exceptions;
 
 import graphql.GraphQLError;
 import graphql.GraphqlErrorBuilder;

services/search/src/main/java/search/exceptions/UnauthorizedException.java

@@ -1,4 +1,4 @@
-package aviation.search.exceptions;
+package search.exceptions;
 
 /**
  * An exception for when a user is unauthorized.

services/search/src/main/java/search/helpers/SearchHelpers.java

@@ -1,7 +1,7 @@
-package aviation.search.helpers;
+package search.helpers;
 
-import aviation.search.model.FlightDocument;
-import aviation.search.service.FlightIndexService;
+import search.model.FlightDocument;
+import search.service.FlightIndexService;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;

services/search/src/main/java/search/model/FlightDocument.java

@@ -1,4 +1,4 @@
-package aviation.search.model;
+package search.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

services/search/src/main/java/search/resolver/FlightSearchResolver.java

@@ -1,7 +1,7 @@
-package aviation.search.resolver;
+package search.resolver;
 
-import aviation.search.model.FlightDocument;
-import aviation.search.service.FlightSearchService;
+import search.model.FlightDocument;
+import search.service.FlightSearchService;
 import com.netflix.graphql.dgs.DgsComponent;
 import com.netflix.graphql.dgs.DgsQuery;
 import com.netflix.graphql.dgs.InputArgument;

services/search/src/main/java/search/service/FlightIndexService.java

@@ -1,4 +1,4 @@
-package aviation.search.service;
+package search.service;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

services/search/src/main/java/search/service/FlightSearchService.java

@@ -1,8 +1,8 @@
-package aviation.search.service;
+package search.service;
 
-import aviation.search.config.SearchLogger;
-import aviation.search.helpers.SearchHelpers;
-import aviation.search.model.FlightDocument;
+import search.config.SearchLogger;
+import search.helpers.SearchHelpers;
+import search.model.FlightDocument;
 import java.io.IOException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

services/search/src/test/java/aviation/search/ApplicationTests.java → services/search/src/test/java/search/ApplicationTests.java

@@ -1,4 +1,4 @@
-package aviation.search;
+package search;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;