Skip to content

Commit f31b21d

Browse files
committed
BinariesService placeholder
1 parent 80a4f1e commit f31b21d

File tree

4 files changed

+25
-13
lines changed

4 files changed

+25
-13
lines changed
+14-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
type ConstructorProps = {};
1+
import { CmsArchiveSiteConfig } from './CmsArchiveSite';
2+
import { CmsArchiveOpenSearchClient } from '../opensearch/CmsArchiveOpenSearchClient';
3+
4+
type ConstructorProps = {
5+
config: CmsArchiveSiteConfig;
6+
client: CmsArchiveOpenSearchClient;
7+
};
28

39
export class CmsArchiveBinariesService {
4-
constructor({}: ConstructorProps) {}
10+
private readonly config: CmsArchiveSiteConfig;
11+
private readonly client: CmsArchiveOpenSearchClient;
12+
13+
constructor({ config, client }: ConstructorProps) {
14+
this.config = config;
15+
this.client = client;
16+
}
517
}

server/src/cms/CmsArchiveContentService.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { CmsArchiveCategoriesService } from './CmsArchiveCategoriesService';
1010

1111
type ConstructorProps = {
1212
client: CmsArchiveOpenSearchClient;
13-
siteConfig: CmsArchiveSiteConfig;
13+
config: CmsArchiveSiteConfig;
1414
categoriesService: CmsArchiveCategoriesService;
1515
};
1616

@@ -23,11 +23,11 @@ export class CmsArchiveContentService {
2323
private readonly binariesIndex: string;
2424
private readonly staticAssetsIndex: string;
2525

26-
constructor({ client, siteConfig, categoriesService }: ConstructorProps) {
27-
const { indexPrefix } = siteConfig;
26+
constructor({ client, config, categoriesService }: ConstructorProps) {
27+
const { indexPrefix } = config;
2828

2929
this.client = client;
30-
this.siteConfig = siteConfig;
30+
this.siteConfig = config;
3131
this.categoriesService = categoriesService;
3232

3333
this.contentsIndex = `${indexPrefix}_content`;

server/src/cms/CmsArchiveSite.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export type CmsArchiveSiteConfig = {
1717

1818
type ContructorProps = {
1919
config: CmsArchiveSiteConfig;
20+
client: CmsArchiveOpenSearchClient;
2021
expressApp: Express;
21-
dbClient: CmsArchiveOpenSearchClient;
2222
htmlRenderer: HtmlRenderer;
2323
};
2424

@@ -28,21 +28,21 @@ export class CmsArchiveSite {
2828
private readonly cmsArchiveContentService: CmsArchiveContentService;
2929
private readonly cmsArchiveBinariesService: CmsArchiveBinariesService;
3030

31-
constructor({ config, expressApp, dbClient, htmlRenderer }: ContructorProps) {
31+
constructor({ config, expressApp, client, htmlRenderer }: ContructorProps) {
3232
this.config = config;
3333

3434
this.cmsArchiveCategoriesService = new CmsArchiveCategoriesService({
3535
config: config,
36-
client: dbClient,
36+
client: client,
3737
});
3838

3939
this.cmsArchiveContentService = new CmsArchiveContentService({
40-
client: dbClient,
41-
siteConfig: config,
40+
config: config,
41+
client: client,
4242
categoriesService: this.cmsArchiveCategoriesService,
4343
});
4444

45-
this.cmsArchiveBinariesService = new CmsArchiveBinariesService({});
45+
this.cmsArchiveBinariesService = new CmsArchiveBinariesService({ config, client });
4646

4747
const siteRouter = express.Router();
4848
const apiRouter = express.Router();

server/src/routing/site.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const setupCmsArchiveSites = async (expressApp: Express) => {
2424
return new CmsArchiveSite({
2525
config,
2626
expressApp,
27-
dbClient: archiveClient,
27+
client: archiveClient,
2828
htmlRenderer,
2929
});
3030
});

0 commit comments

Comments
 (0)