update

TEAMModelOS.SDK/Models/Cosmos/Common/GroupList.cs

@@ -122,6 +122,9 @@ namespace TEAMModelOS.SDK.Models
         public string id { get; set; }
         //学生所在的学校
         public string code { get; set; }
+        //兼容HiTeach 需要的字段
+        public string schoolId { get => code; }
+        
         //学生所在的学校
         public string schoolName { get; set; }
         /// <summary>

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -1230,8 +1230,7 @@ namespace TEAMModelOS.Controllers.Client
             request.TryGetProperty("school_code", out JsonElement school_code);
             if (grant_type.GetString().Equals("school") && string.IsNullOrWhiteSpace(Convert.ToString(school_code))) return BadRequest();
 
-            var client = _azureCosmos.GetCosmosClient();
-            List<ClassStudents> students = new List<ClassStudents>();
+            var client = _azureCosmos.GetCosmosClient();           
             Dictionary<string, string> irsDic = new Dictionary<string, string>(); //key:學生ID或TMID value:irs號碼
             string container = (grant_type.GetString().Equals("school")) ? "School" : "Teacher";
 
@@ -1244,178 +1243,9 @@ namespace TEAMModelOS.Controllers.Client
             {
                 listids.Add(classId);
             }
-            (List<RMember> memberList, List<RGroupList> groupList) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{school_code}");
-            if (memberList.IsNotEmpty())
-            {
-                foreach (RMember member in memberList)
-                {
-                    ClassStudents strdentRow = new ClassStudents();
-                    strdentRow.nickname = member.nickname;
-                    strdentRow.id = member.id;
-                    strdentRow.name = member.name;
-                    strdentRow.no = member.no;
-                    strdentRow.schoolId = member.code;
-                    strdentRow.groupId = member.groupId;
-                    strdentRow.groupName = member.groupName;
-                    strdentRow.irs = member.irs;
-                    strdentRow.type = member.type;
-                    students.Add(strdentRow);
-                }
-            }
-            #region 舊代碼 不使用
-            ////Case 1 取得stulist成員 (有stulist_id則優先取)
-            //if (grant_type.GetString().Equals("private")  && string.IsNullOrWhiteSpace(stulist) && !string.IsNullOrWhiteSpace(classId)) //若private，且classId不為空，stulist為空，有可能HiTeach無法判別是若classId還是stulist
-            //{
-            //    stulist = classId;
-            //}
-            //if (!string.IsNullOrWhiteSpace(stulist))
-            //{
-            //    string pk = (grant_type.GetString() .Equals("school")) ? $"GroupList-{school_code}" : $"GroupList";
-            //    var querystl = $"SELECT c.members FROM c WHERE c.id = '{stulist}'";
-            //    Dictionary<string, List<string>> stuDic = new Dictionary<string, List<string>>();
-            //    List<string> tmidList = new List<string>();
-            //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, container).GetItemQueryStreamIterator(queryText: querystl, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey(pk) }))
-            //    {
-            //        var json = await JsonDocument.ParseAsync(item.ContentStream);
-            //        if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-            //        {
-            //            foreach (var stuObj in json.RootElement.GetProperty("Documents").EnumerateArray())
-            //            {
-            //                foreach (var studentObj in stuObj.GetProperty("members").EnumerateArray())
-            //                {
-            //                    string stuCode = studentObj.GetProperty("code").ToString();
-            //                    string stuId = studentObj.GetProperty("id").ToString();
-            //                    int stuType = studentObj.GetProperty("type").GetInt32();
-            //                    string irs = studentObj.GetProperty("irs").ToString();
-            //                    //取得學校班級學生ID表
-            //                    if (stuType.Equals(2))
-            //                    {
-            //                        if (stuDic.ContainsKey(stuCode) && !stuDic[stuCode].Contains(stuId))
-            //                        {
-            //                            if (!stuDic[stuCode].Contains(stuId))
-            //                            {
-            //                                stuDic[stuCode].Add(stuId);
-            //                            }
-            //                        }
-            //                        else
-            //                        {
-            //                            List<string> stuIdList = new List<string>();
-            //                            stuIdList.Add(stuId);
-            //                            stuDic.Add(stuCode, stuIdList);
-            //                        }
-            //                    }
-            //                    //取得TMID加入學生ID表
-            //                    else if(stuType.Equals(1) && !tmidList.Contains(stuId))
-            //                    {
-            //                        tmidList.Add(stuId);
-            //                    }
-            //                    //IRS號碼表 (irs無值不取)
-            //                    if (!irsDic.ContainsKey(stuId) && !string.IsNullOrWhiteSpace(irs))
-            //                    {
-            //                        irsDic.Add(stuId, irs);
-            //                    }
-            //                }
-            //            }
-            //        }
-            //    }
-            //    //取得學校班級學生資料
-            //    if (stuDic.Count > 0)
-            //    {
-            //        foreach (KeyValuePair<string, List<string>> stuDicRow in stuDic)
-            //        {
-            //            string stuCode = $"Base-{stuDicRow.Key}";
-            //            List<string> stuIdList = stuDicRow.Value;
-            //            var queryst = $"SELECT c.id, c.name, null AS no, c.schoolId, c.irs FROM c WHERE ARRAY_CONTAINS({JsonSerializer.Serialize(stuIdList)}, c.id)";
-            //            await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIterator(queryText: queryst, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey(stuCode) }))
-            //            {
-            //                using var json = await JsonDocument.ParseAsync(item.ContentStream);
-            //                if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-            //                {
-            //                    foreach (var stuObj in json.RootElement.GetProperty("Documents").EnumerateArray())
-            //                    {
-            //                        students.Add(stuObj.ToObject<ClassStudents>());
-            //                    }
-            //                }   
-            //            }
-            //        }
-            //    }
-            //    //取得TMID用戶資料
-            //    List<ClassStudents> tmids = new List<ClassStudents>();
-            //    if (tmidList.Count > 0)
-            //    {
-            //        var querytmct = $"SELECT c.id, c.name, null AS no, null AS schoolId, c.irs FROM c WHERE ARRAY_CONTAINS({JsonSerializer.Serialize(tmidList)}, c.id)";
-            //        await foreach (var itemtm in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIterator(queryText: querytmct, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base") }))
-            //        {
-            //            using var json = await JsonDocument.ParseAsync(itemtm.ContentStream);
-            //            if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-            //            {
-            //                foreach (var stuObj in json.RootElement.GetProperty("Documents").EnumerateArray())
-            //                {
-            //                    tmids.Add(stuObj.ToObject<ClassStudents>());
-            //                }
-            //                //排序
-            //                tmids = tmids.OrderBy(x => tmidList.IndexOf(x.id)).ToList();
-            //            }
-            //        }
-            //    }
-            //    students = students.Concat(tmids).ToList();
-            //}
-            ////Case 2 取得班級固定成員 條件：有school_code、有classId、無stulist
-            //if (!string.IsNullOrWhiteSpace(Convert.ToString(school_code)) && students.Count == 0 && !string.IsNullOrWhiteSpace(classId))
-            //{
-            //    var query = $"SELECT c.id, c.name, c.no, c.schoolId, c.groupId, c.groupName, c.irs FROM c WHERE c.classId = '{classId}'";
-            //    await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Base-{school_code}") }))
-            //    {
-            //        using var jsonst = await JsonDocument.ParseAsync(item.ContentStream);
-            //        if (jsonst.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-            //        {
-            //            foreach (var stuObj in jsonst.RootElement.GetProperty("Documents").EnumerateArray())
-            //            {
-            //                students.Add(stuObj.ToObject<ClassStudents>());
-            //            }
-            //        }
-            //    }
-            //}
-            ////IRS號碼補足 邏輯：若irsDic數 = students數、全放入
-            //if(students.Count.Equals(irsDic.Count))
-            //{
-            //    for (int i = 0; i < students.Count; i++)
-            //    {
-            //        if (irsDic.ContainsKey(students[i].id))
-            //        {
-            //            students[i].irs = irsDic[students[i].id];
-            //        }
-            //    }
-            //}
-            #endregion
-
-            //取得分組資訊
-            List<ClassGroups> groups = new List<ClassGroups>();
-            foreach (ClassStudents studentInfo in students)
-            {
-                if (!string.IsNullOrWhiteSpace(studentInfo.groupId))
-                {
-                    ClassGroups groupRow = groups.Where(g => g.id == studentInfo.groupId).FirstOrDefault();
-                    if (groupRow != null) //已有此group資訊 => 追加學生ID
-                    {
-                        if (!groupRow.studentIds.Contains(studentInfo.id))
-                        {
-                            groupRow.studentIds.Add(studentInfo.id);
-                        }
-                    }
-                    else //無此group資訊
-                    {
-                        ClassGroups groupAdd = new ClassGroups();
-                        groupAdd.id = studentInfo.groupId;
-                        groupAdd.name = studentInfo.groupName;
-                        groupAdd.studentIds = new List<string>();
-                        groupAdd.studentIds.Add(studentInfo.id);
-                        groups.Add(groupAdd);
-                    }
-                }
-            }
-
-            return Ok(new { students, groups });
+            (List<RMember> students, List<RGroupList> groupList) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{school_code}");
+            
+            return Ok(new { students });
         }
 
         [ProducesDefaultResponseType]

