Finish integration

dddwa · Nov 15, 2024 · 8bef4ce · 8bef4ce
1 parent 68eea29
commit 8bef4ce
Show file tree

Hide file tree

Showing 15 changed files with 804 additions and 172 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,6 +32,10 @@ jobs:
             GH_CONTENT_TOKEN: ${{ secrets.GH_CONTENT_TOKEN }}
             GOOGLE_FORMS_API_KEY: ${{ secrets.GOOGLE_FORMS_API_KEY }}
             GOOGLE_FORMS_FILE_ID: ${{ secrets.GOOGLE_FORMS_FILE_ID }}
+            EVENTS_AIR_CLIENT_ID: ${{ secrets.EVENTS_AIR_CLIENT_ID }}
+            EVENTS_AIR_CLIENT_SECRET: ${{ secrets.EVENTS_AIR_CLIENT_SECRET }}
+            EVENTS_AIR_TENANT_ID: ${{ secrets.EVENTS_AIR_TENANT_ID }}
+            EVENTS_AIR_EVENT_ID: ${{ secrets.EVENTS_AIR_EVENT_ID }}
 
         steps:
             - name: Checkout

diff --git a/infra/app/ddd.bicep b/infra/app/ddd.bicep
@@ -17,6 +17,11 @@ param googleFormsApiKey string
 @secure()
 param googleFormsFileId string
 param exists bool
+param eventsAirClientId string
+@secure()
+param eventsAirClientSecret string
+param eventsAirTenantId string
+param eventsAirEventId string
 
 resource identity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: identityName
@@ -104,6 +109,22 @@ resource app 'Microsoft.App/containerApps@2024-03-01' = {
             name: 'google-forms-file-id'
             value: googleFormsFileId
         }
+        {
+            name: 'events-air-client-id'
+            value: eventsAirClientId
+        }
+        {
+            name: 'events-air-client-secret'
+            value: eventsAirClientSecret
+        }
+        {
+            name: 'events-air-tenant-id'
+            value: eventsAirTenantId
+        }
+        {
+            name: 'events-air-event-id'
+            value: eventsAirEventId
+        }
       ]
     }
     template: {

diff --git a/infra/main.bicep b/infra/main.bicep
@@ -32,6 +32,12 @@ param domainName string
 @minLength(1)
 param certificateId string
 
+param eventsAirClientId string
+@secure()
+param eventsAirClientSecret string
+param eventsAirTenantId string
+param eventsAirEventId string
+
 // Tags that should be applied to all resources.
 //
 // Note that 'azd-service-name' tags should be applied separately to service host resources.
@@ -125,6 +131,10 @@ module ddd './app/ddd.bicep' = {
     googleFormsFileId: googleFormsFileId
     domainName: domainName
     certificateId: certificateId
+    eventsAirClientId: eventsAirClientId
+    eventsAirClientSecret: eventsAirClientSecret
+    eventsAirTenantId: eventsAirTenantId
+    eventsAirEventId: eventsAirEventId
   }
   scope: rg
 }

diff --git a/infra/main.parameters.json b/infra/main.parameters.json
@@ -53,6 +53,18 @@
         },
         "certificateId": {
             "value": "/subscriptions/dd079971-2023-4b56-be3a-85a346d51344/resourceGroups/dddper-rg-prd/providers/Microsoft.App/managedEnvironments/dddper-cae-ivoki745ew4qo/certificates/cloudflare"
+        },
+        "eventsAirClientId": {
+            "value": "${EVENTS_AIR_CLIENT_ID}"
+        },
+        "eventsAirClientSecret": {
+            "value": "${EVENTS_AIR_CLIENT_SECRET}"
+        },
+        "eventsAirTenantId": {
+            "value": "${EVENTS_AIR_TENANT_ID}"
+        },
+        "eventsAirEventId": {
+            "value": "${EVENTS_AIR_EVENT_ID}"
         }
     }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/website/.env.example b/website/.env.example
@@ -6,3 +6,7 @@ USE_GITHUB_CONTENT=false
 GITHUB_REPO=ddd-2024
 GITHUB_ORGANIZATION=dddwa
 SESSION_SECRET=shhh
