Merge pull request #2745 from codecrafters-io/CC-1654

Update frontend to use `Course#visibility` attribute to selectively render courses

Author: ryan-gang

app/components/user-page/course-progress-list.ts

@@ -15,7 +15,9 @@ export default class CourseProgressListComponent extends Component<Signature> {
   get courseParticipationGroups() {
     const participationsGroupedByCourse: CourseParticipationModel[][] = Object.values(
       groupBy(
-        this.args.user.courseParticipations.filter((participation) => !participation.course.releaseStatusIsDeprecated),
+        this.args.user.courseParticipations.filter(
+          (participation) => !participation.course.releaseStatusIsDeprecated && !participation.course.visibilityIsPrivate,
+        ),
         'course',
       ),
     );

app/controllers/catalog.ts

@@ -104,7 +104,7 @@ export default class CatalogController extends Controller {
       this.authenticator.currentUser && (this.authenticator.currentUser.isStaff || this.authenticator.currentUser.isCourseAuthor(course));
     const userHasRepository = this.authenticator.currentUser && this.authenticator.currentUser.repositories.filterBy('course', course).length > 0;
 
-    if (course.releaseStatusIsDeprecated) {
+    if (course.releaseStatusIsDeprecated || course.visibilityIsPrivate) {
       return userHasRepository;
     }
 

app/controllers/join-track.ts

@@ -12,7 +12,7 @@ export default class JoinTrackController extends Controller {
   @service declare authenticator: AuthenticatorService;
 
   get courses(): CourseModel[] {
-    return this.model.courses.rejectBy('releaseStatusIsAlpha').rejectBy('releaseStatusIsDeprecated');
+    return this.model.courses.rejectBy('releaseStatusIsAlpha').rejectBy('releaseStatusIsDeprecated').rejectBy('visibilityIsPrivate');
   }
 
   get sortedCourses(): CourseModel[] {

app/controllers/track.ts

@@ -14,7 +14,7 @@ export default class TrackController extends Controller {
       return this.model.courses;
     }
 
-    return this.model.courses.rejectBy('releaseStatusIsAlpha').rejectBy('releaseStatusIsDeprecated');
+    return this.model.courses.rejectBy('releaseStatusIsAlpha').rejectBy('releaseStatusIsDeprecated').rejectBy('visibilityIsPrivate');
   }
 
   get sortedCourses(): CourseModel[] {

app/controllers/vote/course-extension-ideas.ts

@@ -31,6 +31,7 @@ export default class CourseExtensionIdeasController extends Controller {
       .uniq()
       .rejectBy('releaseStatusIsDeprecated')
       .rejectBy('releaseStatusIsAlpha')
+      .rejectBy('visibilityIsPrivate')
       .sortBy('sortPositionForTrack');
   }
 

app/models/course.ts

@@ -44,6 +44,7 @@ export default class CourseModel extends Model {
   @attr('string') declare shortName: string;
   @attr('string') declare slug: string;
   @attr('string') declare testerRepositoryFullName: string;
+  @attr('string') declare visibility: 'public' | 'private';
 
   @attr() declare testimonials: {
     author_name: string;
@@ -80,6 +81,9 @@ export default class CourseModel extends Model {
   @equal('releaseStatus', 'live') declare releaseStatusIsLive: boolean;
   @equal('releaseStatus', 'deprecated') declare releaseStatusIsDeprecated: boolean;
 
+  @equal('visibility', 'public') declare visibilityIsPublic: boolean;
+  @equal('visibility', 'private') declare visibilityIsPrivate: boolean;
+
   @service declare date: DateService;
 
   get baseStages() {

package-lock.json

@@ -140,6 +140,34 @@ module('Acceptance | track-page | view-track', function (hooks) {
     assert.notOk(trackPage.cards.mapBy('title').includes('Build your own Docker'));
   });
 
+  test('it does not show a challenge if it is private', async function (assert) {
+    signIn(this.owner, this.server);
+
+    let redis = this.server.schema.courses.findBy({ slug: 'redis' });
+    redis.update({ visibility: 'private' });
+
+    await visit('/tracks/python');
+    assert.notOk(trackPage.cards.mapBy('title').includes('Build your own Redis'), 'private course should not be included');
+  });
+
+  test('it does not show a challenge if it is private and user has repository', async function (assert) {
+    signIn(this.owner, this.server);
+
+    let currentUser = this.server.schema.users.first();
+    let python = this.server.schema.languages.findBy({ name: 'Python' });
+    let redis = this.server.schema.courses.findBy({ slug: 'redis' });
+    redis.update({ visibility: 'private' });
+
+    this.server.create('repository', {
+      course: redis,
+      language: python,
+      user: currentUser,
+    });
+
+    await visit('/tracks/python');
+    assert.notOk(trackPage.cards.mapBy('title').includes('Build your own Redis'), 'private course should not be included');
+  });
+
   test('visiting from catalog page has no loading page', async function (assert) {
     let loadingIndicatorWasRendered = false;
 

tests/acceptance/track-page/view-track-test.js

@@ -338,4 +338,37 @@ module('Acceptance | view-courses', function (hooks) {
     assert.strictEqual(catalogPage.courseCards.length, 4, 'expected 4 course cards to be present');
     assert.notOk(catalogPage.courseCards.mapBy('name').includes('Build your own Docker'), 'docker should not be included');
   });
+
+  test('it should not show private courses in catalog', async function (assert) {
+    testScenario(this.server);
+    signIn(this.owner, this.server);
+
+    let redis = this.server.schema.courses.findBy({ slug: 'redis' });
+    redis.update({ visibility: 'private' });
+
+    await catalogPage.visit();
+
+    assert.strictEqual(catalogPage.courseCards.length, 4, 'expected 4 course cards to be present');
+    assert.notOk(catalogPage.courseCards.mapBy('name').includes('Build your own Redis'), 'redis should not be included');
+  });
+
+  test('it should show private courses in catalog if user has repository', async function (assert) {
+    testScenario(this.server);
+    signIn(this.owner, this.server);
+
+    let currentUser = this.server.schema.users.first();
+    let python = this.server.schema.languages.findBy({ name: 'Python' });
+    let redis = this.server.schema.courses.findBy({ slug: 'redis' });
+    redis.update({ visibility: 'private' });
+
+    this.server.create('repository', {
+      course: redis,
+      language: python,
+      user: currentUser,
+    });
+
+    await catalogPage.visit();
+
+    assert.ok(catalogPage.courseCards.mapBy('name').includes('Build your own Redis'), 'redis should be included');
+  });
 });

tests/acceptance/view-courses-test.js

@@ -250,4 +250,35 @@ module('Acceptance | view-user-profile', function (hooks) {
     assert.strictEqual(userPage.courseProgressListItems.length, 1, 'only one course progress list item should be shown');
     assert.strictEqual(userPage.courseProgressListItems[0].name, 'Build your own grep', 'the course progress list item should be for grep');
   });
+
+  test('it does not show private courses in user profile', async function (assert) {
+    testScenario(this.server);
+
+    let currentUser = this.server.schema.users.first();
+    let go = this.server.schema.languages.findBy({ slug: 'go' });
+    let redis = this.server.schema.courses.findBy({ slug: 'redis' });
+    let grep = this.server.schema.courses.findBy({ slug: 'grep' });
+    redis.update({ visibility: 'private' });
+
+    this.server.create('course-participation', {
+      course: grep,
+      language: go,
+      user: currentUser,
+      completedStageSlugs: grep.stages.models.sortBy('position').slice(0, 5).mapBy('slug'),
+      lastSubmissionAt: new Date('2020-10-10'),
+    });
+
+    this.server.create('course-participation', {
+      course: redis,
+      language: go,
+      user: currentUser,
+      completedAt: new Date('2020-01-01'),
+    });
+
+    await userPage.visit({ username: 'rohitpaulk' });
+
+    assert.strictEqual(userPage.courseProgressListItems.length, 1, 'only one course progress list item should be shown');
+    assert.strictEqual(userPage.courseProgressListItems[0].name, 'Build your own grep', 'the course progress list item should be for grep');
+    assert.notOk(userPage.courseProgressListItems.mapBy('name').includes('Build your own Redis'), 'private course should not be included');
+  });
 });