TEAMModelOS/Controllers/Client/HiTeachccControlller.cs

@@ -18,6 +18,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.Models;
 using TEAMModelOS.Models.Request;
+using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
@@ -37,6 +38,7 @@ namespace TEAMModelOS.Controllers.Client
         private readonly Option _option;
         private readonly IConfiguration _configuration;
         private readonly SnowflakeId _snowflakeId;
+        private readonly CoreAPIHttpService _coreAPIHttpService;
 
         public HiTeachccControlller(
             AzureStorageFactory azureStorage,
@@ -46,6 +48,7 @@ namespace TEAMModelOS.Controllers.Client
             DingDing dingDing,
             IConfiguration configuration,
             SnowflakeId snowflakeId,
+            CoreAPIHttpService coreAPIHttpService,
             IOptionsSnapshot<Option> option)
         {
             _azureStorage = azureStorage;
@@ -55,6 +58,7 @@ namespace TEAMModelOS.Controllers.Client
             _dingDing = dingDing;
             _configuration = configuration;
             _snowflakeId = snowflakeId;
+            _coreAPIHttpService = coreAPIHttpService;
             _option = option?.Value;
         }
 
@@ -69,7 +73,7 @@ namespace TEAMModelOS.Controllers.Client
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [HttpPost("create-lesson")]        
+        [HttpPost("create-lesson")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesDefaultResponseType]
@@ -81,19 +85,19 @@ namespace TEAMModelOS.Controllers.Client
             int client = 0; //CC每間教室Client數
             int size = 0; //學校個人總空間
             int tsize = 0; //學校分配給老師的總空間
