Master

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
           ls ${{ github.workspace }}
       - name: Install and prepare
         run: |
-          docker-compose -f docker-compose.e2e.yml up -d
+          docker compose -f docker-compose.e2e.yml up -d
           npm install
       - name: Run tests
         run: |

src/activities/entities/activity-route.entity.ts

@@ -8,62 +8,68 @@ import {
   ManyToOne,
   Index,
 } from 'typeorm';
-import { ObjectType, Field } from '@nestjs/graphql';
+import { ObjectType, Field, registerEnumType } from '@nestjs/graphql';
 import { Route } from '../../crags/entities/route.entity';
 import { Activity } from './activity.entity';
 import { Pitch } from '../../crags/entities/pitch.entity';
 import { User } from '../../users/entities/user.entity';
 
 export enum AscentType {
-  ONSIGHT = 'onsight',
-  FLASH = 'flash',
-  REDPOINT = 'redpoint',
-  REPEAT = 'repeat',
-  ALLFREE = 'allfree',
-  AID = 'aid',
-  ATTEMPT = 'attempt',
-  T_ONSIGHT = 't_onsight',
-  T_FLASH = 't_flash',
-  T_REDPOINT = 't_redpoint',
-  T_REPEAT = 't_repeat',
-  T_ALLFREE = 't_allfree',
-  T_AID = 't_aid',
-  T_ATTEMPT = 't_attempt',
-  TICK = 'tick',
+  onsight = 'onsight',
+  flash = 'flash',
+  redpoint = 'redpoint',
+  repeat = 'repeat',
+  allfree = 'allfree',
+  aid = 'aid',
+  attempt = 'attempt',
+  t_onsight = 't_onsight',
+  t_flash = 't_flash',
+  t_redpoint = 't_redpoint',
+  t_repeat = 't_repeat',
+  t_allfree = 't_allfree',
+  t_aid = 't_aid',
+  t_attempt = 't_attempt',
+  tick = 'tick',
 }
+registerEnumType(AscentType, {
+  name: 'AscentType',
+});
 
 export const tickAscentTypes = new Set([
-  AscentType.ONSIGHT,
-  AscentType.FLASH,
-  AscentType.REDPOINT,
-  AscentType.REPEAT,
+  AscentType.onsight,
+  AscentType.flash,
+  AscentType.redpoint,
+  AscentType.repeat,
 ]);
 
 export const firstTickAscentTypes = new Set([
-  AscentType.ONSIGHT,
-  AscentType.FLASH,
-  AscentType.REDPOINT,
+  AscentType.onsight,
+  AscentType.flash,
+  AscentType.redpoint,
 ]);
 
 export const trTickAscentTypes = new Set([
-  AscentType.T_ONSIGHT,
-  AscentType.T_FLASH,
-  AscentType.T_REDPOINT,
-  AscentType.T_REPEAT,
+  AscentType.t_onsight,
+  AscentType.t_flash,
+  AscentType.t_redpoint,
+  AscentType.t_repeat,
 ]);
 
 export const firstTrTickAscentTypes = new Set([
-  AscentType.T_ONSIGHT,
-  AscentType.T_FLASH,
-  AscentType.T_REDPOINT,
+  AscentType.t_onsight,
+  AscentType.t_flash,
+  AscentType.t_redpoint,
 ]);
 
 export enum PublishType {
-  PUBLIC = 'public',
-  CLUB = 'club',
-  LOG = 'log',
-  PRIVATE = 'private',
+  public = 'public',
+  club = 'club',
+  log = 'log',
+  private = 'private',
 }