+EVENTS_AIR_CLIENT_ID=
+EVENTS_AIR_CLIENT_SECRET=
+EVENTS_AIR_TENANT_ID=
+EVENTS_AIR_EVENT_ID=
diff --git a/website/app/config/years/2024.ts b/website/app/config/years/2024.ts
@@ -51,10 +51,24 @@ export const conference2024: ConferenceYear = {
     feedbackOpenUntilDateTime: DateTime.fromISO('2024-11-21T23:59:59', {
         zone: 'Australia/Perth',
     }),
+
     ticketInfo: {
         type: 'tito',
         accountId: 'dddperth',
         eventId: '2024',
+
+        generalTicketSlugs: [
+            'general-attendee',
+            'dqvd7i58iig',
+            'general-attendee-company',
+            'general-attendee-free',
+            'lyfer',
+            'volunteer',
+            'speaker',
+            'sponsor',
+        ],
+        afterPartyTicketSlugs: ['after-party', 'el5pexoj6m8'],
+        afterPartyUpgradeActivityId: '1071952',
     },
 
     sponsors: {
@@ -237,4 +251,44 @@ Computing, software and big data will be critical in the success of this mega sc
             },
         ],
     },
+
+    foodInfo: {
+        lunch: [
+            {
+                meal: 'Vegetable Korma, potato, cauliflower, carrots, peas, steamed basmati rice (V DF, contains coconut milk)',
+                shortCode: 'VK',
+                foodZone: '1',
+            },
+            {
+                meal: 'Slow cooked beef cheek in red wine sauce with creamy mashed potato (GF)',
+                shortCode: 'BR',
+                foodZone: '1',
+            },
+            {
+                meal: 'Roast pork belly with pineapple jus, cheesy roast potatoes and mustard spring beans (GF)',
+                shortCode: 'PB',
+                foodZone: '2',
+            },
+            {
+                meal: 'Classic Caesar salad, cos lettuce, parmesan cheese, egg, bacon, Caesar dressing',
+                shortCode: 'CS',
+                foodZone: '3',
+            },
+            {
+                meal: 'Cashew butter chicken with basmati rice, yoghurt, and coriander (GF)',
+                shortCode: 'BC',
+                foodZone: '3',
+            },
+            {
+                meal: 'Beef cheese and bacon burger served with chips',
+                shortCode: 'BU',
+                foodZone: '4',
+            },
+            {
+                meal: 'Caribbean chicken salad with honey lime dressing (DF)',
+                shortCode: 'CC',
+                foodZone: '4',
+            },
+        ],
+    },
 }
diff --git a/website/app/lib/conference-state.ts b/website/app/lib/conference-state.ts
@@ -25,7 +25,6 @@ export function getCurrentConferenceState(
         (year): year is [Year, ConferenceYear] => !('cancelledMessage' in year[1]),
     )
     const [latestConference, previousConference] = conferenceList
-
         .sort(([, a], [, b]) => {
             const dateA = a.conferenceDate?.valueOf() ?? Infinity
             const dateB = b.conferenceDate?.valueOf() ?? Infinity

diff --git a/website/app/lib/config-types.ts b/website/app/lib/config-types.ts
@@ -41,6 +41,10 @@ export interface TitoTicketInfo {
     type: 'tito'
     accountId: string
     eventId: string
+
+    generalTicketSlugs?: string[]
+    afterPartyTicketSlugs?: string[]
+    afterPartyUpgradeActivityId?: string
 }
 
 export type TicketInfo = TitoTicketInfo
@@ -69,6 +73,14 @@ export interface ConferenceYear {
     sessions: SessionizeConferenceSessions | SessionData | undefined
 
     sponsors: YearSponsors
+
+    foodInfo?: {
+        lunch: Array<{
+            meal: string
+            foodZone: string
+            shortCode: string
+        }>
+    }
 }
 
 export interface YearSponsors {

diff --git a/website/app/lib/config.server.ts b/website/app/lib/config.server.ts
@@ -16,6 +16,7 @@ export const {
     EVENTS_AIR_CLIENT_ID,
     EVENTS_AIR_CLIENT_SECRET,
     EVENTS_AIR_TENANT_ID,
+    EVENTS_AIR_EVENT_ID,
 } = z
     .object({
         NODE_ENV: z.string(),
@@ -40,5 +41,6 @@ export const {
         EVENTS_AIR_CLIENT_ID: z.string().optional(),
         EVENTS_AIR_CLIENT_SECRET: z.string().optional(),
         EVENTS_AIR_TENANT_ID: z.string().optional(),
+        EVENTS_AIR_EVENT_ID: z.string().optional(),
     })
     .parse(process.env)