-            double usize = 0; //學校個人已使用空間
-            JsonElement.ArrayEnumerator members = default; //學生名單
+            double usize = 0; //學校個人已使用空間            
             string res = string.Empty;//資源位置加金鑰
+            string uri = string.Empty;//學校Blob位置
+            string sas = string.Empty;//學校Blob金鑰
             string timezone = string.Empty;
-
+            //判斷ID Token
             if (string.IsNullOrWhiteSpace(id_token)) return BadRequest();
             var jwt = new JwtSecurityToken(id_token);
             if (!jwt.Payload.Iss.Equals("account.teammodel", StringComparison.OrdinalIgnoreCase)) return BadRequest();
             var tid = jwt.Payload.Sub;
-
+            //初始化
             var redis = _azureRedis.GetRedisClient(8);
             var db = _azureCosmos.GetCosmosClient();
-
             var sp = request.sp.Equals("school", StringComparison.OrdinalIgnoreCase);
             try
             {
@@ -114,10 +118,11 @@ namespace TEAMModelOS.Controllers.Client
                         return Ok(new { status = 1, msg = "學校沒有CC授權" });
                     }
                 }
+
                 //取得學校資訊           
                 await foreach (Response item in db.GetContainer(Constant.TEAMModelOS, Constant.School).GetItemQueryStreamIterator(
-                    queryText: $"SELECT TOP 1 c.id, c.size, c.tsize, c.timeZone FROM c WHERE c.id = {request.school}",
-                    requestOptions: new() { PartitionKey = new("base") }))
+                    queryText: $"SELECT TOP 1 c.id, c.size, c.tsize, c.timeZone FROM c WHERE c.id = '{request.school}'",
+                    requestOptions: new() { PartitionKey = new("Base") }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -127,14 +132,18 @@ namespace TEAMModelOS.Controllers.Client
                         size = school.GetProperty("size").GetInt32();
                         tsize = school.GetProperty("tsize").GetInt32();
                     }
+                    else return BadRequest();
                 }
 
                 //緩存檢查已記錄的授權數是否已滿，未滿則紀錄ID跟時間
                 var cccount = await redis.HashLengthAsync($"CC:License:{request.school}");
                 if (cccount >= dmax) return Ok(new { status = 2, msg = "學校CC授權已滿" });
-                else if (await redis.HashSetAsync($"CC:License:{request.school}", tid, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()))
+                else
                 {
-                    if (cccount == 0 && !string.IsNullOrWhiteSpace(timezone)) //代表不存在緩存，設置TTL
+                    //up true 代表新字段，false 代表舊字段更新值
+                    var up = await redis.HashSetAsync($"CC:License:{request.school}", tid, DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+                    //代表緩存不存在Hash Key，設置TTL
+                    if (cccount == 0 && !string.IsNullOrWhiteSpace(timezone))
                     {
                         //UTC轉換為學校時區計算到晚上24:00為止的TTL
                         var tz = TimeSpan.Parse(timezone.TrimStart('+'));
@@ -144,12 +153,9 @@ namespace TEAMModelOS.Controllers.Client
                         await redis.KeyExpireAsync($"CC:License:{request.school}", ts);
                     }
                 }
-                else
-                {
-                    await _dingDing.SendBotMsg($"IES5，{_option.Location}， hiteachcc/create-lesson:()\n HashSetAsync CC:License:{request.school} {tid} 失敗", GroupNames.醍摩豆服務運維群組);
-                }
-                //如果是個人，則取出老師空間size覆蓋
-                if (request.sp.Equals("private"))
+
+                //如果是個人，則取出老師空間size覆蓋，是學校拿取Blob容器金鑰
+                if (!sp)
                 {
                     Teacher teacher = await db.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>(tid, new PartitionKey("Base"));
                     size = teacher.size;
@@ -159,11 +165,16 @@ namespace TEAMModelOS.Controllers.Client
                         size += st.size;
                     }
                 }
