Merge pull request #384 from digital-sustainability/logoDisplay

Logo display

oss-api/src/app.module.ts

@@ -7,7 +7,6 @@ import { join } from 'path';
 import { GithubService } from './github/github.service';
 import { LoggerModule } from 'nestjs-pino';
 import { ScheduleModule } from '@nestjs/schedule';
-import { TransformerService } from './transformer/transformer.service';
 import { GithubCrawlerService } from './github-crawler/github-crawler.service';
 import { DataService } from './data/data.service';
 import { TelemetryService } from './telemetry/telemetry.service';
@@ -27,7 +26,6 @@ import { AuthModule } from './auth/auth.module';
   providers: [
     MongoDbService,
     GithubService,
-    TransformerService,
     GithubCrawlerService,
     DataService,
     TelemetryService,

oss-api/src/data/data.service.ts

@@ -16,7 +16,7 @@ import { Contributor } from '../interfaces';
 import { MongoDbService } from '../mongo-db/mongo-db.service';
 import { v4 as uuidv4 } from 'uuid';
 import { ObjectId } from 'mongodb';
-import { Cron } from '@nestjs/schedule';
+import { Cron, CronExpression } from '@nestjs/schedule';
 import { RepoData } from '../interfaces';
 
 @Injectable()
@@ -220,6 +220,17 @@ export class DataService {
     const organisations = await this.mongo.findOrganisationsWithNames(
       todoInstitution.orgs.map((organisation) => organisation.name),
     );
+    // make sure the order of the organisations is the same as in the todoInstitution
+    organisations.sort((a, b) => {
+      const indexA = todoInstitution.orgs.findIndex(
+        (org) => org.name === a.name,
+      );
+      const indexB = todoInstitution.orgs.findIndex(
+        (org) => org.name === b.name,
+      );
+      return indexA - indexB;
+    });
+
     const institution: InstitutionRevised = {
       uuid: todoInstitution.uuid,
       shortname: todoInstitution.shortname,

oss-api/src/mongo-db/mongo-db.service.ts

@@ -843,23 +843,38 @@ export class MongoDbService implements OnApplicationShutdown, OnModuleInit {
             },
           },
           {
-            $set: {
-              orgs: '$orga',
+            $addFields: {
+              orgs: {
+                $map: {
+                  input: '$orgs',
+                  as: 'org_id',
+                  in: {
+                    $arrayElemAt: [
+                      {
+                        $filter: {
+                          input: '$orga',
+                          as: 'org',
+                          cond: { $eq: ['$$org._id', '$$org_id'] },
+                        },
+                      },
+                      0,
+                    ],
+                  },
+                },
+              },
             },
           },
-          { $unwind: { path: '$orga', preserveNullAndEmptyArrays: true } },
           {
             $lookup: {
               from: 'repositoriesNew',
-              localField: 'orga.repos',
+              localField: 'orgs.repos',
               foreignField: '_id',
               as: 'repo',
             },
           },
-          { $unwind: { path: '$repo', preserveNullAndEmptyArrays: true } },
-          //{ $sort: { 'orga.created_at': 1 } },
-          //is that sort really necessary if in the end the list of orgs
-          //is not sorted in the frontend?
+          {
+            $unwind: { path: '$repo', preserveNullAndEmptyArrays: true },
+          },
           {
             $group: {
               _id: '$_id',
@@ -874,7 +889,7 @@ export class MongoDbService implements OnApplicationShutdown, OnModuleInit {
               location: { $first: '$orga.locations' },
               created_at: { $first: '$orga.created_at' },
               stats: { $push: { $last: '$repo.stats' } },
-              orgs: { $first: '$orgs' },
+              orgs: { $first: '$orgs' }, // Ensure the order of orgs is maintained
             },
           },
           {