@bash-app/bash-common 3.4.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "3.4.0",
+  "version": "4.0.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -783,7 +783,7 @@ model Service {
   title              String?
   coverPhoto         String?
   media              Media[]
-  serviceType        ServiceType[]
+  serviceTypes       ServiceType[]
   subServiceType     String?
   serviceLinks       ServiceLink[]
   description        String?
@@ -799,11 +799,11 @@ model Service {
 }
 
 model ServiceRange {
-  id           String   @id @default(cuid())
-  min          Int?
-  max          Int?
-  crowdSize    Service? @relation("CrowdSize")
-  serviceRange Service? @relation("ServiceRange")
+  id                  String   @id @default(cuid())
+  min                 Int      @default(0)
+  max                 Int      @default(50)
+  serviceCrowdSize    Service? @relation("CrowdSize")
+  serviceServiceRange Service? @relation("ServiceRange")
 }
 
 model Availability {

package/src/extendedSchemas.ts

@@ -12,6 +12,17 @@ import {
   Reminder, ServiceRange
 } from "@prisma/client";
 
+export const FRONT_END_USER_DATA_TO_SELECT = {
+  id: true,
+  email: true,
+  givenName: true,
+  familyName: true,
+  fullName: true,
+  username: true,
+  image: true,
+  uploadedImage: true,
+  services: true,
+}
 
 export interface BashEventExt extends BashEvent {
   targetAudience?: TargetAudience;
@@ -74,7 +85,9 @@ export interface ServiceExt extends Service {
 }
 
 export const SERVICE_DATA_TO_INCLUDE = {
-  owner: true,
+  owner: {
+    select: FRONT_END_USER_DATA_TO_SELECT
+  },
   media: true,
   crowdSize: true,
   serviceRange: true,
@@ -151,17 +164,6 @@ export const USER_DATA_SELECT_REVIEWS_COMMENTS = {
   }
 }
 
-export const PUBLIC_USER_DATA_TO_SELECT = {
-  id: true,
-  email: true,
-  givenName: true,
-  familyName: true,
-  fullName: true,
-  username: true,
-  image: true,
-  uploadedImage: true,
-  services: true,
-}
 
-export type Public_User = Pick<UserExt, keyof typeof PUBLIC_USER_DATA_TO_SELECT>
+export type Public_User = Pick<UserExt, keyof typeof FRONT_END_USER_DATA_TO_SELECT>
   & Partial<Pick<UserExt, keyof typeof USER_DATA_SELECT_REVIEWS_COMMENTS>>;