+                else
+                {
+                    (uri, sas) = _azureStorage.GetBlobContainerSAS(request.school, BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
+                }
+
                 //計算學校或個人的使用空間
                 RedisValue redisValue = redis.HashGet($"Blob:Record", $"{(sp ? request.school : tid)}");
                 if (redisValue.HasValue && long.TryParse(redisValue.ToString(), out var bsize))
                 {
-                    usize = Math.Round(bsize / 1073741824.0, 2, MidpointRounding.AwayFromZero) - (sp ? tsize : 0); //1073741824  1G
+                    usize = Math.Round(bsize / 1073741824.0 - (sp ? tsize : 0), 2, MidpointRounding.AwayFromZero) ; //1073741824  1G
                 }
                 else //如果檢測不到緩存，觸發刷新計算空間
                 {
@@ -171,38 +182,28 @@ namespace TEAMModelOS.Controllers.Client
                     messageBlob.ApplicationProperties.Add("name", "BlobRoot");
                     await _serviceBus.GetServiceBusClient().SendMessageAsync(_configuration.GetValue<string>("Azure:ServiceBus:ActiveTask"), messageBlob);
                 }
+
                 //取得學校或個人名單
-                await foreach (Response item in db.GetContainer(Constant.TEAMModelOS, sp ? Constant.School : Constant.Teacher).GetItemQueryStreamIterator(
-                    queryText: $"SELECT TOP 1 c.members FROM c WHERE c.id = {request.school}",
-                    requestOptions: new() { PartitionKey = new(sp ? $"GroupList-{request.school}" : "GroupList") }))
-                {
-                    using var json = await JsonDocument.ParseAsync(item.ContentStream);
-                    if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
-                    {
-                        var root = json.RootElement.GetProperty("Documents").EnumerateArray().First();
-                        members = root.GetProperty("members").EnumerateArray();
-                    }
-                }
+                (List<RMember> students, _) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, db, _dingDing, new List<string>() { request.sid }, request.school);
+
                 //取得學校或個人資源
                 if (!string.IsNullOrWhiteSpace(request.rid))
                 {
                     var rp = request.rp.Equals("school", StringComparison.OrdinalIgnoreCase);
                     await foreach (Response item in db.GetContainer(Constant.TEAMModelOS, rp ? Constant.School : Constant.Teacher).GetItemQueryStreamIterator(
-                        queryText: $"SELECT TOP 1 c.url FROM c WHERE c.id = {request.school}",
-                        requestOptions: new() { PartitionKey = new(rp ? $"BlobLog-{request.school}" : "GroupList") }))
+                        queryText: $"SELECT TOP 1 c.url FROM c WHERE c.id = '{request.rid}'",
+                        requestOptions: new() { PartitionKey = new($"Bloblog-{(rp ? request.school : tid)}") }))
                     {
                         using var json = await JsonDocument.ParseAsync(item.ContentStream);
                         if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
                         {
                             var root = json.RootElement.GetProperty("Documents").EnumerateArray().First();
                             var url = root.GetProperty("url").GetString();
-                            res = _azureStorage.GetBlobSAS($"Bloblog-{(rp ? request.school : tid)}", url, BlobSasPermissions.Read);
+                            res = _azureStorage.GetBlobSAS((rp ? request.school : tid), url, BlobSasPermissions.Read);
                         }
                     }
                 }
 
-
-
                 //開課記錄保存
                 LessonRecord lr = new()
                 {
@@ -222,7 +223,7 @@ namespace TEAMModelOS.Controllers.Client
                 messageChange.ApplicationProperties.Add("name", "LessonRecordEvent");
                 await _serviceBus.GetServiceBusClient().SendMessageAsync(_configuration.GetValue<string>("Azure:ServiceBus:ActiveTask"), messageChange);
 
-                return Ok(new { status = 200, lr.id, client, members, res, size, usize });
+                return Ok(new { status = 200, lr.id, client, students, res, size, usize, uri, sas });
             }
             catch (Exception ex)
             {