File size: 12,815 Bytes
ffd36e0
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
"""Unit tests for the skill-upgrade / closed-learning-loop service.

See research/08-next-modules-build-plan.md §Module B.
"""
import pytest
from django.contrib.auth import get_user_model
from django.utils import timezone
from rest_framework.test import APIClient

from apps.progress.models import UserProgress
from apps.progress.services import (
    _suggested_proficiency,
    apply_upgrade,
    compute_upgrade_suggestions,
    dismiss_upgrade,
)
from apps.resources.models import Resource, SkillResource
from apps.skills.models import Skill, UserSkill

User = get_user_model()
pytestmark = pytest.mark.django_db


UPGRADE_LIST = '/api/progress/upgrade-suggestions/'


@pytest.fixture
def user():
    return User.objects.create_user(
        username='upg@x.com', email='upg@x.com', password='pw', name='U',
    )


@pytest.fixture
def auth_client(user):
    c = APIClient()
    c.force_authenticate(user=user)
    return c


def _skill(name='Python', category='Programming'):
    return Skill.objects.create(
        skill_name=name, category=category, difficulty_level='BEGINNER',
    )


def _resource(title='ML Course', r_type='COURSE', url=None):
    return Resource.objects.create(
        title=title, provider='X', url=url or f'https://e.com/{title}',
        difficulty_level='INTERMEDIATE', duration=100, type=r_type, rating=4.0,
    )


def _complete(user, resource, when=None):
    up = UserProgress.objects.create(
        user=user, resource=resource,
        status='COMPLETED',
        progress=100,
        completed_at=when or timezone.now(),
    )
    return up


def _set_skill(user, skill, proficiency, level='BEGINNER',
               dismissed_upgrade_at=None):
    return UserSkill.objects.create(
        user=user, skill=skill, proficiency=proficiency, user_level=level,
        dismissed_upgrade_at=dismissed_upgrade_at,
    )


class TestBumpMap:
    def test_zero_to_60(self):
        assert _suggested_proficiency(0) == 60

    def test_30_to_60(self):
        assert _suggested_proficiency(30) == 60

    def test_50_to_70(self):
        assert _suggested_proficiency(50) == 70

    def test_70_to_85(self):
        assert _suggested_proficiency(70) == 85

    def test_90_to_100(self):
        assert _suggested_proficiency(90) == 100

    def test_100_suppressed(self):
        assert _suggested_proficiency(100) is None


class TestComputeSuggestions:
    def test_completed_resource_creates_suggestion_when_user_skill_absent(
            self, user):
        ml = _skill('Machine Learning')
        r = _resource()
        SkillResource.objects.create(skill=ml, resource=r, relevance_score=1.0)
        _complete(user, r)

        suggestions = compute_upgrade_suggestions(user)
        assert len(suggestions) == 1
        s = suggestions[0]
        assert s['skill_id'] == ml.id
        assert s['current_proficiency'] == 0
        assert s['suggested_proficiency'] == 60
        assert s['suggested_level'] == 'INTERMEDIATE'

    def test_only_completed_status_triggers(self, user):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        UserProgress.objects.create(
            user=user, resource=r, status='IN_PROGRESS', progress=50,
        )
        assert compute_upgrade_suggestions(user) == []

    def test_suggestion_suppressed_at_100(self, user):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _set_skill(user, py, proficiency=100, level='ADVANCED')
        _complete(user, r)
        assert compute_upgrade_suggestions(user) == []

    def test_never_downgrade(self, user):
        """User at 85 → bump map suggests 100. But if current >= target,
        suppress. (Table avoids downgrade by design; we also verify the
        never-downgrade guard.)"""
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _set_skill(user, py, proficiency=95, level='ADVANCED')
        _complete(user, r)
        suggestions = compute_upgrade_suggestions(user)
        assert len(suggestions) == 1
        assert suggestions[0]['suggested_proficiency'] == 100

    def test_multiple_skills_linked_to_one_resource(self, user):
        py = _skill('Python')
        ml = _skill('Machine Learning')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r, relevance_score=0.7)
        SkillResource.objects.create(skill=ml, resource=r, relevance_score=1.0)
        _complete(user, r)
        suggestions = compute_upgrade_suggestions(user)
        assert {s['skill_id'] for s in suggestions} == {py.id, ml.id}

    def test_dismissal_hides_suggestion(self, user):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        # Completion first, then dismissal AFTER → suppresses.
        _complete(user, r, when=timezone.now() - timezone.timedelta(days=2))
        _set_skill(user, py, proficiency=0,
                   dismissed_upgrade_at=timezone.now())
        assert compute_upgrade_suggestions(user) == []

    def test_dismissal_self_heals_on_newer_completion(self, user):
        """Dismissing a prior suggestion does not block a later completion
        from resurfacing the suggestion."""
        py = _skill('Python')
        r1 = _resource(title='First', url='https://e.com/first')
        r2 = _resource(title='Second', url='https://e.com/second')
        SkillResource.objects.create(skill=py, resource=r1)
        SkillResource.objects.create(skill=py, resource=r2)

        earlier = timezone.now() - timezone.timedelta(days=5)
        _complete(user, r1, when=earlier)
        _set_skill(user, py, proficiency=0,
                   dismissed_upgrade_at=timezone.now()
                   - timezone.timedelta(days=2))

        # A NEW completion post-dismissal re-surfaces the suggestion.
        _complete(user, r2, when=timezone.now())

        suggestions = compute_upgrade_suggestions(user)
        assert len(suggestions) == 1
        assert suggestions[0]['skill_id'] == py.id


