Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion backend/cmd/api/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/SourceSenseiTheRealOne/juntly/backend/internal/authn"
"github.com/SourceSenseiTheRealOne/juntly/backend/internal/contactreveal"
"github.com/SourceSenseiTheRealOne/juntly/backend/internal/listingmedia"
"github.com/SourceSenseiTheRealOne/juntly/backend/internal/payments"
)

Expand All @@ -19,6 +20,7 @@ type runtimeConfig struct {
contactCipher contactreveal.Cipher
paymentGateway payments.Gateway
platformFeeBPS int
mediaStorage listingmedia.ManagedStorage
}

func loadRuntimeConfig(lookup func(string) string) (runtimeConfig, error) {
Expand Down Expand Up @@ -71,7 +73,17 @@ func loadRuntimeConfig(lookup func(string) string) (runtimeConfig, error) {
}
}

return runtimeConfig{databaseURL: databaseURL, verifier: verifier, contactCipher: contactCipher, paymentGateway: paymentGateway, platformFeeBPS: platformFeeBPS}, nil
var mediaStorage listingmedia.ManagedStorage
storageOrigin := strings.TrimSpace(lookup("JUNTLY_STORAGE_ORIGIN"))
storageKey := lookup("JUNTLY_STORAGE_SERVER_KEY")
storageBucket := strings.TrimSpace(lookup("JUNTLY_STORAGE_BUCKET"))
if storageOrigin != "" || storageKey != "" || storageBucket != "" {
mediaStorage, err = listingmedia.NewSupabaseStorage(listingmedia.SupabaseStorageConfig{Origin: storageOrigin, ServerKey: storageKey, Bucket: storageBucket})
if err != nil {
return runtimeConfig{}, ErrInvalidRuntimeConfig
}
}
return runtimeConfig{databaseURL: databaseURL, verifier: verifier, contactCipher: contactCipher, paymentGateway: paymentGateway, platformFeeBPS: platformFeeBPS, mediaStorage: mediaStorage}, nil
}

func parseOptionalDuration(value string) (time.Duration, error) {
Expand Down
12 changes: 10 additions & 2 deletions backend/cmd/api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,17 @@ func newAPIHandler(config runtimeConfig) (http.Handler, io.Closer, error) {
moderatorAuthorizer := moderation.NewService(userService, moderation.NewEntRepository(client))
paymentService := payments.NewService(userService, moderatorAuthorizer, payments.NewSQLStore(database), config.paymentGateway, config.platformFeeBPS)
listingLifecycle := listings.NewLifecycleService(providerAuthorizer, moderatorAuthorizer, listingRepository)
listingMedia := listingmedia.NewService(providerAuthorizer, listingmedia.NewEntRepository(client), listingmedia.NewUnavailableStorage())
mediaRepository := listingmedia.NewEntRepository(client)
var uploadStorage listingmedia.Storage = listingmedia.NewUnavailableStorage()
if config.mediaStorage != nil {
uploadStorage = config.mediaStorage
}
listingMedia := listingmedia.NewService(providerAuthorizer, mediaRepository, uploadStorage)
mediaFinalizer := listingmedia.NewFinalizer(providerAuthorizer, mediaRepository, config.mediaStorage)
mediaReader := listingmedia.NewReader(userService, mediaRepository, config.mediaStorage)
ownerListings := listings.NewOwnerService(listingDrafts, listingLifecycle, listingMedia)
moderationQueue := moderation.NewQueueService(moderatorAuthorizer, listingRepository)
moderationReview := moderation.NewReviewService(moderationQueue, listingLifecycle)
return httpapi.NewRouter(healthService, readinessService, config.verifier, userService, accountService, referenceService, providerService, ownerListings, moderationReview, publicDiscovery, contactChannels, contactReveal, messagingService, quotationService, bookingService, reviewService, entitlementService, administrationService, paymentService), client, nil
router := httpapi.NewRouter(healthService, readinessService, config.verifier, userService, accountService, referenceService, providerService, ownerListings, moderationReview, publicDiscovery, contactChannels, contactReveal, messagingService, quotationService, bookingService, reviewService, entitlementService, administrationService, paymentService)
return httpapi.NewMediaRouter(router, config.verifier, mediaReader, mediaFinalizer), client, nil
}
33 changes: 33 additions & 0 deletions backend/cmd/api/media_config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package main

import "testing"

func TestMediaRuntimeConfigurationIsAllOrNothing(t *testing.T) {
base := map[string]string{"DATABASE_URL": "postgresql://synthetic", "CLERK_SECRET_KEY": "synthetic-secret", "CLERK_AUTHORIZED_PARTIES": "http://localhost:4200"}
storage := map[string]string{"JUNTLY_STORAGE_ORIGIN": "https://storage.example.test", "JUNTLY_STORAGE_SERVER_KEY": "unit-test-key", "JUNTLY_STORAGE_BUCKET": "listing-images"}
for _, missing := range []string{"all", "", "JUNTLY_STORAGE_ORIGIN", "JUNTLY_STORAGE_SERVER_KEY", "JUNTLY_STORAGE_BUCKET"} {
t.Run(missing, func(t *testing.T) {
config, err := loadRuntimeConfig(func(key string) string {
if v, ok := base[key]; ok {
return v
}
if missing == "all" || key == missing {
return ""
}
return storage[key]
})
if missing != "" && missing != "all" {
if err == nil {
t.Fatal("partial storage config accepted")
}
return
}
if err != nil {
t.Fatal(err)
}
if (config.mediaStorage != nil) != (missing == "") {
t.Fatal("storage activation did not match complete explicit configuration")
}
})
}
}
74 changes: 72 additions & 2 deletions backend/ent/listingmedia.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions backend/ent/listingmedia/listingmedia.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading