@fragus/sam-types 1.2.24 → 1.2.25

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.24",
+  "version": "1.2.25",
   "name": "@fragus/sam-types",
   "description": "Typescript interfaces for all types used to communicate between SAM client(s) and the SAM API",
   "author": "Fragus",

package/types/admin/productBlacklist/index.d.ts

@@ -1,3 +1,5 @@
+import { IBlacklistOwner, IBlacklistOwnersRequest } from '../vehicleBlacklist'
+
 /**
  * The vehicles a product is blacklisted for, matched like a vehicle blacklist entry: `*` in model or fuel type matches
  * any, and the model year range is inclusive with null meaning no limit.
@@ -24,22 +26,9 @@ export interface IBlacklistedProductRequest {
   contractProviderGroupIds: number[]
 }
 
-/** Owners to add to and remove from a rule; it must keep at least one. */
-export interface IBlacklistedProductOwnersRequest {
-  providerIds: {
-    add: number[]
-    remove: number[]
-  }
-  contractProviderGroupIds: {
-    add: number[]
-    remove: number[]
-  }
-}
+export type IBlacklistedProductOwnersRequest = IBlacklistOwnersRequest
 
-export interface IBlacklistedProductOwner {
-  id: number
-  name: string
-}
+export type IBlacklistedProductOwner = IBlacklistOwner
 
 export interface IBlacklistedProductResponse {
   id: number
@@ -50,10 +39,7 @@ export interface IBlacklistedProductResponse {
   contractProviderGroups: IBlacklistedProductOwner[]
 }
 
-export interface IBlacklistedProductListRecord extends IBlacklistedProductResponse {
-  /** True in a sub provider's list when the rule applies to it only through its parent. */
-  parentRecord: boolean
-}
+export type IBlacklistedProductListRecord = IBlacklistedProductResponse
 
 /** The `debug` of a PRODUCT_BLACKLIST_ALREADY_EXISTS (409) response: the identical rule that exists. */
 export interface IBlacklistedProductConflict {

package/types/admin/vehicleBlacklist/index.d.ts

@@ -1,20 +1,36 @@
-export interface IBlacklistedVehicleRequest {
-  brand: string
-  model: string
-  fuelType: string
-  /** Inclusive model year range; null on either end means no limit. */
-  modelYearFrom?: number | null
-  modelYearTo?: number | null
+/** Owners to add to and remove from a blacklist rule; it must keep at least one. */
+export interface IBlacklistOwnersRequest {
   providerIds: {
     add: number[]
     remove: number[]
   }
-  contractProviderGroupIds?: {
+  contractProviderGroupIds: {
     add: number[]
     remove: number[]
   }
 }
 
+/** A provider or a provider group a blacklist rule applies to. */
+export interface IBlacklistOwner {
+  id: number
+  name: string
+}
+
+/**
+ * A vehicle blacklisted for its owners: the providers and groups, at least one in all. A rule cannot be changed once
+ * created, only its owners.
+ */
+export interface IBlacklistedVehicleRequest {
+  brand: string
+  model: string
+  fuelType: string
+  /** Inclusive model year range; null on either end means no limit. */
+  modelYearFrom?: number | null
+  modelYearTo?: number | null
+  providerIds: number[]
+  contractProviderGroupIds: number[]
+}
+
 export interface IBlacklistedVehicleResponse {
   id: number
   brand: string
@@ -22,22 +38,15 @@ export interface IBlacklistedVehicleResponse {
   fuelType: string
   modelYearFrom: number | null
   modelYearTo: number | null
-  parentRecord?: boolean
-  groupRecord?: boolean
+  providers: IBlacklistOwner[]
+  contractProviderGroups: IBlacklistOwner[]
 }
 
-export interface IBlacklistedVehicleListRecord extends IBlacklistedVehicleResponse {
-  // Null on a group-owned entry: the two owners are exclusive.
-  providerId: number | null
-  providerName: string | null
-  contractProviderGroupId: number | null
-  contractProviderGroupName: string | null
-}
+export type IBlacklistedVehicleListRecord = IBlacklistedVehicleResponse
 
-/** Which providers and groups a blacklisted vehicle is registered for. */
-export interface IBlacklistedVehicleScope {
-  providerIds: number[]
-  contractProviderGroupIds: number[]
+/** The `debug` of a VEHICLE_BLACKLIST_ALREADY_EXISTS (409) response: the identical rule that exists. */
+export interface IBlacklistedVehicleConflict {
+  id: number
 }
 
 export type BlacklistedVehicleOrderByType = 'id' | 'brand' | 'model' | 'fuelType'

package/types/responseErrors/vehcileBlacklistErrors.d.ts

@@ -1,6 +1,7 @@
 export type VehcileBlacklistErrors =
-    | 'DUPLICATE_RECORD'
-    | 'VEHICLE_BLACKLIST_NOT_FOUND'
-    | 'PRODUCT_BLACKLIST_NOT_FOUND'
-    | 'PRODUCT_BLACKLIST_ALREADY_EXISTS'
-    | 'CONTRACT_PRODUCT_BLACKLISTED'
+  | 'DUPLICATE_RECORD'
+  | 'VEHICLE_BLACKLIST_NOT_FOUND'
+  | 'VEHICLE_BLACKLIST_ALREADY_EXISTS'
+  | 'PRODUCT_BLACKLIST_NOT_FOUND'
+  | 'PRODUCT_BLACKLIST_ALREADY_EXISTS'
+  | 'CONTRACT_PRODUCT_BLACKLISTED'