class TestApply:
    def test_apply_creates_user_skill_if_absent(self, user):
        ml = _skill('ML')
        r = _resource()
        SkillResource.objects.create(skill=ml, resource=r)
        _complete(user, r)

        result = apply_upgrade(user, ml.id)
        assert result['applied'] is True
        us = UserSkill.objects.get(user=user, skill=ml)
        assert us.proficiency == 60
        assert us.user_level == 'INTERMEDIATE'

    def test_apply_bumps_proficiency_and_recomputes_level(self, user):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _set_skill(user, py, proficiency=70, level='ADVANCED')
        _complete(user, r)

        result = apply_upgrade(user, py.id)
        assert result['applied'] is True
        us = UserSkill.objects.get(user=user, skill=py)
        assert us.proficiency == 85
        # proficiency_to_level(85) → ADVANCED (since > 60)
        assert us.user_level == 'ADVANCED'

    def test_apply_is_idempotent(self, user):
        """Repeated applies without a new completion must be no-ops.
        One completion → one rung of the bump ladder, then already_applied.
        """
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _complete(user, r)

        first = apply_upgrade(user, py.id)
        assert first['applied'] is True

        second = apply_upgrade(user, py.id)
        assert second['applied'] is False
        assert second['already_applied'] is True

        us = UserSkill.objects.get(user=user, skill=py)
        assert us.proficiency == 60  # did not climb past one rung

    def test_apply_resurfaces_on_new_completion(self, user):
        """A completion after the last apply unlocks the next bump."""
        py = _skill('Python')
        r1 = _resource(title='First', url='https://e.com/first')
        r2 = _resource(title='Second', url='https://e.com/second')
        SkillResource.objects.create(skill=py, resource=r1)
        SkillResource.objects.create(skill=py, resource=r2)

        _complete(user, r1, when=timezone.now() - timezone.timedelta(days=2))
        first = apply_upgrade(user, py.id)
        assert first['applied'] is True
        assert UserSkill.objects.get(user=user, skill=py).proficiency == 60

        _complete(user, r2, when=timezone.now())  # newer than the cursor
        second = apply_upgrade(user, py.id)
        assert second['applied'] is True
        assert UserSkill.objects.get(user=user, skill=py).proficiency == 85

    def test_apply_when_no_completion_is_a_noop(self, user):
        py = _skill('Python')
        result = apply_upgrade(user, py.id)
        assert result['applied'] is False
        assert result['already_applied'] is False

    def test_apply_when_already_at_100_is_already_applied(self, user):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _set_skill(user, py, proficiency=100, level='ADVANCED')
        _complete(user, r)

        result = apply_upgrade(user, py.id)
        assert result['applied'] is False
        assert result['already_applied'] is True

    def test_apply_advances_dismissal_cursor(self, user):
        """After an apply, dismissed_upgrade_at is advanced to the latest
        completion timestamp. Semantically this means the suggestion is
        suppressed until a newer completion arrives — matching the dismissed
        flow. A prior user-triggered dismissal must not block an apply that is
        acting on a newer completion."""
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        earlier = timezone.now() - timezone.timedelta(days=2)
        _set_skill(user, py, proficiency=0, dismissed_upgrade_at=earlier)
        completion_at = timezone.now()
        _complete(user, r, when=completion_at)

        result = apply_upgrade(user, py.id)
        assert result['applied'] is True
        us = UserSkill.objects.get(user=user, skill=py)
        assert us.dismissed_upgrade_at == completion_at

        # Functional check: the applied suggestion doesn't resurface on a
        # re-compute without a new completion.
        assert compute_upgrade_suggestions(user) == []


class TestDismiss:
    def test_dismiss_sets_timestamp_and_hides(self, user):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _complete(user, r)
        _set_skill(user, py, proficiency=0)

        result = dismiss_upgrade(user, py.id)
        assert result['dismissed'] is True
        us = UserSkill.objects.get(user=user, skill=py)
        assert us.dismissed_upgrade_at is not None
        assert compute_upgrade_suggestions(user) == []

    def test_dismiss_creates_user_skill_if_absent(self, user):
        py = _skill('Python')
        dismiss_upgrade(user, py.id)
        us = UserSkill.objects.get(user=user, skill=py)
        assert us.proficiency == 0
        assert us.dismissed_upgrade_at is not None


class TestEndpoints:
    def test_list_endpoint(self, user, auth_client):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _complete(user, r)

        r_resp = auth_client.get(UPGRADE_LIST)
        assert r_resp.status_code == 200
        assert r_resp.data['suggestions'][0]['skill_id'] == py.id

    def test_apply_endpoint(self, user, auth_client):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _complete(user, r)

        r_resp = auth_client.post(f'{UPGRADE_LIST}{py.id}/apply/')
        assert r_resp.status_code == 200
        assert r_resp.data['applied'] is True
        assert UserSkill.objects.get(user=user, skill=py).proficiency == 60

    def test_dismiss_endpoint(self, user, auth_client):
        py = _skill('Python')
        r = _resource()
        SkillResource.objects.create(skill=py, resource=r)
        _complete(user, r)

        r_resp = auth_client.post(f'{UPGRADE_LIST}{py.id}/dismiss/')
        assert r_resp.status_code == 200
        assert r_resp.data['dismissed'] is True

        # List should now be empty.
        r_resp = auth_client.get(UPGRADE_LIST)
        assert r_resp.data['suggestions'] == []

    def test_apply_unknown_skill_404(self, auth_client):
        r_resp = auth_client.post(f'{UPGRADE_LIST}99999/apply/')
        assert r_resp.status_code == 404

    def test_requires_auth(self):
        c = APIClient()
        assert c.get(UPGRADE_LIST).status_code == 401