- Timestamp:
- 09/08/11 14:37:52 (13 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3
- Files:
-
- 7 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Convert.cs
r6721 r6723 48 48 Command = Convert.ToDto(source.Command), 49 49 LastJobDataUpdate = (source.JobData == null ? DateTime.MinValue : source.JobData.LastUpdate), 50 HiveExperimentId = source.HiveExperimentId,50 JobId = source.JobId, 51 51 IsPrivileged = source.IsPrivileged 52 52 }; … … 76 76 target.Command = Convert.ToEntity(source.Command); 77 77 // RequiredPlugins are added by Dao 78 target. HiveExperimentId = source.HiveExperimentId;78 target.JobId = source.JobId; 79 79 target.IsPrivileged = source.IsPrivileged; 80 80 } … … 134 134 135 135 #region HiveExperiment 136 public static DT. HiveExperiment ToDto(DB.HiveExperimentsource) {137 if (source == null) return null; 138 return new DT. HiveExperiment { Id = source.HiveExperimentId, Description = source.Description, Name = source.Name, OwnerUserId = source.OwnerUserId, DateCreated = source.DateCreated, ResourceNames = source.ResourceIds, LastAccessed = source.LastAccessed };139 } 140 public static DB. HiveExperiment ToEntity(DT.HiveExperimentsource) {141 if (source == null) return null; 142 var entity = new DB. HiveExperiment(); ToEntity(source, entity);143 return entity; 144 } 145 public static void ToEntity(DT. HiveExperiment source, DB.HiveExperimenttarget) {146 if ((source != null) && (target != null)) { 147 target. HiveExperimentId = source.Id; target.Description = source.Description; target.Name = source.Name; target.OwnerUserId = source.OwnerUserId; target.DateCreated = source.DateCreated; target.ResourceIds = source.ResourceNames; target.LastAccessed = source.LastAccessed;136 public static DT.Job ToDto(DB.Job source) { 137 if (source == null) return null; 138 return new DT.Job { Id = source.JobId, Description = source.Description, Name = source.Name, OwnerUserId = source.OwnerUserId, DateCreated = source.DateCreated, ResourceNames = source.ResourceIds, LastAccessed = source.LastAccessed }; 139 } 140 public static DB.Job ToEntity(DT.Job source) { 141 if (source == null) return null; 142 var entity = new DB.Job(); ToEntity(source, entity); 143 return entity; 144 } 145 public static void ToEntity(DT.Job source, DB.Job target) { 146 if ((source != null) && (target != null)) { 147 target.JobId = source.Id; target.Description = source.Description; target.Name = source.Name; target.OwnerUserId = source.OwnerUserId; target.DateCreated = source.DateCreated; target.ResourceIds = source.ResourceNames; target.LastAccessed = source.LastAccessed; 148 148 } 149 149 } … … 151 151 152 152 #region HiveExperimentPermission 153 public static DT. HiveExperimentPermission ToDto(DB.HiveExperimentPermission source) {154 if (source == null) return null; 155 return new DT. HiveExperimentPermission { HiveExperimentId = source.HiveExperimentId, GrantedUserId = source.GrantedUserId, GrantedByUserId = source.GrantedByUserId, Permission = Convert.ToDto(source.Permission) };156 } 157 public static DB. HiveExperimentPermission ToEntity(DT.HiveExperimentPermission source) {158 if (source == null) return null; 159 var entity = new DB. HiveExperimentPermission(); ToEntity(source, entity);160 return entity; 161 } 162 public static void ToEntity(DT. HiveExperimentPermission source, DB.HiveExperimentPermission target) {163 if ((source != null) && (target != null)) { 164 target. HiveExperimentId = source.HiveExperimentId; target.GrantedUserId = source.GrantedUserId; target.GrantedByUserId = source.GrantedByUserId; target.Permission = Convert.ToEntity(source.Permission);153 public static DT.JobPermission ToDto(DB.JobPermission source) { 154 if (source == null) return null; 155 return new DT.JobPermission { JobId = source.JobId, GrantedUserId = source.GrantedUserId, GrantedByUserId = source.GrantedByUserId, Permission = Convert.ToDto(source.Permission) }; 156 } 157 public static DB.JobPermission ToEntity(DT.JobPermission source) { 158 if (source == null) return null; 159 var entity = new DB.JobPermission(); ToEntity(source, entity); 160 return entity; 161 } 162 public static void ToEntity(DT.JobPermission source, DB.JobPermission target) { 163 if ((source != null) && (target != null)) { 164 target.JobId = source.JobId; target.GrantedUserId = source.GrantedUserId; target.GrantedByUserId = source.GrantedByUserId; target.Permission = Convert.ToEntity(source.Permission); 165 165 } 166 166 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Job.cs
r6717 r6723 26 26 [DataContract] 27 27 [Serializable] 28 public class HiveExperiment: NamedHiveItem {28 public class Job : NamedHiveItem { 29 29 [DataMember] 30 30 public Guid OwnerUserId { get; set; } … … 49 49 /* ================================== */ 50 50 51 public HiveExperiment() { }51 public Job() { } 52 52 53 53 public override string ToString() { -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/JobPermission.cs
r6717 r6723 26 26 [DataContract] 27 27 [Serializable] 28 public class HiveExperimentPermission : HiveItem {28 public class JobPermission : HiveItem { 29 29 // info: this class is derived from HiveItem to simplify handling on the client side, altough it does not have a Id. 30 30 [DataMember] 31 public Guid HiveExperimentId { get; set; }31 public Guid JobId { get; set; } 32 32 [DataMember] 33 33 public Guid GrantedUserId { get; set; } … … 37 37 public Permission Permission { get; set; } 38 38 39 public HiveExperimentPermission() { }39 public JobPermission() { } 40 40 } 41 41 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/DataTransfer/Task.cs
r6721 r6723 43 43 public bool FinishWhenChildJobsFinished { get; set; } 44 44 [DataMember] 45 public Guid HiveExperimentId { get; set; }45 public Guid JobId { get; set; } 46 46 [DataMember] 47 47 public bool IsPrivileged { get; set; } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj
r6721 r6723 108 108 <Compile Include="DataTransfer\Downtime.cs" /> 109 109 <Compile Include="DataTransfer\Heartbeat.cs" /> 110 <Compile Include="DataTransfer\ HiveExperiment.cs" />111 <Compile Include="DataTransfer\ HiveExperimentPermission.cs" />110 <Compile Include="DataTransfer\Job.cs" /> 111 <Compile Include="DataTransfer\JobPermission.cs" /> 112 112 <Compile Include="DataTransfer\HiveItem.cs" /> 113 113 <Compile Include="DataTransfer\Task.cs" /> -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs
r6721 r6723 231 231 232 232 #region HiveExperiment Methods 233 public DT. HiveExperimentGetHiveExperiment(Guid id) {234 using (var db = CreateContext()) { 235 return AddStatsToExperiment(db, DT.Convert.ToDto(db. HiveExperiments.SingleOrDefault(x => x.HiveExperimentId == id)));236 } 237 } 238 239 private DT. HiveExperiment AddStatsToExperiment(HiveDataContext db, DT.HiveExperimentexp) {233 public DT.Job GetHiveExperiment(Guid id) { 234 using (var db = CreateContext()) { 235 return AddStatsToExperiment(db, DT.Convert.ToDto(db.Jobs.SingleOrDefault(x => x.JobId == id))); 236 } 237 } 238 239 private DT.Job AddStatsToExperiment(HiveDataContext db, DT.Job exp) { 240 240 if (exp == null) 241 241 return null; 242 242 243 var jobs = db.Tasks.Where(j => j. HiveExperimentId == exp.Id);243 var jobs = db.Tasks.Where(j => j.JobId == exp.Id); 244 244 exp.JobCount = jobs.Count(); 245 245 exp.CalculatingCount = jobs.Count(j => j.State == TaskState.Calculating); … … 248 248 } 249 249 250 public IEnumerable<DT. HiveExperiment> GetHiveExperiments(Expression<Func<HiveExperiment, bool>> predicate) {251 using (var db = CreateContext()) { 252 return db. HiveExperiments.Where(predicate).Select(x => AddStatsToExperiment(db, DT.Convert.ToDto(x))).ToArray();253 } 254 } 255 256 public Guid AddHiveExperiment(DT. HiveExperimentdto) {257 using (var db = CreateContext()) { 258 var entity = DT.Convert.ToEntity(dto); 259 db. HiveExperiments.InsertOnSubmit(entity);260 db.SubmitChanges(); 261 return entity. HiveExperimentId;262 } 263 } 264 265 public void UpdateHiveExperiment(DT. HiveExperimentdto) {266 using (var db = CreateContext()) { 267 var entity = db. HiveExperiments.FirstOrDefault(x => x.HiveExperimentId == dto.Id);268 if (entity == null) db. HiveExperiments.InsertOnSubmit(DT.Convert.ToEntity(dto));250 public IEnumerable<DT.Job> GetHiveExperiments(Expression<Func<Job, bool>> predicate) { 251 using (var db = CreateContext()) { 252 return db.Jobs.Where(predicate).Select(x => AddStatsToExperiment(db, DT.Convert.ToDto(x))).ToArray(); 253 } 254 } 255 256 public Guid AddHiveExperiment(DT.Job dto) { 257 using (var db = CreateContext()) { 258 var entity = DT.Convert.ToEntity(dto); 259 db.Jobs.InsertOnSubmit(entity); 260 db.SubmitChanges(); 261 return entity.JobId; 262 } 263 } 264 265 public void UpdateHiveExperiment(DT.Job dto) { 266 using (var db = CreateContext()) { 267 var entity = db.Jobs.FirstOrDefault(x => x.JobId == dto.Id); 268 if (entity == null) db.Jobs.InsertOnSubmit(DT.Convert.ToEntity(dto)); 269 269 else DT.Convert.ToEntity(dto, entity); 270 270 db.SubmitChanges(); … … 274 274 public void DeleteHiveExperiment(Guid id) { 275 275 using (var db = CreateContext()) { 276 var entity = db. HiveExperiments.FirstOrDefault(x => x.HiveExperimentId == id);277 if (entity != null) db. HiveExperiments.DeleteOnSubmit(entity);278 db.SubmitChanges(); 279 } 280 } 281 #endregion 282 283 #region HiveExperimentPermission Methods284 public DT. HiveExperimentPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId) {285 using (var db = CreateContext()) { 286 return DT.Convert.ToDto(db. HiveExperimentPermissions.SingleOrDefault(x => x.HiveExperimentId == hiveExperimentId && x.GrantedUserId == grantedUserId));287 } 288 } 289 290 public IEnumerable<DT. HiveExperimentPermission> GetHiveExperimentPermissions(Expression<Func<HiveExperimentPermission, bool>> predicate) {291 using (var db = CreateContext()) { 292 return db. HiveExperimentPermissions.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray();293 } 294 } 295 296 public void AddHiveExperimentPermission(DT. HiveExperimentPermission dto) {297 using (var db = CreateContext()) { 298 var entity = DT.Convert.ToEntity(dto); 299 db. HiveExperimentPermissions.InsertOnSubmit(entity);300 db.SubmitChanges(); 301 } 302 } 303 304 public void UpdateHiveExperimentPermission(DT. HiveExperimentPermission dto) {305 using (var db = CreateContext()) { 306 var entity = db. HiveExperimentPermissions.FirstOrDefault(x => x.HiveExperimentId == dto.HiveExperimentId && x.GrantedUserId == dto.GrantedUserId);307 if (entity == null) db. HiveExperimentPermissions.InsertOnSubmit(DT.Convert.ToEntity(dto));276 var entity = db.Jobs.FirstOrDefault(x => x.JobId == id); 277 if (entity != null) db.Jobs.DeleteOnSubmit(entity); 278 db.SubmitChanges(); 279 } 280 } 281 #endregion 282 283 #region JobPermission Methods 284 public DT.JobPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId) { 285 using (var db = CreateContext()) { 286 return DT.Convert.ToDto(db.JobPermissions.SingleOrDefault(x => x.JobId == hiveExperimentId && x.GrantedUserId == grantedUserId)); 287 } 288 } 289 290 public IEnumerable<DT.JobPermission> GetHiveExperimentPermissions(Expression<Func<JobPermission, bool>> predicate) { 291 using (var db = CreateContext()) { 292 return db.JobPermissions.Where(predicate).Select(x => DT.Convert.ToDto(x)).ToArray(); 293 } 294 } 295 296 public void AddHiveExperimentPermission(DT.JobPermission dto) { 297 using (var db = CreateContext()) { 298 var entity = DT.Convert.ToEntity(dto); 299 db.JobPermissions.InsertOnSubmit(entity); 300 db.SubmitChanges(); 301 } 302 } 303 304 public void UpdateHiveExperimentPermission(DT.JobPermission dto) { 305 using (var db = CreateContext()) { 306 var entity = db.JobPermissions.FirstOrDefault(x => x.JobId == dto.JobId && x.GrantedUserId == dto.GrantedUserId); 307 if (entity == null) db.JobPermissions.InsertOnSubmit(DT.Convert.ToEntity(dto)); 308 308 else DT.Convert.ToEntity(dto, entity); 309 309 db.SubmitChanges(); … … 313 313 public void DeleteHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId) { 314 314 using (var db = CreateContext()) { 315 var entity = db. HiveExperimentPermissions.FirstOrDefault(x => x.HiveExperimentId == hiveExperimentId && x.GrantedUserId == grantedUserId);316 if (entity != null) db. HiveExperimentPermissions.DeleteOnSubmit(entity);315 var entity = db.JobPermissions.FirstOrDefault(x => x.JobId == hiveExperimentId && x.GrantedUserId == grantedUserId); 316 if (entity != null) db.JobPermissions.DeleteOnSubmit(entity); 317 317 db.SubmitChanges(); 318 318 } … … 324 324 public void SetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedByUserId, Guid grantedUserId, Permission permission) { 325 325 using (var db = CreateContext()) { 326 HiveExperimentPermission hiveExperimentPermission = db.HiveExperimentPermissions.SingleOrDefault(x => x.HiveExperimentId == hiveExperimentId && x.GrantedUserId == grantedUserId);326 JobPermission hiveExperimentPermission = db.JobPermissions.SingleOrDefault(x => x.JobId == hiveExperimentId && x.GrantedUserId == grantedUserId); 327 327 if (hiveExperimentPermission != null) { 328 328 if (permission == Permission.NotAllowed) { 329 329 // not allowed, delete 330 db. HiveExperimentPermissions.DeleteOnSubmit(hiveExperimentPermission);330 db.JobPermissions.DeleteOnSubmit(hiveExperimentPermission); 331 331 } else { 332 332 // update … … 337 337 // insert 338 338 if (permission != Permission.NotAllowed) { 339 hiveExperimentPermission = new HiveExperimentPermission() { HiveExperimentId = hiveExperimentId, GrantedByUserId = grantedByUserId, GrantedUserId = grantedUserId, Permission = permission };340 db. HiveExperimentPermissions.InsertOnSubmit(hiveExperimentPermission);339 hiveExperimentPermission = new JobPermission() { JobId = hiveExperimentId, GrantedByUserId = grantedByUserId, GrantedUserId = grantedUserId, Permission = permission }; 340 db.JobPermissions.InsertOnSubmit(hiveExperimentPermission); 341 341 } 342 342 } … … 621 621 public Permission GetPermissionForExperiment(Guid experimentId, Guid userId) { 622 622 using (var db = CreateContext()) { 623 HiveExperiment hiveExperiment = db.HiveExperiments.SingleOrDefault(x => x.HiveExperimentId == experimentId);623 Job hiveExperiment = db.Jobs.SingleOrDefault(x => x.JobId == experimentId); 624 624 if (hiveExperiment == null) return Permission.NotAllowed; 625 625 if (hiveExperiment.OwnerUserId == userId) return Permission.Full; 626 HiveExperimentPermission permission = db.HiveExperimentPermissions.SingleOrDefault(p => p.HiveExperimentId == experimentId && p.GrantedUserId == userId);626 JobPermission permission = db.JobPermissions.SingleOrDefault(p => p.JobId == experimentId && p.GrantedUserId == userId); 627 627 return permission != null ? permission.Permission : Permission.NotAllowed; 628 628 } … … 631 631 public Guid GetExperimentForJob(Guid jobId) { 632 632 using (var db = CreateContext()) { 633 return db.Tasks.Single(j => j.TaskId == jobId). HiveExperimentId;633 return db.Tasks.Single(j => j.TaskId == jobId).JobId; 634 634 } 635 635 } … … 745 745 var usedCoresByUser = from job in db.Tasks 746 746 where job.State == TaskState.Calculating 747 group job by job. HiveExperiment.OwnerUserId into g747 group job by job.Job.OwnerUserId into g 748 748 select new { UserId = g.Key, UsedCores = g.Count() }; 749 749 … … 756 756 757 757 var executionTimesByUser = from job in db.Tasks 758 group job by job. HiveExperiment.OwnerUserId into g758 group job by job.Job.OwnerUserId into g 759 759 select new { UserId = g.Key, ExecutionTime = TimeSpan.FromMilliseconds(g.Select(x => x.ExecutionTimeMs).Sum()) }; 760 760 foreach (var item in executionTimesByUser) { … … 768 768 var executionTimesFinishedJobs = from job in db.Tasks 769 769 where job.State == TaskState.Finished 770 group job by job. HiveExperiment.OwnerUserId into g770 group job by job.Job.OwnerUserId into g 771 771 select new { UserId = g.Key, ExecutionTimeFinishedJobs = TimeSpan.FromMilliseconds(g.Select(x => x.ExecutionTimeMs).Sum()) }; 772 772 … … 781 781 var startToEndTimesFinishedJobs = from job in db.Tasks 782 782 where job.State == TaskState.Finished 783 group job by job. HiveExperiment.OwnerUserId into g783 group job by job.Job.OwnerUserId into g 784 784 select new { 785 785 UserId = g.Key, -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/HiveService.cs
r6721 r6723 117 117 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 118 118 author.AuthorizeForExperiment(experimentId, Permission.Read); 119 return dao.GetJobs(x => x. HiveExperimentId == experimentId).Select(x => new LightweightTask(x)).ToArray();119 return dao.GetJobs(x => x.JobId == experimentId).Select(x => new LightweightTask(x)).ToArray(); 120 120 } 121 121 … … 239 239 240 240 #region HiveExperiment Methods 241 public HiveExperimentGetHiveExperiment(Guid id) {241 public Job GetHiveExperiment(Guid id) { 242 242 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 243 243 author.AuthorizeForExperiment(id, Permission.Read); 244 244 var hiveExperiment = dao.GetHiveExperiments(x => 245 x. HiveExperimentId == id246 && (x.OwnerUserId == userManager.CurrentUserId || x. HiveExperimentPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0)245 x.JobId == id 246 && (x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0) 247 247 ).FirstOrDefault(); 248 248 if (hiveExperiment != null) { … … 253 253 } 254 254 255 public IEnumerable< HiveExperiment> GetHiveExperiments() {256 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 257 var hiveExperiments = dao.GetHiveExperiments(x => x.OwnerUserId == userManager.CurrentUserId || x. HiveExperimentPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0);255 public IEnumerable<Job> GetHiveExperiments() { 256 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 257 var hiveExperiments = dao.GetHiveExperiments(x => x.OwnerUserId == userManager.CurrentUserId || x.JobPermissions.Count(hep => hep.Permission != DA.Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0); 258 258 foreach (var he in hiveExperiments) { 259 259 author.AuthorizeForExperiment(he.Id, Permission.Read); … … 264 264 } 265 265 266 public IEnumerable< HiveExperiment> GetAllHiveExperiments() {266 public IEnumerable<Job> GetAllHiveExperiments() { 267 267 authen.AuthenticateForAnyRole(HiveRoles.Administrator); 268 268 var hiveExperiments = dao.GetHiveExperiments(x => true); … … 274 274 } 275 275 276 public Guid AddHiveExperiment( HiveExperimenthiveExperimentDto) {276 public Guid AddHiveExperiment(Job hiveExperimentDto) { 277 277 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 278 278 return trans.UseTransaction(() => { … … 283 283 } 284 284 285 public void UpdateHiveExperiment( HiveExperimenthiveExperimentDto) {285 public void UpdateHiveExperiment(Job hiveExperimentDto) { 286 286 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 287 287 author.AuthorizeForExperiment(hiveExperimentDto.Id, Permission.Full); … … 304 304 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 305 305 trans.UseTransaction(() => { 306 HiveExperimenthe = dao.GetHiveExperiment(hiveExperimentId);306 Job he = dao.GetHiveExperiment(hiveExperimentId); 307 307 if (he == null) throw new FaultException<FaultReason>(new FaultReason("Could not find hiveExperiment with id " + hiveExperimentId)); 308 308 Permission perm = DT.Convert.ToDto(dao.GetPermissionForExperiment(he.Id, userManager.CurrentUserId)); … … 315 315 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 316 316 trans.UseTransaction(() => { 317 HiveExperimenthe = dao.GetHiveExperiment(hiveExperimentId);317 Job he = dao.GetHiveExperiment(hiveExperimentId); 318 318 if (he == null) throw new FaultException<FaultReason>(new FaultReason("Could not find hiveExperiment with id " + hiveExperimentId)); 319 319 DA.Permission perm = dao.GetPermissionForExperiment(he.Id, userManager.CurrentUserId); … … 322 322 }); 323 323 } 324 public IEnumerable< HiveExperimentPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) {324 public IEnumerable<JobPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) { 325 325 authen.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client); 326 326 return trans.UseTransaction(() => { 327 327 DA.Permission currentUserPermission = dao.GetPermissionForExperiment(hiveExperimentId, userManager.CurrentUserId); 328 328 if (currentUserPermission != DA.Permission.Full) throw new FaultException<FaultReason>(new FaultReason("Not allowed to list permissions for this experiment")); 329 return dao.GetHiveExperimentPermissions(x => x. HiveExperimentId == hiveExperimentId);329 return dao.GetHiveExperimentPermissions(x => x.JobId == hiveExperimentId); 330 330 }); 331 331 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IHiveDao.cs
r6721 r6723 56 56 57 57 #region HiveExperiment Methods 58 DT. HiveExperimentGetHiveExperiment(Guid id);59 IEnumerable<DT. HiveExperiment> GetHiveExperiments(Expression<Func<HiveExperiment, bool>> predicate);60 Guid AddHiveExperiment(DT. HiveExperimentdto);61 void UpdateHiveExperiment(DT. HiveExperimentdto);58 DT.Job GetHiveExperiment(Guid id); 59 IEnumerable<DT.Job> GetHiveExperiments(Expression<Func<Job, bool>> predicate); 60 Guid AddHiveExperiment(DT.Job dto); 61 void UpdateHiveExperiment(DT.Job dto); 62 62 void DeleteHiveExperiment(Guid id); 63 63 #endregion 64 64 65 65 #region HiveExperimentPermission Methods 66 DT. HiveExperimentPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId);67 IEnumerable<DT. HiveExperimentPermission> GetHiveExperimentPermissions(Expression<Func<HiveExperimentPermission, bool>> predicate);68 void AddHiveExperimentPermission(DT. HiveExperimentPermission dto);69 void UpdateHiveExperimentPermission(DT. HiveExperimentPermission dto);66 DT.JobPermission GetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId); 67 IEnumerable<DT.JobPermission> GetHiveExperimentPermissions(Expression<Func<JobPermission, bool>> predicate); 68 void AddHiveExperimentPermission(DT.JobPermission dto); 69 void UpdateHiveExperimentPermission(DT.JobPermission dto); 70 70 void DeleteHiveExperimentPermission(Guid hiveExperimentId, Guid grantedUserId); 71 71 void SetHiveExperimentPermission(Guid hiveExperimentId, Guid grantedByUserId, Guid grantedUserId, Permission permission); -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs
r6721 r6723 85 85 #region HiveExperiment Methods 86 86 [OperationContract] 87 HiveExperimentGetHiveExperiment(Guid id);87 Job GetHiveExperiment(Guid id); 88 88 89 89 /// <summary> … … 91 91 /// </summary> 92 92 [OperationContract] 93 IEnumerable< HiveExperiment> GetHiveExperiments();93 IEnumerable<Job> GetHiveExperiments(); 94 94 95 95 /// <summary> … … 98 98 /// <returns></returns> 99 99 [OperationContract] 100 IEnumerable< HiveExperiment> GetAllHiveExperiments();101 102 [OperationContract] 103 Guid AddHiveExperiment( HiveExperimenthiveExperimentDto);104 105 [OperationContract] 106 void UpdateHiveExperiment( HiveExperimenthiveExperimentDto);100 IEnumerable<Job> GetAllHiveExperiments(); 101 102 [OperationContract] 103 Guid AddHiveExperiment(Job hiveExperimentDto); 104 105 [OperationContract] 106 void UpdateHiveExperiment(Job hiveExperimentDto); 107 107 108 108 [OperationContract] … … 118 118 119 119 [OperationContract] 120 IEnumerable< HiveExperimentPermission> GetHiveExperimentPermissions(Guid hiveExperimentId);120 IEnumerable<JobPermission> GetHiveExperimentPermissions(Guid hiveExperimentId); 121 121 122 122 [OperationContract]
Note: See TracChangeset
for help on using the changeset viewer.