Remove workout template visibility (#1159)

* feat(migrations): add migration to remove visibility from workout template

* feat(backend): remove refs to remove workout template column

* chore(frontend): adapt to new gql schema

Author: IgnisDa

apps/frontend/app/routes/_dashboard.fitness.$entity.list.tsx

@@ -31,7 +31,6 @@ import {
 	IconChevronDown,
 	IconChevronUp,
 	IconClock,
-	IconLock,
 	IconPlus,
 	IconRoad,
 	IconTrophy,
@@ -229,11 +228,11 @@ const DisplayFitnessEntity = (props: { entityId: string; index: number }) => {
 							workoutTemplateId: props.entityId,
 						})
 						.then(({ userWorkoutTemplateDetails }) => ({
+							detail: "",
 							name: userWorkoutTemplateDetails.details.name,
 							summary: userWorkoutTemplateDetails.details.summary,
 							timestamp: userWorkoutTemplateDetails.details.createdOn,
 							information: userWorkoutTemplateDetails.details.information,
-							detail: changeCase(userWorkoutTemplateDetails.details.visibility),
 						})),
 				)
 				.exhaustive(),
@@ -278,13 +277,12 @@ const DisplayFitnessEntity = (props: { entityId: string; index: number }) => {
 							</Text>
 						</Group>
 						<Group mt="xs">
-							<DisplayStat
-								data={entityInformation.detail}
-								icon={match(loaderData.entity)
-									.with(FitnessEntity.Workouts, () => <IconClock size={16} />)
-									.with(FitnessEntity.Templates, () => <IconLock size={16} />)
-									.exhaustive()}
-							/>
+							{entityInformation.detail ? (
+								<DisplayStat
+									icon={<IconClock size={16} />}
+									data={entityInformation.detail}
+								/>
+							) : null}
 							{entityInformation.summary.total ? (
 								<>
 									{personalBestsAchieved !== 0 ? (

crates/migrations/src/lib.rs

@@ -59,6 +59,7 @@ mod m20241220_changes_for_issue_49;
 mod m20241224_changes_for_issue_1139;
 mod m20241227_changes_for_issue_1157;
 mod m20241228_changes_for_issue_1130;
+mod m20241229_changes_for_issue_1155;
 
 pub use m20230410_create_metadata::Metadata as AliasedMetadata;
 pub use m20230413_create_person::Person as AliasedPerson;
@@ -139,6 +140,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20241224_changes_for_issue_1139::Migration),
             Box::new(m20241227_changes_for_issue_1157::Migration),
             Box::new(m20241228_changes_for_issue_1130::Migration),
+            Box::new(m20241229_changes_for_issue_1155::Migration),
         ]
     }
 }

crates/migrations/src/m20230818_create_workout_template.rs

@@ -1,8 +1,7 @@
 // FIXME: Rename this to m20230506_create_workout_template in the next major release
-use enum_models::Visibility;
 use sea_orm_migration::prelude::*;
 
-use super::m20230417_create_user::User;
+use crate::m20230417_create_user::User;
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;
@@ -15,7 +14,6 @@ pub enum WorkoutTemplate {
     CreatedOn,
     Name,
     Summary,
-    Visibility,
     Information,
 }
 
@@ -32,12 +30,6 @@ impl MigrationTrait for Migration {
                             .text()
                             .not_null(),
                     )
-                    .col(
-                        ColumnDef::new(WorkoutTemplate::Visibility)
-                            .text()
-                            .not_null()
-                            .default(Visibility::Private),
-                    )
                     .col(
                         ColumnDef::new(WorkoutTemplate::Summary)
                             .json_binary()

crates/migrations/src/m20241229_changes_for_issue_1155.rs

@@ -0,0 +1,20 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let db = manager.get_connection();
+        if manager.has_column("workout_template", "visibility").await? {
+            db.execute_unprepared(r#"ALTER TABLE "workout_template" DROP COLUMN "visibility""#)
+                .await?;
+        }
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        Ok(())
+    }
+}

crates/models/database/src/workout_template.rs

@@ -1,7 +1,6 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15
 
 use async_graphql::SimpleObject;
-use enum_models::Visibility;
 use fitness_models::{WorkoutInformation, WorkoutSummary};
 use schematic::Schematic;
 use sea_orm::entity::prelude::*;
@@ -17,11 +16,10 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: String,
     pub name: String,
-    pub visibility: Visibility,
-    pub created_on: DateTimeUtc,
     #[graphql(skip)]
     #[serde(skip)]
     pub user_id: String,
+    pub created_on: DateTimeUtc,
     pub summary: WorkoutSummary,
     pub information: WorkoutInformation,
 }

crates/services/fitness/src/lib.rs

@@ -25,7 +25,7 @@ use dependent_utils::{
     create_custom_exercise, create_or_update_user_workout, create_user_measurement,
     db_workout_to_workout_input, get_focused_workout_summary,
 };
-use enum_models::{EntityLot, ExerciseLot, ExerciseSource, Visibility};
+use enum_models::{EntityLot, ExerciseLot, ExerciseSource};
 use fitness_models::{
     ExerciseAttributes, ExerciseCategory, ExerciseListItem, ExerciseSortBy, ExercisesListInput,
     GithubExercise, GithubExerciseAttributes, ProcessedExercise, UpdateUserExerciseSettings,
@@ -137,15 +137,14 @@ impl FitnessService {
         let processed_exercises = information.exercises.clone();
         summary.focused = get_focused_workout_summary(&processed_exercises, &self.0).await;
         let template = workout_template::ActiveModel {
-            id: match input.update_workout_template_id {
-                Some(id) => ActiveValue::Set(id),
-                None => ActiveValue::Set(format!("wktpl_{}", nanoid!(12))),
-            },
             name: ActiveValue::Set(input.name),
             user_id: ActiveValue::Set(user_id),
             summary: ActiveValue::Set(summary),
             information: ActiveValue::Set(information),
-            visibility: ActiveValue::Set(Visibility::Private),
+            id: match input.update_workout_template_id {
+                Some(id) => ActiveValue::Set(id),
+                None => ActiveValue::Set(format!("wktpl_{}", nanoid!(12))),
+            },
             ..Default::default()
         };
         let template = WorkoutTemplate::insert(template)
@@ -154,7 +153,6 @@ impl FitnessService {
                     .update_columns([
                         workout_template::Column::Name,
                         workout_template::Column::Summary,
-                        workout_template::Column::Visibility,
                         workout_template::Column::Information,
                     ])
                     .to_owned(),

docs/includes/export-schema.ts

@@ -396,11 +396,6 @@ export interface WorkoutTemplate {
 	information: WorkoutInformation;
 	name: string;
 	summary: WorkoutSummary;
-	/**
-	 * @default 'public'
-	 * @type {'public' | 'private'}
-	 */
-	visibility: Visibility;
 }
 
 export interface ImportOrExportWorkoutTemplateItem {

libs/generated/src/graphql/backend/gql.ts

@@ -3142,5 +3142,4 @@ export type WorkoutTemplate = {
   information: WorkoutInformation;
   name: Scalars['String']['output'];
   summary: WorkoutSummary;
-  visibility: Visibility;
 };