feat(server): Add activeCustomer query

server/src/api/resolvers/customer.resolver.ts

@@ -13,8 +13,10 @@ import { PaginatedList } from 'shared/shared-types';
 import { Address } from '../../entity/address/address.entity';
 import { Customer } from '../../entity/customer/customer.entity';
 import { CustomerService } from '../../service/services/customer.service';
+import { RequestContext } from '../common/request-context';
 import { Allow } from '../decorators/allow.decorator';
 import { Decode } from '../decorators/decode.decorator';
+import { Ctx } from '../decorators/request-context.decorator';
 
 @Resolver('Customer')
 export class CustomerResolver {
@@ -32,6 +34,15 @@ export class CustomerResolver {
         return this.customerService.findOne(args.id);
     }
 
+    @Query()
+    @Allow(Permission.Owner)
+    async activeCustomer(@Ctx() ctx: RequestContext): Promise<Customer | undefined> {
+        const userId = ctx.activeUserId;
+        if (userId) {
+            return this.customerService.findOneByUserId(userId);
+        }
+    }
+
     @ResolveProperty()
     @Allow(Permission.ReadCustomer)
     async addresses(customer: Customer): Promise<Address[]> {

server/src/api/types/customer.api.graphql

@@ -1,6 +1,7 @@
 type Query {
     customers(options: CustomerListOptions): CustomerList!
     customer(id: ID!): Customer
+    activeCustomer: Customer
 }
 
 type Mutation {

server/src/service/services/customer.service.ts

@@ -38,8 +38,16 @@ export class CustomerService {
             .then(([items, totalItems]) => ({ items, totalItems }));
     }
 
-    findOne(userId: ID): Promise<Customer | undefined> {
-        return this.connection.manager.findOne(Customer, userId);
+    findOne(id: ID): Promise<Customer | undefined> {
+        return this.connection.getRepository(Customer).findOne(id);
+    }
+
+    findOneByUserId(userId: ID): Promise<Customer | undefined> {
+        return this.connection.getRepository(Customer).findOne({
+            where: {
+                user: { id: userId },
+            },
+        });
     }
 
     findAddressesByCustomerId(customerId: ID): Promise<Address[]> {

shared/generated-types.ts

@@ -54,6 +54,7 @@ export interface Query {
     customerGroup?: CustomerGroup | null;
     customers: CustomerList;
     customer?: Customer | null;
+    activeCustomer?: Customer | null;
     facets: FacetList;
     facet?: Facet | null;
     order?: Order | null;
@@ -1684,6 +1685,7 @@ export namespace QueryResolvers {
         customerGroup?: CustomerGroupResolver<CustomerGroup | null, any, Context>;
         customers?: CustomersResolver<CustomerList, any, Context>;
         customer?: CustomerResolver<Customer | null, any, Context>;
+        activeCustomer?: ActiveCustomerResolver<Customer | null, any, Context>;
         facets?: FacetsResolver<FacetList, any, Context>;
         facet?: FacetResolver<Facet | null, any, Context>;
         order?: OrderResolver<Order | null, any, Context>;
@@ -1827,6 +1829,11 @@ export namespace QueryResolvers {
         id: string;
     }
 
+    export type ActiveCustomerResolver<R = Customer | null, Parent = any, Context = any> = Resolver<
+        R,
+        Parent,
+        Context
+    >;
     export type FacetsResolver<R = FacetList, Parent = any, Context = any> = Resolver<
         R,
         Parent,