@passly-nl/data 1.0.1 → 1.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@passly-nl/data",
     "description": "API implementation for Passly.",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "type": "module",
     "license": "MIT",
     "funding": "https://github.com/sponsors/basmilius",
@@ -50,16 +50,16 @@
         "./*": "./*"
     },
     "dependencies": {
-        "@basmilius/http-client": "^3.10.0",
-        "@flux-ui/types": "^3.0.0-next.28",
+        "@basmilius/http-client": "^3.11.1",
+        "@flux-ui/types": "^3.0.0-next.32",
         "@fortawesome/fontawesome-common-types": "^7.2.0",
-        "apexcharts": "^5.10.1",
+        "apexcharts": "^5.10.3",
         "luxon": "^3.7.2"
     },
     "devDependencies": {
         "@types/luxon": "^3.7.1",
-        "@typescript/native-preview": "^7.0.0-dev.20260305.1",
-        "tsdown": "^0.21.0-beta.5"
+        "@typescript/native-preview": "^7.0.0-dev.20260309.1",
+        "tsdown": "^0.21.1"
     },
     "overrides": {
         "@disabled-basmilius/http-client": "link:@basmilius/http-client",

package/src/adapter/EventAdapter.ts

@@ -1,6 +1,6 @@
 import { adapter, ForeignData } from '@basmilius/http-client';
 import { AddressAdapter, AuthAdapter, DateTimeAdapter, FileSystemAdapter, MerchantAdapter, PaymentAdapter, ProductAdapter } from '#data/adapter';
-import { AppTeamDto, EventAvailabilityDto, EventCountersDto, EventDto, EventStatisticsAttendanceDto, EventStatisticsBuyerTotalsDto, EventStatisticsFinancialDto, EventStatisticsOrdersDto, EventStatisticsOrderTotalsDto, EventStatisticsScansDto, EventStatisticsScansPerAppTeamDto, EventStatisticsScanTotalsDto, EventStatisticsSwapTotalsDto, ShopDesignDto, ShopDto, ShopElementButtonDto, ShopElementDividerDto, ShopElementDto, ShopElementHeadingDto, ShopElementNoticeDto, ShopElementProductDto, ShopElementTextDto, StockOverviewDto, StockOverviewItemDto, StockPoolDto, TicketTemplateDto } from '#data/dto';
+import { AppTeamDto, EventAvailabilityDto, EventCountersDto, EventDto, EventStatisticsAttendanceDto, EventStatisticsBuyerTotalsDto, EventStatisticsFinancialDto, EventStatisticsOrdersDto, EventStatisticsOrderTotalsDto, EventStatisticsScansDto, EventStatisticsScansPerAppTeamDto, EventStatisticsScanTotalsDto, EventStatisticsSwapTotalsDto, ShopDesignDto, ShopDto, ShopElementButtonDto, ShopElementDividerDto, ShopElementDto, ShopElementHeadingDto, ShopElementInformationDto, ShopElementNoticeDto, ShopElementProductDto, ShopElementTextDto, StockOverviewDto, StockOverviewItemDto, StockPoolDto, TicketTemplateDto } from '#data/dto';
 import { optional } from '#data/util';
 
 @adapter
@@ -104,6 +104,11 @@ export class EventAdapter {
                     data.title
                 );
 
+            case 'information':
+                return new ShopElementInformationDto(
+                    data.id
+                );
+
             case 'notice':
                 return new ShopElementNoticeDto(
                     data.id,

package/src/adapter/MerchantAdapter.ts

@@ -50,6 +50,7 @@ export class MerchantAdapter {
     static parseMerchantUser(data: ForeignData): MerchantUserDto {
         return new MerchantUserDto(
             data.is_manager,
+            data.claims ?? [],
             DateTimeAdapter.parseDateTime(data.created_on),
             DateTimeAdapter.parseDateTime(data.updated_on),
             AuthAdapter.parseUser(data.user)

package/src/adapter/ProductAdapter.ts

@@ -1,5 +1,5 @@
 import { adapter, ForeignData } from '@basmilius/http-client';
-import { EventAdapter, FileSystemAdapter, PaymentAdapter } from '#data/adapter';
+import { DateTimeAdapter, EventAdapter, FileSystemAdapter, PaymentAdapter } from '#data/adapter';
 import { ProductDto } from '#data/dto';
 import { optional, optionalArray } from '#data/util';
 
@@ -18,7 +18,8 @@ export class ProductAdapter {
             data.remaining_stock,
             optional(data.stock_pool, EventAdapter.parseStockPool),
             optional(data.image, FileSystemAdapter.parsePicture),
-            optionalArray(data.images, FileSystemAdapter.parsePicture)!
+            optionalArray(data.images, FileSystemAdapter.parsePicture)!,
+            optional(data.tickets_released_on, DateTimeAdapter.parseDateTime)
         );
     }
 }

package/src/adapter/PublicShopAdapter.ts

@@ -1,6 +1,6 @@
 import { adapter, ForeignData } from '@basmilius/http-client';
 import { AddressAdapter, DateTimeAdapter, FileSystemAdapter, PaymentAdapter } from '#data/adapter';
-import { PublicShopDesignDto, PublicShopDto, PublicShopElementButtonDto, PublicShopElementDividerDto, PublicShopElementDto, PublicShopElementHeadingDto, PublicShopElementNoticeDto, PublicShopElementProductDto, PublicShopElementTextDto, PublicShopEventDto, PublicShopMerchantDto, PublicShopProductDto, PublicShopReservationDto, PublicShopReservationProductDetailsDto, PublicShopReservationProductDto, PublicShopTimeSlotDto } from '#data/dto';
+import { PublicShopDesignDto, PublicShopDto, PublicShopElementButtonDto, PublicShopElementDividerDto, PublicShopElementDto, PublicShopElementHeadingDto, PublicShopElementInformationDto, PublicShopElementNoticeDto, PublicShopElementProductDto, PublicShopElementTextDto, PublicShopEventDto, PublicShopMerchantDto, PublicShopProductDto, PublicShopReservationDto, PublicShopReservationProductDetailsDto, PublicShopReservationProductDto, PublicShopTimeSlotDto } from '#data/dto';
 import { optional, optionalArray } from '#data/util';
 
 @adapter
@@ -55,6 +55,11 @@ export class PublicShopAdapter {
                     data.title
                 );
 
+            case 'information':
+                return new PublicShopElementInformationDto(
+                    data.id
+                );
+
             case 'notice':
                 return new PublicShopElementNoticeDto(
                     data.id,
@@ -84,9 +89,13 @@ export class PublicShopAdapter {
         return new PublicShopEventDto(
             data.id,
             data.name,
+            data.description,
             data.status,
             AddressAdapter.parseAddress(data.address),
-            optional(data.header_file, FileSystemAdapter.parsePicture)
+            optional(data.header_file, FileSystemAdapter.parsePicture),
+            data.minimum_age,
+            DateTimeAdapter.parseDateTime(data.starts_on),
+            DateTimeAdapter.parseDateTime(data.ends_on)
         );
     }
 

package/src/dto/event/ShopElementInformationDto.ts

@@ -0,0 +1,9 @@
+import { dto } from '@basmilius/http-client';
+import { ShopElementDto } from '#data/dto';
+
+@dto
+export class ShopElementInformationDto extends ShopElementDto {
+    constructor(id: string) {
+        super(id, 'information');
+    }
+}

package/src/dto/event/index.ts

@@ -17,6 +17,7 @@ export * from './ShopElementDto';
 export * from './ShopElementButtonDto';
 export * from './ShopElementDividerDto';
 export * from './ShopElementHeadingDto';
+export * from './ShopElementInformationDto';
 export * from './ShopElementNoticeDto';
 export * from './ShopElementProductDto';
 export * from './ShopElementTextDto';

package/src/dto/merchant/MerchantUserDto.ts

@@ -1,6 +1,7 @@
 import { dto } from '@basmilius/http-client';
 import type { DateTime } from 'luxon';
 import type { UserDto } from '#data/dto';
+import type { Claim } from '#data/types';
 
 @dto
 export class MerchantUserDto {
@@ -12,6 +13,14 @@ export class MerchantUserDto {
         this.#isManager = value;
     }
 
+    get claims(): Claim[] {
+        return this.#claims;
+    }
+
+    set claims(value: Claim[]) {
+        this.#claims = value;
+    }
+
     get createdOn(): DateTime {
         return this.#createdOn;
     }
@@ -37,12 +46,14 @@ export class MerchantUserDto {
     }
 
     #isManager: boolean;
+    #claims: Claim[];
     #createdOn: DateTime;
     #updatedOn: DateTime;
     #user: UserDto;
 
-    constructor(isManager: boolean, createdOn: DateTime, updatedOn: DateTime, user: UserDto) {
+    constructor(isManager: boolean, claims: Claim[], createdOn: DateTime, updatedOn: DateTime, user: UserDto) {
         this.#isManager = isManager;
+        this.#claims = claims;
         this.#createdOn = createdOn;
         this.#updatedOn = updatedOn;
         this.#user = user;

package/src/dto/product/ProductDto.ts

@@ -1,4 +1,5 @@
 import { dto } from '@basmilius/http-client';
+import type { DateTime } from 'luxon';
 import type { CostDto, PictureDto, StockPoolDto } from '#data/dto';
 import type { ProductType } from '#data/types';
 
@@ -100,6 +101,14 @@ export class ProductDto {
         this.#images = value;
     }
 
+    get ticketsReleasedOn(): DateTime | null {
+        return this.#ticketsReleasedOn;
+    }
+
+    set ticketsReleasedOn(value: DateTime | null) {
+        this.#ticketsReleasedOn = value;
+    }
+
     #id: string;
     #type: ProductType;
     #name: string;
@@ -112,8 +121,9 @@ export class ProductDto {
     #stock: StockPoolDto;
     #image: PictureDto;
     #images: PictureDto[];
+    #ticketsReleasedOn: DateTime | null;
 
-    constructor(id: string, type: ProductType, name: string, description: string, price: CostDto, maxQuantity: number, isActive: boolean, isSwappable: boolean, remainingStock: number, stock: StockPoolDto, image: PictureDto, images: PictureDto[]) {
+    constructor(id: string, type: ProductType, name: string, description: string, price: CostDto, maxQuantity: number, isActive: boolean, isSwappable: boolean, remainingStock: number, stock: StockPoolDto, image: PictureDto, images: PictureDto[], ticketsReleasedOn: DateTime | null) {
         this.#id = id;
         this.#type = type;
         this.#name = name;
@@ -126,5 +136,6 @@ export class ProductDto {
         this.#stock = stock;
         this.#image = image;
         this.#images = images;
+        this.#ticketsReleasedOn = ticketsReleasedOn;
     }
 }

package/src/dto/publicShop/PublicShopElementInformationDto.ts

@@ -0,0 +1,9 @@
+import { dto } from '@basmilius/http-client';
+import { PublicShopElementDto } from '#data/dto';
+
+@dto
+export class PublicShopElementInformationDto extends PublicShopElementDto {
+    constructor(id: string) {
+        super(id, 'information');
+    }
+}

package/src/dto/publicShop/PublicShopEventDto.ts

@@ -1,4 +1,5 @@
 import { dto } from '@basmilius/http-client';
+import type { DateTime } from 'luxon';
 import type { AddressDto, PictureDto } from '#data/dto';
 import type { EventStatus } from '#data/types';
 
@@ -20,6 +21,14 @@ export class PublicShopEventDto {
         this.#name = value;
     }
 
+    get description(): string {
+        return this.#description;
+    }
+
+    set description(value: string) {
+        this.#description = value;
+    }
+
     get status(): EventStatus {
         return this.#status;
     }
@@ -44,17 +53,49 @@ export class PublicShopEventDto {
         this.#headerFile = value;
     }
 
+    get minimumAge(): number {
+        return this.#minimumAge;
+    }
+
+    set minimumAge(value: number) {
+        this.#minimumAge = value;
+    }
+
+    get startsOn(): DateTime {
+        return this.#startsOn;
+    }
+
+    set startsOn(value: DateTime) {
+        this.#startsOn = value;
+    }
+
+    get endsOn(): DateTime {
+        return this.#endsOn;
+    }
+
+    set endsOn(value: DateTime) {
+        this.#endsOn = value;
+    }
+
     #id: string;
     #name: string;
+    #description: string;
     #status: EventStatus;
     #address: AddressDto;
     #headerFile: PictureDto | null;
+    #minimumAge: number;
+    #startsOn: DateTime;
+    #endsOn: DateTime;
 
-    constructor(id: string, name: string, status: EventStatus, address: AddressDto, headerFile: PictureDto | null) {
+    constructor(id: string, name: string, description: string, status: EventStatus, address: AddressDto, headerFile: PictureDto | null, minimumAge: number, startsOn: DateTime, endsOn: DateTime) {
         this.#id = id;
         this.#name = name;
+        this.#description = description;
         this.#status = status;
         this.#address = address;
         this.#headerFile = headerFile;
+        this.#minimumAge = minimumAge;
+        this.#startsOn = startsOn;
+        this.#endsOn = endsOn;
     }
 }

package/src/dto/publicShop/index.ts

@@ -5,6 +5,7 @@ export * from './PublicShopElementDto';
 export * from './PublicShopElementButtonDto';
 export * from './PublicShopElementDividerDto';
 export * from './PublicShopElementHeadingDto';
+export * from './PublicShopElementInformationDto';
 export * from './PublicShopElementNoticeDto';
 export * from './PublicShopElementProductDto';
 export * from './PublicShopElementTextDto';

package/src/service/AdminMerchantService.ts

@@ -0,0 +1,15 @@
+import { type BaseResponse, BaseService, QueryString } from '@basmilius/http-client';
+import { MerchantAdapter } from '#data/adapter';
+import { MerchantDto } from '#data/dto';
+
+export class AdminMerchantService extends BaseService {
+    async get(merchantId: string): Promise<BaseResponse<MerchantDto>> {
+        return await this
+            .request(`/admin/merchants/${merchantId}`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .runAdapter(MerchantAdapter.parseMerchant);
+    }
+}

package/src/service/AdminMerchantsService.ts

@@ -0,0 +1,17 @@
+import { type BaseResponse, BaseService, type Paginated, QueryString } from '@basmilius/http-client';
+import { MerchantAdapter } from '#data/adapter';
+import { MerchantDto } from '#data/dto';
+
+export class AdminMerchantsService extends BaseService {
+    async get(offset: number, limit: number): Promise<BaseResponse<Paginated<MerchantDto>>> {
+        return await this
+            .request('/admin/merchants')
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl')
+                .append('offset', offset)
+                .append('limit', limit))
+            .bearerToken()
+            .runPaginatedAdapter(MerchantAdapter.parseMerchant);
+    }
+}

package/src/service/AdminService.ts

@@ -0,0 +1,4 @@
+import { BaseService } from '@basmilius/http-client';
+
+export class AdminService extends BaseService {
+}

package/src/service/MerchantContractService.ts

@@ -0,0 +1,60 @@
+import { BaseResponse, BaseService, Paginated, QueryString } from '@basmilius/http-client';
+import { MerchantAdapter } from '#data/adapter';
+import type { ContractDto } from '#data/dto';
+import type { DateTime } from 'luxon';
+
+export class MerchantContractService extends BaseService {
+    async get(merchantId: string, offset: number, limit: number): Promise<BaseResponse<Paginated<ContractDto>>> {
+        return await this
+            .request(`/merchants/${merchantId}/contracts`)
+            .method('get')
+            .bearerToken()
+            .queryString(QueryString.builder()
+                .append('language', 'nl')
+                .append('offset', offset)
+                .append('limit', limit))
+            .runPaginatedAdapter(MerchantAdapter.parseContract);
+    }
+
+    async getSingle(merchantId: string, contractId: string): Promise<BaseResponse<ContractDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/contracts/${contractId}`)
+            .method('get')
+            .bearerToken()
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .runAdapter(MerchantAdapter.parseContract);
+    }
+
+    async post(merchantId: string, startsOn: DateTime, endsOn: DateTime, feeCents: number, remark: string): Promise<BaseResponse<ContractDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/contracts`)
+            .method('post')
+            .bearerToken()
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .body({
+                starts_on: startsOn.toISO(),
+                ends_on: endsOn.toISO(),
+                fee_cents: feeCents,
+                remark: remark || undefined
+            })
+            .runAdapter(MerchantAdapter.parseContract);
+    }
+
+    async put(merchantId: string, contractId: string, startsOn: DateTime, endsOn: DateTime, feeCents: number, remark: string): Promise<BaseResponse<ContractDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/contracts/${contractId}`)
+            .method('put')
+            .bearerToken()
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .body({
+                starts_on: startsOn.toISO(),
+                ends_on: endsOn.toISO(),
+                fee_cents: feeCents,
+                remark: remark || undefined
+            })
+            .runAdapter(MerchantAdapter.parseContract);
+    }
+}

package/src/service/MerchantEventProductService.ts

@@ -1,4 +1,5 @@
 import { BaseResponse, BaseService, QueryString } from '@basmilius/http-client';
+import type { DateTime } from 'luxon';
 import { ProductAdapter } from '#data/adapter';
 import type { ProductDto } from '#data/dto';
 
@@ -39,7 +40,8 @@ export class MerchantEventProductService extends BaseService {
                 description: product.description,
                 price: product.price.cents,
                 max_quantity: product.maxQuantity,
-                is_swappable: product.isSwappable
+                is_swappable: product.isSwappable,
+                tickets_released_on: product.ticketsReleasedOn?.toISO() ?? null
             })
             .runAdapter(ProductAdapter.parseProduct);
     }

package/src/service/MerchantEventProductsService.ts

@@ -1,5 +1,6 @@
 import { BaseResponse, BaseService, Paginated, QueryString } from '@basmilius/http-client';
 import type { FluxFormSelectEntry } from '@flux-ui/types';
+import type { DateTime } from 'luxon';
 import { FluxAdapter, ProductAdapter } from '#data/adapter';
 import type { ProductDto } from '#data/dto';
 
@@ -28,7 +29,7 @@ export class MerchantEventProductsService extends BaseService {
             .runArrayAdapter(FluxAdapter.parseFluxFormSelectEntry);
     }
 
-    async post(merchantId: string, eventId: string, name: string, description: string, price: number, maxQuantity: number, stock: number | null, stockPoolId: string | null): Promise<BaseResponse<ProductDto>> {
+    async post(merchantId: string, eventId: string, name: string, description: string, price: number, maxQuantity: number, stock: number | null, stockPoolId: string | null, ticketsReleasedOn: DateTime | null = null): Promise<BaseResponse<ProductDto>> {
         return await this
             .request(`/merchants/${merchantId}/events/${eventId}/products`)
             .method('post')
@@ -41,7 +42,8 @@ export class MerchantEventProductsService extends BaseService {
                 price,
                 stock,
                 max_quantity: maxQuantity,
-                stock_pool_id: stockPoolId
+                stock_pool_id: stockPoolId,
+                tickets_released_on: ticketsReleasedOn?.toISO() ?? null
             })
             .runAdapter(ProductAdapter.parseProduct);
     }

package/src/service/MerchantUserService.ts

@@ -0,0 +1,38 @@
+import { BaseResponse, BaseService, QueryString } from '@basmilius/http-client';
+import { MerchantAdapter } from '#data/adapter';
+import type { MerchantUserDto } from '#data/dto';
+import type { Claim } from '#data/types';
+
+export class MerchantUserService extends BaseService {
+    async get(merchantId: string, userId: string): Promise<BaseResponse<MerchantUserDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/users/${userId}`)
+            .method('get')
+            .bearerToken()
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .runAdapter(MerchantAdapter.parseMerchantUser);
+    }
+
+    async put(merchantId: string, userId: string, isManager: boolean, claims: Claim[]): Promise<BaseResponse<MerchantUserDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/users/${userId}`)
+            .method('put')
+            .bearerToken()
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .body({
+                is_manager: isManager,
+                claims
+            })
+            .runAdapter(MerchantAdapter.parseMerchantUser);
+    }
+
+    async remove(merchantId: string, userId: string): Promise<BaseResponse<void>> {
+        return await this
+            .request(`/merchants/${merchantId}/users/${userId}`)
+            .method('delete')
+            .bearerToken()
+            .runEmpty();
+    }
+}

package/src/service/index.ts

@@ -1,7 +1,11 @@
+export * from './AdminService';
+export * from './AdminMerchantService';
+export * from './AdminMerchantsService';
 export * from './AuthService';
 export * from './InvitationService';
 export * from './MerchantService';
 export * from './MerchantsService';
+export * from './MerchantContractService';
 export * from './MerchantBuyerService';
 export * from './MerchantBuyersService';
 export * from './MerchantDashboardService';
@@ -31,6 +35,7 @@ export * from './MerchantStatisticsOverviewService';
 export * from './MerchantStatisticsSalesService';
 export * from './MerchantTicketService';
 export * from './MerchantTicketsService';
+export * from './MerchantUserService';
 export * from './MerchantUsersService';
 export * from './MeService';
 export * from './PublicOrderService';

package/src/types/auth.ts

@@ -1,5 +1,8 @@
 export type Claim =
     | 'admin:view'
+    | 'admin:finance'
+    | 'admin:merchants'
+    | 'admin:statistics'
     | 'auth:login'
     | 'buyers:view'
     | 'events:create'

package/src/types/event.ts

@@ -14,6 +14,7 @@ export type ShopElementType =
     | 'button'
     | 'divider'
     | 'heading'
+    | 'information'
     | 'notice'
     | 'product'
     | 'text';

package/src/types/publicShop.ts

@@ -2,6 +2,7 @@ export type PublicShopElementType =
     | 'button'
     | 'divider'
     | 'heading'
+    | 'information'
     | 'notice'
     | 'product'
     | 'text';