Merge branch 'master' into log-routes

plezanje-net · Sep 7, 2024 · f1a85c9 · f1a85c9
2 parents 0b8c59b + 7b392e3
commit f1a85c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/activities/services/activities.service.ts b/src/activities/services/activities.service.ts
@@ -219,7 +219,6 @@ export class ActivitiesService {
     params: FindActivitiesInput = {},
     currentUser: User = null,
   ): Promise<StatsActivities[]> {
-
     const builder = this.activitiesRepository
       .createQueryBuilder('ac')
       .select('EXTRACT(YEAR FROM ac.date)', 'year')
@@ -247,7 +246,6 @@ export class ActivitiesService {
       } as StatsActivities;
     });
     return myStats;
-
   }
 
   async find(params: FindActivitiesInput = {}): Promise<Activity[]> {
@@ -326,7 +324,7 @@ export class ActivitiesService {
         ActivityRoute,
         'ar',
         'ar.activity_id = a.id AND (ar."publish" IN (:...publish))',
-        { publish: ['log', 'public'] },
+        { publish: ['public'] },
       );
 
       // Allow/disallow based on publishStatus of contained activity routes

diff --git a/test/e2e/activity.e2e-spec.ts b/test/e2e/activity.e2e-spec.ts
@@ -276,7 +276,7 @@ describe('Activity', () => {
     expect(activitiesIds).not.toContain(mockData.activities.nonCragActivity.id);
   });
 
-  it('should get only public (or log) activity routes and only activities containing at least one public (or log) activity route when fetching as a guest', async () => {
+  it('should get only public activity routes and only activities containing at least one public activity route when fetching as a guest', async () => {
     const response = await request(app.getHttpServer())
       .post('/graphql')
       .send({
@@ -304,14 +304,13 @@ describe('Activity', () => {
     const numOfNonPublicActivityRoutes =
       response.body.data.activities.items.filter(
         (a) =>
-          a.routes.filter((ar) => !['log', 'public'].includes(ar.publish))
-            .length > 0,
+          a.routes.filter((ar) => !['public'].includes(ar.publish)).length > 0,
       ).length;
     expect(numOfNonPublicActivityRoutes).toEqual(0);
 
     const numOfActivitiesWithNoPublicActivityRoutes =
       response.body.data.activities.items.filter(
-        (a) => !a.routes.some((ar) => ['log', 'public'].includes(ar.publish)),
+        (a) => !a.routes.some((ar) => ['public'].includes(ar.publish)),
       ).length;
     expect(numOfActivitiesWithNoPublicActivityRoutes).toEqual(0);
 
@@ -320,7 +319,7 @@ describe('Activity', () => {
     const returnedActivitiesIds = response.body.data.activities.items.map(
       (a) => a.id,
     );
-    expect(returnedActivitiesIds).toContain(
+    expect(returnedActivitiesIds).not.toContain(
       mockData.activities.activityWithLogRoutes.id,
     );
     expect(returnedActivitiesIds).toContain(
@@ -340,15 +339,15 @@ describe('Activity', () => {
       mockData.activities.activityWithPublicRoutes.activityRoutes
         .publicActivityRoute.id,
     );
-    expect(returnedActivityRoutesIds).toContain(
+    expect(returnedActivityRoutesIds).not.toContain(
       mockData.activities.activityWithLogRoutes.activityRoutes.logActivityRoute
         .id,
     );
     expect(returnedActivityRoutesIds).toContain(
       mockData.activities.activityWithMixedRoutes.activityRoutes
         .publicActivityRoute.id,
     );
-    expect(returnedActivityRoutesIds).toContain(
+    expect(returnedActivityRoutesIds).not.toContain(
       mockData.activities.activityWithMixedRoutes.activityRoutes
         .logActivityRoute.id,
     );