+registerEnumType(PublishType, {
+  name: 'PublishType',
+});
 
 /**
  * Has Triggers:
@@ -109,17 +115,17 @@ export class ActivityRoute extends BaseEntity {
   @Column({
     type: 'enum',
     enum: AscentType,
-    default: AscentType.REDPOINT,
+    default: AscentType.redpoint,
   })
-  @Field()
+  @Field((type) => AscentType)
   ascentType: AscentType;
 
   @Column({
     type: 'enum',
     enum: PublishType,
-    default: PublishType.PRIVATE,
+    default: PublishType.private,
   })
-  @Field()
+  @Field((type) => PublishType)
   publish: PublishType;
 
   @Column({ nullable: true })

src/activities/resolvers/activity-routes.resolver.ts

@@ -131,7 +131,6 @@ export class ActivityRoutesResolver {
     return this.activityRoutesService.getStats(input, currentUser);
   }
 
-
   @UseGuards(UserAuthGuard)
   @Query(() => [ActivityRoute])
   myCragSummary(

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

src/activities/services/activity-routes.service.ts

@@ -247,46 +247,46 @@ export class ActivityRoutesService {
     // boulders cannot be onsighted at all
     if (routeTypeId === 'boulder') {
       if (
-        ascentType === AscentType.ONSIGHT ||
-        ascentType === AscentType.T_ONSIGHT
+        ascentType === AscentType.onsight ||
+        ascentType === AscentType.t_onsight
       )
         return false;
     }
 
     // already tried routes cannot be onsighted or flashed
     if (routeTried) {
       if (
-        ascentType === AscentType.ONSIGHT ||
-        ascentType === AscentType.T_ONSIGHT ||
-        ascentType === AscentType.FLASH ||
-        ascentType === AscentType.T_FLASH
+        ascentType === AscentType.onsight ||
+        ascentType === AscentType.t_onsight ||
+        ascentType === AscentType.flash ||
+        ascentType === AscentType.t_flash
       )
         return false;
     }
 
     // already ticked routes cannot be redpointed (flash, sight included above)
     if (routeTicked) {
       if (
-        ascentType === AscentType.REDPOINT ||
-        ascentType === AscentType.T_REDPOINT
+        ascentType === AscentType.redpoint ||
+        ascentType === AscentType.t_redpoint
       )
         return false;
     }
 
     // routes one already 'ticked' on toprope cannot be tr redpointed
     if (routeTrTicked) {
-      if (ascentType === AscentType.T_REDPOINT) {
+      if (ascentType === AscentType.t_redpoint) {
         return false;
       }
     }
 
     // routes not ticked before cannot be repeated
-    if (ascentType === AscentType.REPEAT && !routeTicked) {
+    if (ascentType === AscentType.repeat && !routeTicked) {
       return false;
     }
 
     // routes not ticked (real or tr) before cannot be toprope repeated
-    if (ascentType === AscentType.T_REPEAT && !(routeTicked || routeTrTicked)) {
+    if (ascentType === AscentType.t_repeat && !(routeTicked || routeTrTicked)) {
       return false;
     }
 
@@ -646,7 +646,7 @@ export class ActivityRoutesService {
     if (!currentUser) {
       // Allow showing only public ascents to guests
       builder.andWhere('ar."publish" IN (:...publish)', {
-        publish: ['log', 'public'],
+        publish: ['public'],
       });
 
       // Allow showing only published routes (no drafts or in_reviews)
@@ -657,7 +657,7 @@ export class ActivityRoutesService {
         '(ar.user_id = :userId OR ar."publish" IN (:...publish))',
         {
           userId: currentUser.id,
-          publish: ['log', 'public'],
+          publish: ['public'],
         },
       );
       // TODO: should also allow showing club ascents

src/crags/crags.module.ts

@@ -71,6 +71,10 @@ import { RouteEvent } from './entities/route-event.entity';
 import { Parking } from './entities/parking.entity';
 import { ParkingsService } from './services/parkings.service';
 import { AreaLoader } from './loaders/area.loader';
+import { ActivityRoutesService } from '../activities/services/activity-routes.service';
+import { ActivitiesModule } from '../activities/activities.module';
+import { ClubMember } from '../users/entities/club-member.entity';
+import { Club } from '../users/entities/club.entity';
 import { env } from 'process';
 
 @Module({
@@ -99,7 +103,10 @@ import { env } from 'process';
       IceFallProperty,
       StarRatingVote,
       Parking,
+      Club,
+      ClubMember,
     ]),
+    forwardRef(() => ActivitiesModule),
     forwardRef(() => AuditModule),
     BullModule.registerQueue({
       name: 'summary',
@@ -150,6 +157,7 @@ import { env } from 'process';
     CragLoader,
     RouteLoader,
     ParkingsService,
+    ActivityRoutesService,
   ],
   controllers: [UploadController],
   exports: [

src/crags/dtos/find-difficulty-votes.input.ts

@@ -0,0 +1,9 @@
+import { InputType, Field } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
+
+@InputType()
+export class FindDifficultyVotesInput {
+  @Field({ nullable: true })
+  @IsOptional()
+  userId?: string;
+}

src/crags/dtos/find-star-rating-votes.input.ts

@@ -0,0 +1,9 @@
+import { InputType, Field } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
+
+@InputType()
+export class FindStarRatingVotesInput {
+  @Field({ nullable: true })
+  @IsOptional()
+  userId?: string;
+}

src/crags/entities/crag.entity.ts

@@ -41,34 +41,34 @@ export enum CragType {
 }
 
 export enum Orientation {
-  NORTH = 'north',
-  NORTHEAST = 'northeast',
-  EAST = 'east',
-  SOUTHEAST = 'southeast',
-  SOUTH = 'south',
-  SOUTHWEST = 'southwest',
-  WEST = 'west',
-  NORTHWEST = 'northwest',
+  north = 'north',
+  northeast = 'northeast',
+  east = 'east',
+  southeast = 'southeast',
+  south = 'south',
+  southwest = 'southwest',
+  west = 'west',
+  northwest = 'northwest',
 }
 registerEnumType(Orientation, {
   name: 'Orientation',
 });
 
 export enum WallAngle {
-  SLAB = 'slab',
-  VERTICAL = 'vertical',
-  OVERHANG = 'overhang',
-  ROOF = 'roof',
+  slab = 'slab',
+  vertical = 'vertical',
+  overhang = 'overhang',
+  roof = 'roof',
 }
 registerEnumType(WallAngle, {
   name: 'WallAngle',
 });
 
 export enum Season {
-  SPRING = 'spring',
-  SUMMER = 'summer',
-  AUTUMN = 'autumn',
-  WINTER = 'winter',
+  spring = 'spring',
+  summer = 'summer',
+  autumn = 'autumn',
+  winter = 'winter',
 }
 registerEnumType(Season, {
   name: 'Season',