@bash-app/bash-common 17.7.1 → 17.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +4 -4
  2. package/prisma/schema.prisma +48 -47
  3. package/src/extendedSchemas.ts +3 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bash-app/bash-common",
3
- "version": "17.7.1",
3
+ "version": "17.8.1",
4
4
  "description": "Common data and scripts to use on the frontend and backend",
5
5
  "type": "module",
6
6
  "main": "src/index.ts",
@@ -18,9 +18,9 @@
18
18
  "author": "Frank Nielson and Steve Goodrick",
19
19
  "license": "ISC",
20
20
  "dependencies": {
21
- "@aws-sdk/client-s3": "^3.590.0",
22
- "@aws-sdk/client-textract": "^3.590.0",
23
- "@aws-sdk/s3-request-presigner": "^3.590.0",
21
+ "@aws-sdk/client-s3": "^3.529.0",
22
+ "@aws-sdk/client-textract": "^3.529.0",
23
+ "@aws-sdk/s3-request-presigner": "^3.529.0",
24
24
  "@types/qrcode": "^1.5.5",
25
25
  "qrcode": "^1.5.3"
26
26
  },
package/prisma/schema.prisma CHANGED
@@ -510,12 +510,12 @@ model BashTargetAudience {
510
510
  occupation Occupation @default(NoPreference)
511
511
  education Education @default(NoPreference)
512
512
  showOnDetailPage Boolean @default(true)
513
-
514
- @@map("TargetAudience")
515
513
  }
516
514
 
