@contember/engine-server 1.1.0-alpha.1 → 1.1.0-alpha.4

package/tests/cases/http.ts

@@ -7,9 +7,6 @@ import { test } from 'uvu'
 import prom from 'prom-client'
 import { MigrationFilesManager, MigrationsResolver } from '@contember/schema-migrations'
 import { Logger } from '@contember/engine-common'
-import { CreateProjectCommand, DatabaseContext } from '@contember/engine-tenant-api'
-import { ConflictActionType, InsertBuilder } from '@contember/database'
-import uuid from 'uuid'
 
 const dbCredentials = (dbName: string) => {
 	return {
@@ -38,29 +35,28 @@ const projectConfig = {
 }
 const createContainer = (debug: boolean) => {
 	prom.register.clear()
-	return new MasterContainerFactory().create({
+	const tenantConfig = {
+		db: dbCredentials(String(process.env.TEST_DB_NAME_TENANT)),
+		mailer: {},
+		credentials: {
+			rootToken,
+			loginToken,
+		},
+		secrets: {},
+	}
+	return new MasterContainerFactory().createBuilder({
 		debugMode: debug,
-		config: {
-			tenant: {
-				db: dbCredentials(String(process.env.TEST_DB_NAME_TENANT)),
-				mailer: {},
-				credentials: {
-					rootToken,
-					loginToken,
-				},
-				secrets: {},
-			},
-			server: {
-				logging: {},
-				port: 0,
-				monitoringPort: 0,
-				http: {},
-			},
+		serverConfig: {
+			logging: {},
+			port: 0,
+			monitoringPort: 0,
+			http: {},
 		},
 		projectConfigResolver: () => projectConfig,
+		tenantConfigResolver: () => tenantConfig,
 		plugins: [],
 		processType: ProcessType.singleNode,
-	})
+	}).build()
 }
 
 const executeGraphql = (
@@ -109,7 +105,24 @@ test.before(async () => {
 		)
 		const container = createContainer(false)
 		await container.initializer.initialize()
-		await container.initializer.createProject(projectConfig, await migrationsResolver.getMigrations())
+
+		const { slug, name, ...config } = projectConfig
+		const groupContainer = await container.projectGroupContainerResolver.getProjectGroupContainer(undefined)
+		const tenantContainer = groupContainer.tenantContainer
+		const result = await tenantContainer.projectManager.createProject(tenantContainer.databaseContext, { slug, name, config: config as any, secrets: {} }, undefined)
+		if (!result) {
+			throw new Error('Project already exists')
+		}
+		const projectContainer = await groupContainer.projectContainerResolver.getProjectContainer(slug)
+		if (!projectContainer) {
+			throw new Error('Should not happen')
+		}
+		await groupContainer.systemContainer.projectInitializer.initialize(
+			projectContainer.systemDatabaseContextFactory,
+			projectConfig,
+			new Logger(() => null),
+			await migrationsResolver.getMigrations(),
+		)
 		await tenantConnection.end()
 	} catch (e) {
 		// eslint-disable-next-line no-console

package/dist/src/project/ProjectGroupState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProjectGroupState.d.ts","sourceRoot":"","sources":["../../../src/project/ProjectGroupState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,aAAK,iBAAiB,GAAG;IAAE,SAAS,EAAE,gBAAgB,CAAC;IAAC,QAAQ,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;IAAC,SAAS,EAAE,IAAI,CAAA;CAAE,CAAA;AAEnG,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,YAAY,CAA4B;IAEzC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI9C,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI3C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIhC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAI5D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIrH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAG1C"}

package/dist/src/project/ProjectGroupState.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProjectGroupState.js","sourceRoot":"","sources":["../../../src/project/ProjectGroupState.ts"],"names":[],"mappings":";;;AACA,4DAAqD;AAIrD,MAAa,iBAAiB;IAA9B;QACS,eAAU,GAAG,IAAI,0BAAU,EAA6B,CAAA;QACxD,iBAAY,GAAG,IAAI,GAAG,EAAkB,CAAA;IAyBjD,CAAC;IAvBO,YAAY,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,KAAa;QAC1C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC;IAEM,WAAW,CAAC,KAAa;QAC/B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAChC,CAAC;IAEM,YAAY,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,OAAqD;QAC9F,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,CAAC;IAEM,eAAe,CAAC,IAAY;QAClC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;CACD;AA3BD,8CA2BC"}