517
515
  model ServiceTargetAudience {
518
516
  id String @id @default(cuid())
517
+ serviceId String @unique
518
+ service Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
519
519
  ageRange AgeRange @default(NoPreference)
520
520
  gender Gender @default(NoPreference)
521
521
  occupation Occupation @default(NoPreference)
@@ -525,12 +525,13 @@ model ServiceTargetAudience {
525
525
 
526
526
  model VenueTargetAudience {
527
527
  id String @id @default(cuid())
528
+ venueId String @unique
529
+ venue Venue @relation(fields: [venueId], references: [id], onDelete: Cascade)
528
530
  ageRange AgeRange @default(NoPreference)
529
531
  gender Gender @default(NoPreference)
530
532
  occupation Occupation @default(NoPreference)
531
533
  education Education @default(NoPreference)
532
534
  showOnDetailPage Boolean @default(true)
533
- venue Venue? @relation("VenueTargetAudience")
534
535
  }
535
536
 
536
537
  enum AgeRange {
@@ -813,9 +814,9 @@ model AssociatedBash {
813
814
  }
814
815
 
815
816
  model Service {
816
- id String @id @default(cuid())
817
+ id String @id @default(cuid())
817
818
  ownerId String
818
- owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
819
+ owner User @relation(fields: [ownerId], references: [id], onDelete: Cascade)
819
820
  email String
820
821
  streetAddress String
821
822
  city String
@@ -831,61 +832,61 @@ model Service {
831
832
  subServiceTypes SubServiceType[]
832
833
  serviceTag ServiceTag[]
833
834
  customServiceTag String[]
834
- yearsOfExperince YearsOfExperience @default(LessThanOneYear)
835
+ yearsOfExperince YearsOfExperience @default(LessThanOneYear)
835
836
  serviceLinks ServiceLink[]
836
837
  description String?
837
838
  canContact Boolean?
838
839
  // musicGenre MusicGenreType?
839
- visibility VisibilityPreference @default(Public)
840
+ visibility VisibilityPreference @default(Public)
840
841
  // bashesInterestedIn BashEventType[]
841
- status ServiceStatus @default(Draft)
842
+ status ServiceStatus @default(Draft)
842
843
  venues Venue[]
843
- serviceRangeId String @unique
844
- serviceRange ServiceRange @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
844
+ serviceRangeId String @unique
845
+ serviceRange ServiceRange @relation("ServiceRange", fields: [serviceRangeId], references: [id], onDelete: Cascade)
846
+ targetAudience ServiceTargetAudience?
845
847
 
846
848
  @@index([email])
847
849
  @@index([phone])
848
850
  }
849
851
 
850
852
  model Venue {
851
- id String @id @default(cuid())
852
- service Service? @relation(fields: [serviceId], references: [id])
853
- serviceId String?
854
- venueName String
855
- email String
856
- streetAddress String
857
- city String
858
- state String
859
- postalCode String
860
- country String
861
- phone String
862
- coverPhoto String?
863
- media Media[]
864
- visibility VisibilityPreference @default(Public)
865
- yearsInBusiness YearsOfExperience
866
- description String?
867
- capacity AmountOfGuests?
868
- amenities String[]
869
- additionalInfo String?
870
- features String[]
871
- venueTypes String[]
872
- availableDateTimes Availability[] @relation("AvailableDateTimes")
853
+ id String @id @default(cuid())
854
+ service Service? @relation(fields: [serviceId], references: [id])
855
+ serviceId String?
856
+ venueName String
857
+ email String
858
+ streetAddress String
859
+ city String
860
+ state String
861
+ postalCode String
862
+ country String
863
+ phone String
864
+ coverPhoto String?
865
+ media Media[]
866
+ visibility VisibilityPreference @default(Public)
867
+ yearsInBusiness YearsOfExperience
868
+ description String?
869
+ capacity AmountOfGuests?
870
+ amenities String[]
871
+ additionalInfo String?
872
+ features String[]
873
+ venueTypes String[]
874
+ availableDateTimes Availability[] @relation("AvailableDateTimes")
873
875
  // specialDateTimes Availability[] @relation("SpecialDateTimes")
874
- mission String?
875
- pitch String?
876
- communityInvolvement String?
877
- emergencyContact String?
878
- contactDetails String?
879
- rates String?
880
- cancellationPolicy String?
881
- refundPolicy String?
882
- safetyPolicy String?
883
- crowdSizeId String? @unique
884
- crowdSize ServiceRange? @relation("CrowdSize", fields: [crowdSizeId], references: [id], onDelete: Cascade)
885
- venueTargetAudienceId String? @unique
886
- targetAudience VenueTargetAudience? @relation("VenueTargetAudience", fields: [venueTargetAudienceId], references: [id])
887
- bashesInterestedIn BashEventType[]
888
- venueLinks ServiceLink[]
876
+ mission String?
877
+ pitch String?
878
+ communityInvolvement String?
879
+ emergencyContact String?
880
+ contactDetails String?
881
+ rates String?
882
+ cancellationPolicy String?
883
+ refundPolicy String?
884
+ safetyPolicy String?
885
+ crowdSizeId String? @unique
886
+ crowdSize ServiceRange? @relation("CrowdSize", fields: [crowdSizeId], references: [id], onDelete: Cascade)
887
+ targetAudience VenueTargetAudience?
888
+ bashesInterestedIn BashEventType[]
889
+ venueLinks ServiceLink[]
889
890
  }
890
891
 
891
892
  enum ServiceTag {
package/src/extendedSchemas.ts CHANGED
@@ -130,6 +130,7 @@ export interface VenueExt extends Venue {
130
130
  venueLinks: ServiceLinkExt[];
131
131
  crowdSize: ServiceRange;
132
132
  capacity?: AmountOfGuests;
133
+ media?: Media[];
133
134
  }
134
135
 
135
136
  export const VENUE_DATA_TO_INCLUDE = {
@@ -139,12 +140,12 @@ export const VENUE_DATA_TO_INCLUDE = {
139
140
  venueLinks: true,
140
141
  crowdSize: true,
141
142
  capacity: true,
143
+ media: true,
142
144
  }
143
145
 
144
146
  export interface ServiceExt extends Service {
145
147
  owner: PublicUser;
146
148
  media: Media[];
147
- crowdSize: ServiceRange;
148
149
  serviceRange: ServiceRange;
149
150
  targetAudience: ServiceTargetAudience;
150
151
  serviceLinks?: ServiceLinkExt[];
@@ -164,8 +165,8 @@ export const SERVICE_DATA_TO_INCLUDE = {
164
165
  select: FRONT_END_USER_DATA_TO_SELECT
165
166
  },
166
167
  media: true,
167
- crowdSize: true,
168
168
  serviceRange: true,
169
+ targetAudience: true,
169
170
  serviceLinks: {
170
171
  include: SERVICE_LINK_DATA_TO_INCLUDE
171
172
  },